diff options
| author | Domen Kožar <domen@dev.si> | 2016-10-12 18:11:13 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-10-13 17:06:03 +0200 |
| commit | 6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5 (patch) | |
| tree | 20c60b6d3f61f11908a47804e28a99a39854761e /pkgs/top-level/release.nix | |
| parent | 9a668ec58be6a432cd080656177b5c71e45db36f (diff) | |
| download | nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.tar nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.tar.gz nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.tar.bz2 nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.tar.lz nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.tar.xz nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.tar.zst nixpkgs-6d9fe5dc8ae1d4114d2047eb9d0eb16696714dc5.zip | |
Revert "nixpkgs: add tested alias for unstable job"
This reverts commit 69e614d1e64cb50cb9b5b24a4c1668a649d54eec.
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 79 |
1 files changed, 37 insertions, 42 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 00ba343e685..d3fb4e646c3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -21,57 +21,52 @@ 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 = - rec { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; + { 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; - + 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; }; |