Skip to content

Commit

Permalink
release.nix: pass missing parameter
Browse files Browse the repository at this point in the history
Commit 5643714 introduced a tiny
bug, neglecting to pass the `pkgs` parameter to `release.nix`.

This bug went unnoticed because commit
e663518 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.
  • Loading branch information
Adam Joseph committed Sep 12, 2022
1 parent 2a452a4 commit 09d4fd0
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions pkgs/top-level/release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,19 @@ let
(system: {
inherit
(import ../stdenv/linux/make-bootstrap-tools.nix {
localSystem = { inherit system; };
pkgs = import ../.. {
localSystem = { inherit system; };
};
})
dist test;
})
# darwin is special in this
// 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;
Expand All @@ -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;
Expand Down

0 comments on commit 09d4fd0

Please sign in to comment.