diff options
| author | Domen Kožar <domen@dev.si> | 2021-05-31 16:12:17 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2021-05-31 16:12:17 +0200 |
| commit | d93e538b5c17715397114834c800b23d99d2ac24 (patch) | |
| tree | 2369e9b27a1ea42a8323996769c11f4db1af4123 | |
| parent | 0d698e61863a9920fa92eb5fe6fa10cab4e415e0 (diff) | |
| download | nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.tar nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.tar.gz nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.tar.bz2 nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.tar.lz nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.tar.xz nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.tar.zst nixpkgs-d93e538b5c17715397114834c800b23d99d2ac24.zip | |
tarball: check systems based on the list of supported systems
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/release-small.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index f65829e29ca..d0728c5d1b2 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -4,6 +4,7 @@ { nixpkgs , officialRelease +, supportedSystems , pkgs ? import nixpkgs.outPath {} , nix ? pkgs.nix , lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } @@ -66,7 +67,7 @@ releaseTools.sourceTarball { fi # 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" nix-env -f . \ diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7f86b30aaf0..47c47e04e1c 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -12,7 +12,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; { tarball = import ./make-tarball.nix { - inherit nixpkgs; + inherit nixpkgs supportedSystems; officialRelease = false; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0b18dd1ecf2..e62c3ecc19b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -28,7 +28,7 @@ let supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport; 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; }; |