release: Constrain set of packages to build.

We don't want to build non-free stuff on our Hydra and also we want to
have builds for all supported systems. In addition, this should get rid
of a few evaluation errors that happen because Hydra tries to create
jobs out of attributes which are not derivations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/release.nix b/release.nix
index ab7a46c1..2ff78bc1 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,5 @@
 let
+  supportedSystems = [ "i686-linux" "x86_64-linux" ];
   system = "x86_64-linux";
   pkgs = import <nixpkgs> { inherit system; };
 
@@ -12,11 +13,14 @@ in with pkgs.lib; with builtins; {
     inherit system;
   });
 
-  pkgs = import ./pkgs {
-    pkgs = import <nixpkgs> {
-      inherit system;
+  pkgs = let
+    releaseLib = import <nixpkgs/pkgs/top-level/release-lib.nix> {
+      inherit supportedSystems;
+      packageSet = attrs: import ./pkgs {
+        pkgs = import <nixpkgs> attrs;
+      } // { inherit (pkgs) lib; };
     };
-  };
+  in with releaseLib; mapTestOn (packagesWithMetaPlatform releaseLib.pkgs);
 
   manual = let
     modules = import <nixpkgs/nixos/lib/eval-config.nix> {