From cad6118e20a520b7536879d951ab6c3228b3e111 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 2 Aug 2025 14:17:29 +0200 Subject: [PATCH] subprojects/nix-eval-jobs: don't set NIX_PATH Corresponding upstream change: https://github.com/nix-community/nix-eval-jobs/commit/f584ae856ebab2d20115c5d1424f4d2fb9e0e6a6.patch Co-authored-by: Mic92 Change-Id: Id6085968f7f4ccdbc8035f608ff75420fbf962a5 --- doc/manual/change-authors.yml | 3 +++ doc/manual/rl-next/nix_path-nix-eval-jobs.md | 10 ++++++++++ subprojects/nix-eval-jobs/src/nix-eval-jobs.cc | 4 ---- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 doc/manual/rl-next/nix_path-nix-eval-jobs.md diff --git a/doc/manual/change-authors.yml b/doc/manual/change-authors.yml index c4d212fd0..8cf92070a 100644 --- a/doc/manual/change-authors.yml +++ b/doc/manual/change-authors.yml @@ -156,6 +156,9 @@ ma27: matthewbauer: github: matthewbauer +mic92: + github: mic92 + midnightveil: display_name: julia forgejo: midnightveil diff --git a/doc/manual/rl-next/nix_path-nix-eval-jobs.md b/doc/manual/rl-next/nix_path-nix-eval-jobs.md new file mode 100644 index 000000000..94e45ba02 --- /dev/null +++ b/doc/manual/rl-next/nix_path-nix-eval-jobs.md @@ -0,0 +1,10 @@ +--- +synopsis: "nix-eval-jobs: retain NIX_PATH" +issues: [] +cls: [3859] +category: Fixes +credits: [ma27,mic92] +--- + +`nix-eval-jobs` doesn't clear the `NIX_PATH` from the environment anymore. This matches the behavior +of [upstream version `2.30`](https://github.com/nix-community/nix-eval-jobs/releases/tag/v2.30.0). diff --git a/subprojects/nix-eval-jobs/src/nix-eval-jobs.cc b/subprojects/nix-eval-jobs/src/nix-eval-jobs.cc index fa1f63da2..d672ed103 100644 --- a/subprojects/nix-eval-jobs/src/nix-eval-jobs.cc +++ b/subprojects/nix-eval-jobs/src/nix-eval-jobs.cc @@ -355,10 +355,6 @@ void collector(MyArgs &myArgs, Sync &state_, int main(int argc, char **argv) { - /* Prevent undeclared dependencies in the evaluation via - $NIX_PATH. */ - unsetenv("NIX_PATH"); - /* We are doing the garbage collection by killing forks */ setenv("GC_DONT_GC", "1", 1);