b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add an aggregated to replace the "tested" NixOS view

Browse source 
Also get rid of the "system" jobset input.
This commit is contained in:
Eelco Dolstra 2013-03-26 14:00:31 +01:00
parent 1b0acab1e5
commit f235cc2884
2 changed files with 206 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
release-combined.nix
View file

@ -1,11 +1,49 @@
{ nixpkgs, officialRelease }: { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
, officialRelease ? false
}:
{ rec {
nixos = import ./release.nix;
nixpkgs = nixos = import ./release.nix {
import <nixpkgs/pkgs/top-level/release.nix> { inherit nixosSrc nixpkgsSrc officialRelease;
inherit nixpkgs officialRelease; };
nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
inherit officialRelease;
nixpkgs = nixpkgsSrc;
# Only do Linux builds. # Only do Linux builds.
supportedSystems = [ "x86_64-linux" "i686-linux" ]; supportedSystems = [ "x86_64-linux" "i686-linux" ];
}; };
tested = (import <nixpkgs> { }).releaseTools.aggregate {
name = "nixos-${nixos.tarball.version}";
meta.description = "Release-critical builds for the NixOS unstable channel";
members =
[ nixos.channel
nixos.manual
nixos.iso_minimal.x86_64-linux
nixos.iso_minimal.i686-linux
nixos.iso_graphical.x86_64-linux
nixos.iso_graphical.i686-linux
nixos.tests.firefox.x86_64-linux
nixos.tests.firewall.x86_64-linux
nixos.tests.installer.lvm.x86_64-linux
nixos.tests.installer.separateBoot.x86_64-linux
nixos.tests.installer.simple.i686-linux
nixos.tests.installer.simple.x86_64-linux
nixos.tests.kde4.i686-linux
nixos.tests.login.i686-linux
nixos.tests.login.x86_64-linux
nixos.tests.misc.i686-linux
nixos.tests.misc.x86_64-linux
nixpkgs.tarball
nixpkgs.emacs.i686-linux
nixpkgs.emacs.x86_64-linux
];
};
} }

145
release.nix
View file

@ -1,19 +1,20 @@
{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; } { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } , nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
#, minimal ? false , officialRelease ? false
}: }:
let let
version = builtins.readFile ./.version; version = builtins.readFile ./.version;
versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}"; versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgsSrc.shortRev}";
systems = [ "x86_64-linux" "i686-linux" ];
pkgs = import <nixpkgs> { system = "x86_64-linux"; };
makeIso = makeIso =
{ module, type, description ? type, maintainers ? ["eelco"] }: { module, type, description ? type, maintainers ? ["eelco"], system }:
{ officialRelease ? false
, system ? builtins.currentSystem
}:
with import <nixpkgs> { inherit system; }; with import <nixpkgs> { inherit system; };
@ -48,12 +49,10 @@ let
makeSystemTarball = makeSystemTarball =
{ module, maintainers ? ["viric"]}: { module, maintainers ? ["viric"], system }:
{ officialRelease ? false
, system ? builtins.currentSystem
}:
with import <nixpkgs> { inherit system; }; with import <nixpkgs> { inherit system; };
let let
versionModule = { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix; }; versionModule = { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix; };
@ -73,21 +72,16 @@ let
}; };
jobs = rec { in {
tarball = tarball =
{ officialRelease ? false }: pkgs.releaseTools.makeSourceTarball {
with import <nixpkgs> {};
releaseTools.makeSourceTarball {
name = "nixos-tarball"; name = "nixos-tarball";
src = nixosSrc; src = nixosSrc;
inherit officialRelease version; inherit officialRelease version;
versionSuffix = lib.optionalString (!officialRelease) versionSuffix; versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
distPhase = '' distPhase = ''
echo -n $VERSION_SUFFIX > .version-suffix echo -n $VERSION_SUFFIX > .version-suffix
@ -103,19 +97,15 @@ let
channel = channel =
{ officialRelease ? false }: pkgs.releaseTools.makeSourceTarball {
with import <nixpkgs> {};
releaseTools.makeSourceTarball {
name = "nixos-channel"; name = "nixos-channel";
src = nixosSrc; src = nixosSrc;
inherit officialRelease version; inherit officialRelease version;
versionSuffix = lib.optionalString (!officialRelease) versionSuffix; versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
buildInputs = [ nixUnstable ]; buildInputs = [ pkgs.nixUnstable ];
expr = builtins.readFile lib/channel-expr.nix; expr = builtins.readFile lib/channel-expr.nix;
@ -125,7 +115,7 @@ let
ensureDir "$out/tarballs" ensureDir "$out/tarballs"
mkdir ../$releaseName mkdir ../$releaseName
cp -prd . ../$releaseName/nixos cp -prd . ../$releaseName/nixos
cp -prd ${nixpkgs} ../$releaseName/nixpkgs cp -prd ${nixpkgsSrc} ../$releaseName/nixpkgs
echo "$expr" > ../$releaseName/default.nix echo "$expr" > ../$releaseName/default.nix
NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
cd .. cd ..
@ -136,10 +126,8 @@ let
manual = manual =
{ officialRelease ? false }:
(import "${nixosSrc}/doc/manual" { (import "${nixosSrc}/doc/manual" {
pkgs = import <nixpkgs> {}; inherit pkgs;
options = options =
(import lib/eval-config.nix { (import lib/eval-config.nix {
modules = [ modules = [
@ -147,91 +135,98 @@ let
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";
} ]; } ];
}).options; }).options;
revision = toString nixosSrc.rev; revision = toString (nixosSrc.rev or nixosSrc.shortRev);
}).manual; }).manual;
iso_minimal = makeIso { iso_minimal = pkgs.lib.genAttrs systems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
type = "minimal"; type = "minimal";
}; inherit system;
});
iso_graphical = makeIso { iso_graphical = pkgs.lib.genAttrs systems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
type = "graphical"; type = "graphical";
}; inherit system;
});
# A variant with a more recent (but possibly less stable) kernel # A variant with a more recent (but possibly less stable) kernel
# that might support more hardware. # that might support more hardware.
iso_new_kernel = makeIso { iso_new_kernel = pkgs.lib.genAttrs systems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix; module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
type = "new-kernel"; type = "new-kernel";
}; inherit system;
});
# A variant with efi booting support. Once cd-minimal has a newer kernel, # A variant with efi booting support. Once cd-minimal has a newer kernel,
# this should be enabled by default. # this should be enabled by default.
iso_efi = makeIso { iso_efi = pkgs.lib.genAttrs systems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-efi.nix; module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
type = "efi"; type = "efi";
maintainers = [ "shlevy" ]; maintainers = [ "shlevy" ];
}; inherit system;
});
# Provide a tarball that can be unpacked into an SD card, and easily # Provide a tarball that can be unpacked into an SD card, and easily
# boot that system from uboot (like for the sheevaplug). # boot that system from uboot (like for the sheevaplug).
# The pc variant helps preparing the expression for the system tarball # The pc variant helps preparing the expression for the system tarball
# in a machine faster than the sheevpalug # in a machine faster than the sheevpalug
system_tarball_pc = makeSystemTarball { system_tarball_pc = pkgs.lib.genAttrs systems (system: makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-pc.nix; module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
}; inherit system;
});
/* /*
system_tarball_fuloong2f = system_tarball_fuloong2f =
assert builtins.currentSystem == "mips64-linux"; assert builtins.currentSystem == "mips64-linux";
makeSystemTarball { makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix; module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
} { system = "mips64-linux"; }; system = "mips64-linux";
};
system_tarball_sheevaplug = system_tarball_sheevaplug =
assert builtins.currentSystem == "armv5tel-linux"; assert builtins.currentSystem == "armv5tel-linux";
makeSystemTarball { makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix; module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
} { system = "armv5tel-linux"; }; system = "armv5tel-linux";
};
*/ */
tests = { system ? "x86_64-linux" }: tests =
let let
t = import ./tests { inherit system; }; runTest = f: pkgs.lib.genAttrs systems (system:
f (import ./tests { inherit system; })
);
in { in {
avahi = t.avahi.test; avahi = runTest (t: t.avahi.test);
bittorrent = t.bittorrent.test; bittorrent = runTest (t: t.bittorrent.test);
firefox = t.firefox.test; firefox = runTest (t: t.firefox.test);
firewall = t.firewall.test; firewall = runTest (t: t.firewall.test);
installer.grub1 = t.installer.grub1.test; installer.grub1 = runTest (t: t.installer.grub1.test);
installer.lvm = t.installer.lvm.test; installer.lvm = runTest (t: t.installer.lvm.test);
installer.rebuildCD = t.installer.rebuildCD.test; installer.rebuildCD = runTest (t: t.installer.rebuildCD.test);
installer.separateBoot = t.installer.separateBoot.test; installer.separateBoot = runTest (t: t.installer.separateBoot.test);
installer.simple = t.installer.simple.test; installer.simple = runTest (t: t.installer.simple.test);
installer.swraid = t.installer.swraid.test; installer.swraid = runTest (t: t.installer.swraid.test);
ipv6 = t.ipv6.test; ipv6 = runTest (t: t.ipv6.test);
kde4 = t.kde4.test; kde4 = runTest (t: t.kde4.test);
login = t.login.test; login = runTest (t: t.login.test);
misc = t.misc.test; misc = runTest (t: t.misc.test);
mpich = t.mpich.test; mpich = runTest (t: t.mpich.test);
mysql = t.mysql.test; mysql = runTest (t: t.mysql.test);
mysql_replication = t.mysql_replication.test; mysql_replication = runTest (t: t.mysql_replication.test);
nat = t.nat.test; nat = runTest (t: t.nat.test);
nfs = t.nfs.test; nfs = runTest (t: t.nfs.test);
openssh = t.openssh.test; openssh = runTest (t: t.openssh.test);
proxy = t.proxy.test; proxy = runTest (t: t.proxy.test);
quake3 = t.quake3.report; quake3 = runTest (t: t.quake3.report);
#subversion = t.subversion.report; #subversion = runTest (t: t.subversion.report);
tomcat = t.tomcat.test; tomcat = runTest (t: t.tomcat.test);
trac = t.trac.test; trac = runTest (t: t.trac.test);
xfce = t.xfce.test; xfce = runTest (t: t.xfce.test);
}; };
}; }
in jobs