update nix

Author: MarcusSorealheis

flake.lock

@@ -16,8 +16,7 @@
       url = "github:ipetkov/crane";
     };
     nix2container = {
-      # TODO(SchahinRohani): Use a specific commit hash until nix2container is stable.
-      url = "github:nlewo/nix2container/cc96df7c3747c61c584d757cfc083922b4f4b33e";
+      url = "github:nlewo/nix2container";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -101,18 +100,27 @@
           # Map the nix system to the Rust target triple that we'd want to target
           # by default.
           targetArch =
-            (
-              nixSystem:
-                {
-                  "x86_64-linux" = "x86_64-unknown-linux-musl";
-                  "aarch64-linux" = "aarch64-unknown-linux-musl";
-                  "x86_64-darwin" = "x86_64-apple-darwin";
-                  "aarch64-darwin" = "aarch64-apple-darwin";
-                }.${
-                  nixSystem
-                } or (throw "Unsupported Nix host platform: ${nixSystem}")
-            )
-            p.stdenv.targetPlatform.system;
+            if p.stdenv.targetPlatform.isLinux
+            then
+              if p.stdenv.targetPlatform.isMusl
+              then
+                if p.stdenv.targetPlatform.isAarch64
+                then "aarch64-unknown-linux-musl"
+                else "x86_64-unknown-linux-musl"
+              else if p.stdenv.targetPlatform.isAarch64
+              then "aarch64-unknown-linux-gnu"
+              else "x86_64-unknown-linux-gnu"
+            else
+              (
+                nixSystem:
+                  {
+                    "x86_64-darwin" = "x86_64-apple-darwin";
+                    "aarch64-darwin" = "aarch64-apple-darwin";
+                  }.${
+                    nixSystem
+                  } or (throw "Unsupported Nix host platform: ${nixSystem}")
+              )
+              p.stdenv.targetPlatform.system;
 
           # Full path to the linker for CARGO_TARGET_XXX_LINKER
           linkerPath =
@@ -125,7 +133,7 @@
           {
             inherit src;
             stdenv = q:
-              if q.stdenv.targetPlatform.isLinux
+              if q.stdenv.targetPlatform.isLinux && !q.stdenv.hostPlatform.isMusl
               then q.pkgsMusl.stdenv
               else q.stdenv;
             strictDeps = true;
@@ -168,14 +176,18 @@
           then pkgs.pkgsCross.musl64
           else if pkgs.system == "aarch64-linux"
           then pkgs.pkgsCross.aarch64-multiplatform-musl
+          else if pkgs.system == "x86_64-darwin"
+          then pkgs.pkgsCross.gnu64
+          else if pkgs.system == "aarch64-darwin"
+          then pkgs.pkgsCross.aarch64-multiplatform
           else pkgs;
 
         nativelink = nativelinkFor nativeTargetPkgs;
 
         # These two can be built by all build platforms. This is not true for
         # darwin targets which are only buildable via native compilation.
-        nativelink-aarch64-linux = nativelinkFor pkgs.pkgsCross.aarch64-multiplatform-musl;
-        nativelink-x86_64-linux = nativelinkFor pkgs.pkgsCross.musl64;
+        nativelink-aarch64-linux = nativelinkFor pkgs.pkgsCross.aarch64-multiplatform;
+        nativelink-x86_64-linux = nativelinkFor pkgs.pkgsCross.gnu64;
 
         nativelink-is-executable-test = pkgs.callPackage ./tools/nativelink-is-executable-test.nix {inherit nativelink;};
 
@@ -331,6 +343,7 @@
             (_final: prev: {
               cargo-llvm-cov = prev.cargo-llvm-cov.overrideAttrs (old: {
                 meta = old.meta // {broken = false;};
+                doCheck = false;
               });
             })
           ];
@@ -374,6 +387,14 @@
 
             generate-bazel-rc = pkgs.callPackage tools/generate-bazel-rc/build.nix {craneLib = craneLibFor pkgs;};
             generate-stores-config = pkgs.callPackage nativelink-config/generate-stores-config/build.nix {craneLib = craneLibFor pkgs;};
+
+            inherit
+              nativelink-aarch64-linux
+              nativelink-image
+              nativelink-worker-init
+              nativelink-x86_64-linux
+              ;
+            image = nativelink-image;
           }
           // (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux rec {
             inherit
@@ -382,6 +403,7 @@
               nativelink-worker-init
               nativelink-x86_64-linux
               ;
+            image = nativelink-image;
 
             nativelink-worker-lre-cc = createWorker pkgs.lre.lre-cc.image;
             lre-java = pkgs.callPackage ./local-remote-execution/lre-java.nix {inherit buildImage;};
@@ -392,7 +414,6 @@
             nativelink-worker-toolchain-drake = createWorker toolchain-drake;
             nativelink-worker-toolchain-buck2 = createWorker toolchain-buck2;
             nativelink-worker-buck2-toolchain = buck2-toolchain;
-            image = nativelink-image;
           })
           // (
             # It's not possible to crosscompile to darwin, not even between

flake.nix

@@ -13,10 +13,10 @@ writeShellScriptBin "local-image-test" ''
   # nothing would still lead to a new hash. Instead we use the
   # derivation hash as the tag so that the tag is reused if the image
   # didn't change.
-  IMAGE_TAG=$(nix eval .#$1.imageTag --raw)
-  IMAGE_NAME=$(nix eval .#$1.imageName --raw)
+  IMAGE_TAG=$(nix --extra-experimental-features 'nix-command flakes' eval .#$1.imageTag --raw)
+  IMAGE_NAME=$(nix --extra-experimental-features 'nix-command flakes' eval .#$1.imageName --raw)
 
-  nix run .#$1.copyTo \
+  nix --extra-experimental-features 'nix-command flakes' run .#$1.copyTo \
     docker-daemon:''${IMAGE_NAME}:''${IMAGE_TAG}
 
   # Ensure that the image has minimal closure size.