Cleaned up release.nix

cleverca22 · Feb 28, 2017 · 11b1196 · 11b1196
1 parent 386a94b
commit 11b1196
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/release.nix b/release.nix
@@ -1,12 +1,10 @@
 { nixpkgs ? <nixpkgs> }:
 
 let
-  fn = system:
-    let
-      pkgs = import nixpkgs { config = {}; inherit system; };
-    in {
-      toxvpn.${system} = pkgs.callPackage ./default.nix {};
-    };
+  pkgsFromSystem = system: (import nixpkgs { config = {}; inherit system; });
+  makeJob = (s: { ${s} = (pkgsFromSystem s).callPackage ./default.nix {}; });
   nativePkgs = import nixpkgs {};
-  makeJobs = nativePkgs.lib.foldl (total: next: total // (fn next)) {};
-in makeJobs [ "x86_64-linux" "x86_64-darwin" ]
+  merge = a: b: a // b;
+  mergeList = builtins.foldl' merge {};
+  makeJobs = systems: mergeList (map makeJob systems);
+in { toxvpn = makeJobs [ "x86_64-linux" "x86_64-darwin" ]; }