JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tarball: check systems based on the list of supported systems

Browse Source
This commit is contained in:
Domen Kožar 2021-05-31 16:12:17 +02:00
parent 0d698e6186
commit d93e538b5c
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/make-tarball.nix
View File

@ -4,6 +4,7 @@
{ nixpkgs { nixpkgs
, officialRelease , officialRelease
, supportedSystems
, pkgs ? import nixpkgs.outPath {} , pkgs ? import nixpkgs.outPath {}
, nix ? pkgs.nix , nix ? pkgs.nix
, lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } , lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; }
@ -66,7 +67,7 @@ releaseTools.sourceTarball {
fi fi
# Check that all-packages.nix evaluates on a number of platforms without any warnings. # Check that all-packages.nix evaluates on a number of platforms without any warnings.
for platform in i686-linux x86_64-linux x86_64-darwin; do for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do
header "checking Nixpkgs on $platform" header "checking Nixpkgs on $platform"
nix-env -f . \ nix-env -f . \

2
pkgs/top-level/release-small.nix
View File

@ -12,7 +12,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
{ {
tarball = import ./make-tarball.nix { tarball = import ./make-tarball.nix {
inherit nixpkgs; inherit nixpkgs supportedSystems;
officialRelease = false; officialRelease = false;
}; };

2
pkgs/top-level/release.nix
View File

@ -28,7 +28,7 @@ let
supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;
jobs = jobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; };
metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; };