Merge pull request #500 from tweag/philipp/nix_shell_refactor

`nix-shell --pure`
tweag · Jul 8, 2024 · 3248507 · 3248507
2 parents f9a387a + c037f7a
commit 3248507
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -119,7 +119,7 @@ jobs:
                   continue
               else
                   echo "::group::Running $example_name"
-                  nix-shell --command 'bazel run --config=nix :hello'
+                  nix-shell --pure --keep GITHUB_STEP_SUMMARY --keep GITHUB_REPOSITORY --keep BZLMOD_ENABLED --keep BAZEL_NIX_REMOTE --command 'bazel run --config=nix :hello'
                   # TODO: all toolchains should run without Nixpkgs
               fi
               popd

diff --git a/examples/toolchains/cc/shell.nix b/examples/toolchains/cc/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.nix pkgs.bazel_6 ]; }
diff --git a/examples/toolchains/cc_cross_osx_to_linux_amd64/shell.nix b/examples/toolchains/cc_cross_osx_to_linux_amd64/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.nix pkgs.bazel_6 ]; }
diff --git a/examples/toolchains/cc_with_deps/shell.nix b/examples/toolchains/cc_with_deps/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.nix pkgs.bazel_6 ]; }
diff --git a/examples/toolchains/go/shell.nix b/examples/toolchains/go/shell.nix
@@ -1,3 +1,6 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
+pkgs.mkShellNoCC {
+  nativeBuildInputs = [ pkgs.nix pkgs.bazel_6 ];
+  env.BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN = "1";
+}
diff --git a/examples/toolchains/java/shell.nix b/examples/toolchains/java/shell.nix
@@ -1,3 +1,6 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
+pkgs.mkShellNoCC {
+  nativeBuildInputs = [ pkgs.nix pkgs.bazel_6 ];
+  env.BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN = "1";
+}
diff --git a/examples/toolchains/nodejs/shell.nix b/examples/toolchains/nodejs/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = with pkgs; [ bazel_6 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = with pkgs; [ nix bazel_6 ]; }
diff --git a/examples/toolchains/python/shell.nix b/examples/toolchains/python/shell.nix
@@ -1,3 +1,6 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
+pkgs.mkShellNoCC {
+  nativeBuildInputs = [ pkgs.nix pkgs.bazel_6 ];
+  env.BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN = "1";
+}
diff --git a/examples/toolchains/rust/shell.nix b/examples/toolchains/rust/shell.nix
@@ -1,6 +1,6 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 with pkgs;
 mkShell {
-  nativeBuildInputs = [ bazel_6 git nix zlib libiconv ]
+  nativeBuildInputs = [ bazel_6 cacert git nix zlib libiconv ]
     ++ (lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]);
 }