summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-03-26 11:02:29 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-03-26 11:58:59 +0100
commitcffc126e140eea1a0bc01a1419c5609c619f5326 (patch)
tree0c3ea3d870c73e51131730508a68a962bdda2c91 /pkgs/top-level/release.nix
parentb38647766db69308c789da46fe9f3f2b89e782d9 (diff)
downloadnixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.tar
nixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.tar.gz
nixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.tar.bz2
nixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.tar.lz
nixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.tar.xz
nixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.tar.zst
nixpkgs-cffc126e140eea1a0bc01a1419c5609c619f5326.zip
Make Nixpkgs jobs unique
That is, there are now distinct jobs like ‘coreutils.x86_64-linux’ and
‘coreutils.x86_64-darwin’, rather than a single job ‘coreutils’ with
multiple builds.  This means that testing a job is simpler:

  $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux

See https://github.com/NixOS/hydra/issues/60 for the motivation.
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 595c6b427a2..d1b5d8254c4 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -1,13 +1,15 @@
-/*
-  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
+/* This file defines the builds that constitute the Nixpkgs.
+   Everything defined here ends up in the Nixpkgs channel.  Individual
+   jobs can be tested by running:
 
-  Hydra can be installed with "nix-env -i hydra".
+   $ nix-build pkgs/top-level/release.nix -A <jobname>.<system>
+
+   e.g.
+
+   $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
-with (import ./release-lib.nix);
+
+with import ./release-lib.nix;
 
 {
 
@@ -20,8 +22,6 @@ with (import ./release-lib.nix);
   apacheHttpd = linux;
   aspell = all;
   at = linux;
-  aterm25 = all;
-  aterm28 = all;
   audacious = linux;
   autoconf = all;
   automake110x = all;