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

fix unstable job evaluation

Browse Source
This commit is contained in:
Domen Kožar 2016-10-11 23:08:50 +02:00
parent 2804067fc8
commit 735c1cacbd
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,19 +21,6 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
let let
lib = pkgs.lib;
jobs =
rec { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
manual = import ../../doc;
lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
# for consistency with NixOS tested job
tested = unstable;
unstable = pkgs.releaseTools.aggregate unstable = pkgs.releaseTools.aggregate
{ name = "nixpkgs-${jobs.tarball.version}"; { name = "nixpkgs-${jobs.tarball.version}";
meta.description = "Release-critical builds for the Nixpkgs unstable channel"; meta.description = "Release-critical builds for the Nixpkgs unstable channel";
@ -71,6 +58,21 @@ let
] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
}; };
lib = pkgs.lib;
jobs =
rec { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
manual = import ../../doc;
lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
# for consistency with NixOS tested job
tested = unstable;
inherit unstable;
stdenvBootstrapTools.i686-linux = stdenvBootstrapTools.i686-linux =
{ inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };