From 14d20134eeda227cfd087b8154aba895eb288954 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 28 May 2016 18:36:19 +0200
Subject: release.nix: Add vuizvui pkgs to generic channel

This adds all the packages that are marked to be built on Hydra to the
constituents of the generic channel so that we can ensure that the
channel always stays with succeeding builds.

It's especially useful for the patched gitlab that is used for the
OpenLab website VM, because it is not a NixOS system. We can simply use
the generic channel over there and stay up-to-date with it without
getting broken builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
---
 release.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index 5cb6556c..a64a10aa 100644
--- a/release.nix
+++ b/release.nix
@@ -47,6 +47,14 @@ let
     vuizvuiTests = "${vuizvui}/tests";
   });
 
+  pkgs = with pkgsUpstream.lib; let
+    noGames = flip removeAttrs [ "games" ];
+    releaseLib = import "${nixpkgs}/pkgs/top-level/release-lib.nix" {
+      inherit supportedSystems;
+      packageSet = attrs: noGames (import vuizvui attrs).pkgs.vuizvui;
+    };
+  in with releaseLib; mapTestOn (packagePlatforms releaseLib.pkgs);
+
 in with pkgsUpstream.lib; with builtins; {
 
   machines = let
@@ -78,13 +86,7 @@ in with pkgsUpstream.lib; with builtins; {
     inherit (allTests) vuizvui;
   };
 
-  pkgs = let
-    noGames = flip removeAttrs [ "games" ];
-    releaseLib = import "${nixpkgs}/pkgs/top-level/release-lib.nix" {
-      inherit supportedSystems;
-      packageSet = attrs: noGames (import vuizvui attrs).pkgs.vuizvui;
-    };
-  in with releaseLib; mapTestOn (packagePlatforms releaseLib.pkgs);
+  inherit pkgs;
 
   channels = let
     mkChannel = attrs: root.pkgs.vuizvui.mkChannel (rec {
@@ -98,7 +100,9 @@ in with pkgsUpstream.lib; with builtins; {
     gatherTests = active: map (path: getAttrFromPath path allTests) active;
 
   in {
-    generic = mkChannel {};
+    generic = mkChannel {
+      constituents = collect isDerivation pkgs;
+    };
 
     machines = mapAttrsRecursiveCond (m: !(m ? eval)) (path: attrs: mkChannel {
       name = "machine-${last path}";
-- 
cgit 1.4.1