build: update to nixos-24.11

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
rvolosatovs · Dec 2, 2024 · 3791126 · 3791126
1 parent cc0b76f
commit 3791126
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 41 deletions.
diff --git a/examples/rust-complex/flake.nix b/examples/rust-complex/flake.nix
@@ -13,24 +13,5 @@
       clippy.workspace = true;
       test.allTargets = true;
       test.workspace = true;
-
-      buildOverrides = {
-        pkgs,
-        pkgsCross ? pkgs,
-        ...
-      }: {
-        buildInputs ? [],
-        depsBuildBuild ? [],
-        ...
-      }:
-        with pkgs.lib; {
-          buildInputs =
-            buildInputs
-            ++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv;
-
-          depsBuildBuild =
-            depsBuildBuild
-            ++ optional pkgsCross.stdenv.hostPlatform.isDarwin pkgsCross.xcbuild.xcrun;
-        };
     };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -27,8 +27,8 @@
   inputs.nix-filter.url = "github:numtide/nix-filter";
   inputs.nix-log.url = "github:rvolosatovs/nix-log";
   inputs.nixlib.url = "github:nix-community/nixpkgs.lib";
-  inputs.nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
-  inputs.nixpkgs-nixos.url = "github:nixos/nixpkgs/nixos-24.05";
+  inputs.nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.11-darwin";
+  inputs.nixpkgs-nixos.url = "github:nixos/nixpkgs/nixos-24.11";
   inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs-nixos";
   inputs.rust-overlay.url = "github:oxalica/rust-overlay";
 

diff --git a/lib/rust/mkAttrs.nix b/lib/rust/mkAttrs.nix
@@ -182,16 +182,13 @@ with self.lib.rust.targets;
         final
         hostRustToolchain;
 
-      mkHostArgs = {depsBuildBuild ? [], ...} @ craneArgs:
+      mkHostArgs = craneArgs:
         trace' "mkHostArgs" {
           inherit craneArgs;
         }
         {
-          craneArgs =
-            craneArgs
-            // {
-              depsBuildBuild = depsBuildBuild ++ optional final.stdenv.hostPlatform.isDarwin final.darwin.apple_sdk.frameworks.Security;
-            };
+          inherit craneArgs;
+
           craneLib = hostCraneLib;
 
           overrideArgs.pkgs = final;
@@ -307,8 +304,6 @@ with self.lib.rust.targets;
           useRosetta = final.stdenv.buildPlatform.isDarwin && final.stdenv.buildPlatform.isAarch64 && pkgsCross.stdenv.hostPlatform.isDarwin && pkgsCross.stdenv.hostPlatform.isx86_64;
           useEmu = final.stdenv.buildPlatform.system != pkgsCross.stdenv.hostPlatform.system && !useRosetta && !pkgsCross.stdenv.hostPlatform.isDarwin;
 
-          buildInputs = optional final.stdenv.buildPlatform.isDarwin final.darwin.apple_sdk.frameworks.Security;
-
           crossZigCC = let
             target' =
               if target == aarch64-apple-darwin
@@ -328,10 +323,6 @@ with self.lib.rust.targets;
 
           targetArgs =
             {
-              inherit
-                buildInputs
-                ;
-
               HOST_AR = "${final.stdenv.cc.targetPrefix}ar";
               HOST_CC = "${final.stdenv.cc.targetPrefix}cc";