diff options
| author | Domen Kožar <domen@dev.si> | 2016-10-11 23:08:50 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-10-11 23:08:50 +0200 |
| commit | 735c1cacbd01af82ab06f786648dd7024b732666 (patch) | |
| tree | d7bb51c395a105acc4a4b1e117ba76ebf5ae57f6 /pkgs/top-level/release.nix | |
| parent | 2804067fc8a273d547a626510f766ada5dcca4d8 (diff) | |
| download | nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.tar nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.tar.gz nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.tar.bz2 nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.tar.lz nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.tar.xz nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.tar.zst nixpkgs-735c1cacbd01af82ab06f786648dd7024b732666.zip | |
fix unstable job evaluation
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index a8f319bea60..00ba343e685 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -21,6 +21,43 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let + unstable = pkgs.releaseTools.aggregate + { name = "nixpkgs-${jobs.tarball.version}"; + meta.description = "Release-critical builds for the Nixpkgs unstable channel"; + constituents = + [ jobs.tarball + jobs.metrics + jobs.manual + jobs.lib-tests + jobs.stdenv.x86_64-linux + jobs.stdenv.i686-linux + jobs.stdenv.x86_64-darwin + jobs.linux.x86_64-linux + jobs.linux.i686-linux + jobs.python.x86_64-linux + jobs.python.i686-linux + jobs.python.x86_64-darwin + jobs.python3.x86_64-linux + jobs.python3.i686-linux + jobs.python3.x86_64-darwin + # Many developers use nix-repl + jobs.nix-repl.x86_64-linux + jobs.nix-repl.i686-linux + jobs.nix-repl.x86_64-darwin + # Needed by travis-ci to test PRs + jobs.nox.i686-linux + jobs.nox.x86_64-linux + jobs.nox.x86_64-darwin + # Ensure that X11/GTK+ are in order. + jobs.thunderbird.x86_64-linux + jobs.thunderbird.i686-linux + # Ensure that basic stuff works on darwin + jobs.git.x86_64-darwin + jobs.mysql.x86_64-darwin + jobs.vim.x86_64-darwin + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + }; + lib = pkgs.lib; jobs = @@ -33,43 +70,8 @@ let # for consistency with NixOS tested job tested = unstable; + inherit unstable; - unstable = pkgs.releaseTools.aggregate - { name = "nixpkgs-${jobs.tarball.version}"; - meta.description = "Release-critical builds for the Nixpkgs unstable channel"; - constituents = - [ jobs.tarball - jobs.metrics - jobs.manual - jobs.lib-tests - jobs.stdenv.x86_64-linux - jobs.stdenv.i686-linux - jobs.stdenv.x86_64-darwin - jobs.linux.x86_64-linux - jobs.linux.i686-linux - jobs.python.x86_64-linux - jobs.python.i686-linux - jobs.python.x86_64-darwin - jobs.python3.x86_64-linux - jobs.python3.i686-linux - jobs.python3.x86_64-darwin - # Many developers use nix-repl - jobs.nix-repl.x86_64-linux - jobs.nix-repl.i686-linux - jobs.nix-repl.x86_64-darwin - # Needed by travis-ci to test PRs - jobs.nox.i686-linux - jobs.nox.x86_64-linux - jobs.nox.x86_64-darwin - # Ensure that X11/GTK+ are in order. - jobs.thunderbird.x86_64-linux - jobs.thunderbird.i686-linux - # Ensure that basic stuff works on darwin - jobs.git.x86_64-darwin - jobs.mysql.x86_64-darwin - jobs.vim.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; - }; stdenvBootstrapTools.i686-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; |