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

Add more jobs to the "tested" aggregate

This commit is contained in:
Eelco Dolstra 2013-08-15 13:19:27 +02:00
parent 2fcd1195e6
commit ec9ae91205
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
release-combined.nix
View File

@ -4,6 +4,7 @@
}: }:
let let
nixpkgs' = nixpkgs; # urgh nixpkgs' = nixpkgs; # urgh
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
@ -13,6 +14,7 @@ let
then set // { meta = builtins.removeAttrs (set.meta or {}) [ "maintainers" ]; } then set // { meta = builtins.removeAttrs (set.meta or {}) [ "maintainers" ]; }
else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
else set; else set;
in rec { in rec {
nixos = removeMaintainers (import ./release.nix { nixos = removeMaintainers (import ./release.nix {
inherit nixosSrc officialRelease; inherit nixosSrc officialRelease;
@ -30,32 +32,30 @@ in rec {
name = "nixos-${nixos.tarball.version}"; name = "nixos-${nixos.tarball.version}";
meta = { meta = {
description = "Release-critical builds for the NixOS unstable channel"; description = "Release-critical builds for the NixOS unstable channel";
maintainers = [ pkgs.lib.maintainers.shlevy ]; maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
}; };
constituents = constituents =
let all = x: [ x.x86_64-linux x.i686-linux ]; in
[ nixos.channel [ nixos.channel
nixos.manual nixos.manual
nixos.iso_minimal.x86_64-linux (all nixos.iso_minimal)
nixos.iso_minimal.i686-linux (all nixos.iso_graphical)
nixos.iso_graphical.x86_64-linux nixos.vdi.x86_64-linux
nixos.iso_graphical.i686-linux
nixos.tests.firefox.x86_64-linux (all nixos.tests.firefox)
nixos.tests.firewall.x86_64-linux (all nixos.tests.firewall)
nixos.tests.installer.lvm.x86_64-linux (all nixos.tests.installer.lvm)
nixos.tests.installer.separateBoot.x86_64-linux (all nixos.tests.installer.separateBoot)
nixos.tests.installer.simple.i686-linux (all nixos.tests.installer.simple)
nixos.tests.installer.simple.x86_64-linux (all nixos.tests.kde4)
nixos.tests.kde4.i686-linux (all nixos.tests.login)
nixos.tests.login.i686-linux (all nixos.tests.misc)
nixos.tests.login.x86_64-linux (all nixos.tests.openssh)
nixos.tests.misc.i686-linux (all nixos.tests.xfce)
nixos.tests.misc.x86_64-linux
nixpkgs.tarball nixpkgs.tarball
nixpkgs.emacs.i686-linux (all nixpkgs.emacs)
nixpkgs.emacs.x86_64-linux
]; ];
}; };