summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-25 19:27:23 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-25 19:27:30 +0100
commit9788cbb2de5ed38ab8d66011caf9d2899b8772e7 (patch)
treed15c5f4172bfabc65c44f67d2772a399f9ecc2d3 /pkgs/top-level/release.nix
parentf27fa79aa9c6c2222963edf3e115e35c8e03ac92 (diff)
downloadnixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.tar
nixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.tar.gz
nixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.tar.bz2
nixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.tar.lz
nixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.tar.xz
nixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.tar.zst
nixpkgs-9788cbb2de5ed38ab8d66011caf9d2899b8772e7.zip
Re-enable Darwin builds
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 534080668ec..11a6a6c9c5c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -12,7 +12,7 @@
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ "x86_64-linux" "i686-linux" /* "x86_64-darwin" */ ]
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };
@@ -351,12 +351,6 @@ let
       linuxPackages_grsec_testing_server = { };
       linuxPackages_grsec_testing_server_xen = { };
 
-    } ))
-
-    # Temporary hack: build some stuff on Darwin.
-    // (with import ./release-lib.nix { supportedSystems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; mapTestOn {
-      stdenv = all;
-      hello = all;
-    });
+    } ));
 
 in jobs