From f235cc2884e282cf1cfb49d9b2ce1f493c850c50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 14:00:31 +0100
Subject: Add an aggregated to replace the "tested" NixOS view

Also get rid of the "system" jobset input.
---
 release-combined.nix | 58 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 10 deletions(-)

(limited to 'release-combined.nix')

diff --git a/release-combined.nix b/release-combined.nix
index 004dd1b250a..b26a2184ddb 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -1,11 +1,49 @@
-{ nixpkgs, officialRelease }:
-
-{
-  nixos = import ./release.nix;
-  nixpkgs =
-    import <nixpkgs/pkgs/top-level/release.nix> {
-      inherit nixpkgs officialRelease;
-      # Only do Linux builds.
-      supportedSystems = [ "x86_64-linux" "i686-linux" ];
-    };
+{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
+, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+, officialRelease ? false
+}:
+
+rec {
+
+  nixos = import ./release.nix {
+    inherit nixosSrc nixpkgsSrc officialRelease;
+  };
+
+  nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
+    inherit officialRelease;
+    nixpkgs = nixpkgsSrc;
+    # Only do Linux builds.
+    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
+      ];
+  };
+
 }
-- 
cgit 1.4.1