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

Add an "unstable" aggregate to replace the "unstable" view

Browse Source 
Views are obsolete, aggregates are the declarative replacement.
This commit is contained in:
Eelco Dolstra 2013-03-26 11:57:44 +01:00
parent 993fc7206d
commit bcc14c4d3c
4 changed files with 433 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -2185,7 +2185,7 @@ let
stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
profiledCompiler = false; profiledCompiler = false;
enableMultilib = true; enableMultilib = true;
})) else throw "Multilib gcc not supported on this system"; })) else throw "Multilib gcc not supported on ‘${system}’";
gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
inherit noSysDirs; inherit noSysDirs;

4
pkgs/top-level/make-tarball.nix
View File

@ -2,9 +2,7 @@
also builds the documentation and tests whether the Nix expressions also builds the documentation and tests whether the Nix expressions
evaluate correctly. */ evaluate correctly. */
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs, officialRelease }:
, officialRelease ? false
}:
with import nixpkgs.outPath {}; with import nixpkgs.outPath {};

2
pkgs/top-level/release-lib.nix
View File

@ -5,7 +5,7 @@ rec {
config.allowUnfree = false; config.allowUnfree = false;
}); });
pkgs = allPackages { }; pkgs = allPackages { system = "x86_64-linux"; };
# The platforms for which we build Nixpkgs. # The platforms for which we build Nixpkgs.

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

@ -9,13 +9,34 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/ */
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false
}:
with import ./release-lib.nix; with import ./release-lib.nix;
{ let
tarball = import ./make-tarball.nix; jobs =
{ tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { unstable = pkgs.releaseTools.aggregate
{ name = "nixpkgs-${jobs.tarball.version}";
meta.description = "Release-critical builds for the Nixpkgs unstable channel";
members =
[ jobs.tarball
jobs.stdenv.x86_64-linux
jobs.stdenv.i686-linux
jobs.stdenv.x86_64-darwin
jobs.linux.x86_64-linux
jobs.linux.i686-linux
# Ensure that X11/GTK+ are in order.
jobs.thunderbird.x86_64-linux
jobs.thunderbird.i686-linux
];
};
} // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec {
abcde = linux; abcde = linux;
alsaUtils = linux; alsaUtils = linux;
@ -151,7 +172,7 @@ with import ./release-lib.nix;
jwhois = linux; jwhois = linux;
kbd = linux; kbd = linux;
keen4 = ["i686-linux"]; keen4 = ["i686-linux"];
# klibc = linux; # klibc = linux;
kvm = linux; kvm = linux;
qemu = linux; qemu = linux;
qemu_kvm = linux; qemu_kvm = linux;
@ -433,4 +454,6 @@ with import ./release-lib.nix;
xfwm4 = linux; xfwm4 = linux;
}; };
} )) } ));
in jobs