Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

freshBootstrapTools: rename from stdenvBootstrapTools #183072

Merged
merged 6 commits into from Sep 25, 2022
Merged

freshBootstrapTools: rename from stdenvBootstrapTools #183072

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09d4fd0
release.nix: pass missing parameter
Jul 27, 2022
bf4312d
freshBootstrapTools: rename from stdenvBootstrapTools
trofi Jul 19, 2022
47de66b
lib/attrsets.nix: add unionOfDisjoint
Sep 5, 2022
e7bafc8
pkgs/top-level/release.nix: disallow symbol clash between 'pkgs' and …
trofi Jul 26, 2022
99da193
note that `unionOfDisjoint` is commutative, unlike //
Sep 12, 2022
037cf2f
unionOfDisjoint: use builtins.intersectAttrs
Sep 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/attrsets.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,17 @@ rec {
dontRecurseIntoAttrs =
attrs: attrs // { recurseForDerivations = false; };

/* `unionOfDisjoint x y` is equal to `x // y // z` where the
attrnames in `z` are the intersection of the attrnames in `x` and
`y`, and all values `assert` with an error message. This
operator is commutative, unlike (//). */
unionOfDisjoint = x: y:
x // (mapAttrs
(name: val:
if hasAttr name x
then builtins.throw "attribute collision: ${name}"
else val) y);

/*** deprecated stuff ***/

zipWithNames = zipAttrsWithNames;
Expand Down
7 changes: 5 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,15 +2186,18 @@ with pkgs;

brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;

stdenvBootstrapTools = if stdenv.hostPlatform.isDarwin then
# Derivation's result is not used by nixpkgs. Useful for validation for
# regressions of bootstrapTools on hydra and on ofborg. Example:
# pkgsCross.aarch64-multiplatform.freshBootstrapTools.build
freshBootstrapTools = if stdenv.hostPlatform.isDarwin then
callPackage ../stdenv/darwin/make-bootstrap-tools.nix {
localSystem = stdenv.buildPlatform;
crossSystem =
if stdenv.buildPlatform == stdenv.hostPlatform then null else stdenv.hostPlatform;
}
else if stdenv.hostPlatform.isLinux then
callPackage ../stdenv/linux/make-bootstrap-tools.nix {}
else throw "stdenvBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";

boxes = callPackage ../tools/text/boxes { };

Expand Down
25 changes: 20 additions & 5 deletions pkgs/top-level/release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let
"aarch64"
] (arch: builtins.elem "${arch}-darwin" systemsWithAnySupport);

jobs =
nonPackageJobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; };

metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
Expand Down 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,14 +190,25 @@ 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;
};
};

} // (mapTestOn ((packagePlatforms pkgs) // {
};

# Do not allow attribute collision between jobs inserted in
# 'nonPackageAttrs' and jobs pulled in from 'pkgs'.
# Conflicts usually cause silent job drops like in
# https://github.com/NixOS/nixpkgs/pull/182058
jobs = lib.attrsets.unionOfDisjoint
nonPackageJobs
(mapTestOn ((packagePlatforms pkgs) // {
haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages;
idrisPackages = packagePlatforms pkgs.idrisPackages;
Expand Down