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

lib: move the list of supportedSystems from pkgs/top-level/release.nix to lib/systems/doubles.nix #295083

Closed
wants to merge 1 commit into from
Closed

lib: move the list of supportedSystems from pkgs/top-level/release.nix to lib/systems/doubles.nix #295083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion lib/systems/doubles.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ let
inherit (lib.systems.inspect) predicates;
inherit (lib.attrsets) matchAttrs;

# The platform doubles for which we build Nixpkgs.
# See `pkgs/top-level/release.nix` for where this value is consumed.
builtOnNixosHydra = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];

all = [
# Cygwin
"i686-cygwin" "x86_64-cygwin"
Expand Down Expand Up @@ -63,7 +67,7 @@ let
filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);

in {
inherit all;
inherit all builtOnNixosHydra;

none = [];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/release-lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
, scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
# Just the Nixpkgs library functions and data.
, lib ? (import ../../lib)
}:

let
lib = import ../../lib;

inherit (lib)
addMetaAttrs
any
Expand Down
9 changes: 6 additions & 3 deletions pkgs/top-level/release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
{ nixpkgs ? { outPath = lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
, system ? builtins.currentSystem
, officialRelease ? false
# The platform doubles for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
, supportedSystems ? lib.systems.doubles.builtOnNixosHydra
# The platform triples for which we build bootstrap tools.
, bootstrapConfigs ? [
"aarch64-apple-darwin"
Expand Down Expand Up @@ -45,11 +45,14 @@
# pkgs/top-level/.
#
, attrNamesOnly ? false

# Just the Nixpkgs library functions and data.
, lib ? (import ../../lib)
}:

let
release-lib = import ./release-lib.nix {
inherit supportedSystems scrubJobs nixpkgsArgs system;
inherit supportedSystems scrubJobs nixpkgsArgs system lib;
};

inherit (release-lib) mapTestOn pkgs;
Expand Down