1 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 50331b83e8e..2be6201ab06 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -45,6 +45,10 @@ let
               jobs.thunderbird.i686-linux
               jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
               jobs.glib-tested.i686-linux
+              # Ensure that basic stuff works on darwin
+              jobs.git.x86_64-darwin
+              jobs.mysql.x86_64-darwin
+              jobs.vim.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
 
@@ -55,10 +59,24 @@ let
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
 
       stdenvBootstrapTools.x86_64-darwin =
-        { inherit (import ../stdenv/pure-darwin/make-bootstrap-tools.nix) dist test; };
+        let
+          bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
+        in {
+          # Lightweight distribution and test
+          inherit (bootstrap) dist test;
+          # Test a full stdenv bootstrap from the bootstrap tools definition
+          inherit (bootstrap.test-pkgs) stdenv;
+        };
 
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
 
+      # TODO: most (but possibly not all) of the jobs specified here are unnecessary now that we have release-lib.nix
+      # traversing all packages and looking at their meta.platform attributes. Someone who's better at this than I am
+      # should go through these and kill the ones that are safe to kill.
+      #
+      # <niksnut> note that all that " = linux" stuff in release.nix is legacy, from before we had meta.platforms
+      # <copumpkin> niksnut: so should I just kill all the obsolete jobs in release.nix?
+      # <niksnut> I don't know if they're all covered
       abcde = linux;
       aspell = all;
       atlas = linux;
@@ -99,8 +117,6 @@ let
       gcj = linux;
       ghostscript = linux;
       ghostscriptX = linux;
-      git = linux;
-      gitFull = linux;
       glibc = linux;
       glibcLocales = linux;
       glxinfo = linux;
@@ -144,9 +160,6 @@ let
       mod_python = linux;
       mupen64plus = linux;
       mutt = linux;
-      mysql = linux;
-      mysql51 = linux;
-      mysql55 = linux;
       nano = allBut cygwin;
       ncat = linux;
       netcat = all;
@@ -191,7 +204,6 @@ let
       uae = linux;
       viking = linux;
       vice = linux;
-      vim = linux;
       vimHugeX = linux;
       vncrec = linux;
       vorbisTools = linux;
@@ -217,6 +229,8 @@ let
       zsh = linux;
       zsnes = ["i686-linux"];
 
+      emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+
       gnome = {
         gnome_panel = linux;
         metacity = linux;