diff options
author | Adam Joseph <adam@westernsemico.com> | 2022-07-26 21:04:24 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2022-09-12 12:53:31 -0700 |
commit | 09d4fd0f771392252592355387f3015596caed0d (patch) | |
tree | 4203538b31b25c48d074f10e52dc7dfa0767bc23 /pkgs/top-level/release.nix | |
parent | 2a452a4cbebdd41d3399b64f442f282d819c6d4f (diff) |
release.nix: pass missing parameter
Commit 5643714dea562f0161529ab23058562afeff46d0 introduced a tiny bug, neglecting to pass the `pkgs` parameter to `release.nix`. This bug went unnoticed because commit e663518d18e7dedce127edc26888fd997e6c1e73 had introduced a much larger bug: an attribute collision resulted in `stdenvBootstrapTools` being shadowed, and therefore never evaluated. As a result, the missing `pkgs` parameter did not lead to an error. This commit passes the missing parameter so that fixing the larger/earlier bug will not cause an eval failure.
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r-- | pkgs/top-level/release.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index bac3d1b1171dd..d96f742d5d3f4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -167,7 +167,9 @@ let (system: { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { - localSystem = { inherit system; }; + pkgs = import ../.. { + localSystem = { inherit system; }; + }; }) dist test; }) @@ -175,7 +177,9 @@ let // optionalAttrs supportDarwin.x86_64 { x86_64-darwin = let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; + bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { + localSystem = { system = "x86_64-darwin"; }; + }; in { # Lightweight distribution and test inherit (bootstrap) dist test; @@ -186,7 +190,10 @@ let # Cross compiled bootstrap tools aarch64-darwin = let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; crossSystem = "aarch64-darwin"; }; + bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { + localSystem = { system = "x86_64-darwin"; }; + crossSystem = { system = "aarch64-darwin"; }; + }; in { # Distribution only for now inherit (bootstrap) dist; |