about 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-10-23 13:04:10 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-23 13:05:36 +0200
commit45c7dd7d98f1466b3d631444f71b441a48ccd54c (patch)
tree5c4fc80579319c7771726cb1891ce8b7e3297000 /pkgs/top-level/release.nix
parente48ad583b0d9c1326db652df817e742629e0c18f (diff)
downloadnixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.tar
nixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.tar.gz
nixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.tar.bz2
nixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.tar.lz
nixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.tar.xz
nixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.tar.zst
nixlib-45c7dd7d98f1466b3d631444f71b441a48ccd54c.zip
Add stdenv bootstrap tools generation to release.nix
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cb09a69136e2..94696f93f620 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -19,8 +19,10 @@ with import ./release-lib.nix { inherit supportedSystems; };
 
 let
 
+  lib = pkgs.lib;
+
   jobs =
-    { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
+    { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
 
       manual = import ../../doc;
       lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
@@ -42,9 +44,18 @@ let
               jobs.thunderbird.i686-linux
               jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
               jobs.glib-tested.i686-linux
-            ];
+            ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
 
+      stdenvBootstrapTools.i686-linux =
+        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };
+
+      stdenvBootstrapTools.x86_64-linux =
+        { 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; };
+
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
 
       abcde = linux;