summary refs log tree commit diff
path: root/pkgs/top-level/release-small.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level/release-small.nix')
-rw-r--r--pkgs/top-level/release-small.nix23
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 921a6e741343..8a91954fdf5a 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -1,19 +1,18 @@
 /* A small release file, with few packages to be built.  The aim is to reduce
-   the load on Hydra when testing the `stdenv-updates' branch.
+   the load on Hydra when testing the `stdenv-updates' branch. */
 
+{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+}:
 
-   This file will be evaluated by hydra with a call like this:
-   hydra_eval_jobs --gc-roots-dir \
-     /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \
-     system i686-linux --argstr system x86_64-linux --arg \
-     nixpkgs "{outPath = ./}" .... release.nix
-
-   Hydra can be installed with "nix-env -i hydra".  */
-with (import ./release-lib.nix);
+with import ./release-lib.nix { inherit supportedSystems; };
 
 {
 
-  tarball = import ./make-tarball.nix;
+  tarball = import ./make-tarball.nix {
+    inherit nixpkgs;
+    officialRelease = false;
+  };
 
 } // (mapTestOn (rec {
 
@@ -47,12 +46,12 @@ with (import ./release-lib.nix);
   file = all;
   findutils = all;
   flex = all;
-  flex2535 = all;
   gcc = all;
   gcc33 = linux;
   gcc34 = linux;
   gcc42 = linux;
   gcc44 = linux;
+  gcj = linux;
   ghdl = linux;
   glibc = linux;
   glibcLocales = linux;
@@ -197,7 +196,7 @@ with (import ./release-lib.nix);
   zile = linux;
   zip = all;
 
-  dbus_all = {
+  dbus = {
     libs = linux;
     daemon = linux;
     tools = linux;