diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-18 11:24:18 +0200 |
| commit | e9aeb55f3bc5206606ca22db8ad01bcabb8118a4 (patch) | |
| tree | 48b3c280de3eb20282b583276eaf49b6fd511f23 /pkgs/top-level/release.nix | |
| parent | 71a7e221d8f0def852f3a692daa3904a50523b30 (diff) | |
| parent | 0eff1d9f2af05353a827a3896ebcc2bce20d2fdd (diff) | |
Merge branch 'master' into staging
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 089e0ef4518e..be57b40fca64 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -28,7 +28,7 @@ let metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; - lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; }; + lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; darwin-tested = pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; @@ -52,6 +52,7 @@ let [ jobs.tarball jobs.metrics jobs.manual + jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin @@ -78,8 +79,7 @@ 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.lib-tests; + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; }; } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = |