diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-09 16:09:47 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-17 17:13:01 -0400 |
| commit | 8c99aab3ea4a9ddbd3918282da7861e674b4e7c4 (patch) | |
| tree | 5c8a663c775e02ad7c7c714d89095f3cd500e0a0 /pkgs/top-level/release.nix | |
| parent | fffcee35f9b2042d4edc5dccb3379972e03ffd84 (diff) | |
| download | nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.tar nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.tar.gz nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.tar.bz2 nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.tar.lz nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.tar.xz nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.tar.zst nixpkgs-8c99aab3ea4a9ddbd3918282da7861e674b4e7c4.zip | |
lib: Fix system parsing, and use for doubles lists
The old hard-coded lists are now used to test system parsing. In the process, make an `assertTrue` in release lib for eval tests; also use it in release-cross
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f2feb29f0cd..2eae99eaef1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -26,7 +26,7 @@ let metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; - lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; }; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -35,7 +35,6 @@ let [ jobs.tarball jobs.metrics jobs.manual - jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin @@ -62,7 +61,8 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + ++ lib.collect lib.isDerivation jobs.lib-tests; }; } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = |