summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2013-10-09 09:59:54 +0200
committerRob Vermaas <rob.vermaas@gmail.com>2013-10-09 09:59:54 +0200
commit53d3200e1c207f63a1e56b87ea811ef0aa086f47 (patch)
treef036acd44092e886b7251d54c76673e294078ee3
parent6703f3de7d3d8cba5fc100ec0fd0d6abe446f77f (diff)
downloadhydra-recipes-53d3200e1c207f63a1e56b87ea811ef0aa086f47.tar.gz
gnu-job.nix: New structure for 'build', e.g. x86_64-linux build is now called build.x86_64-linux.
-rw-r--r--bison/release.nix2
-rw-r--r--cpio/release.nix2
-rw-r--r--cppi/release.nix2
-rw-r--r--diffutils/release.nix2
-rw-r--r--emacs/release.nix3
-rw-r--r--gettext/release.nix2
-rw-r--r--gmp/release.nix2
-rw-r--r--gnu-jobs.nix24
-rw-r--r--grep/release.nix2
-rw-r--r--gzip/release.nix2
-rw-r--r--hello/release.nix2
-rw-r--r--idutils/release.nix2
-rw-r--r--libidn/release.nix2
-rw-r--r--libredwg/release.nix2
-rw-r--r--patch/release.nix2
-rw-r--r--rcs/release.nix2
-rw-r--r--tar/release.nix2
-rw-r--r--wget/release.nix2
-rw-r--r--zile/release.nix2
19 files changed, 48 insertions, 13 deletions
diff --git a/bison/release.nix b/bison/release.nix
index c81f7b7..318a633 100644
--- a/bison/release.nix
+++ b/bison/release.nix
@@ -60,7 +60,7 @@ in
name = "bison";
src = bison;
inherit nixpkgs meta;
-
+ systems = ["x86_64-linux" "i686-linux" "i686-freebsd" "x86_64-darwin"];
customEnv = {
tarball = pkgs: {
diff --git a/cpio/release.nix b/cpio/release.nix
index 880e00d..d4d2ee2 100644
--- a/cpio/release.nix
+++ b/cpio/release.nix
@@ -57,6 +57,8 @@ in
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+ systems = ["x86_64-darwin" "i686-freebsd" "x86_64-linux" "i686-linux"];
+
customEnv = {
tarball = pkgs: {
diff --git a/cppi/release.nix b/cppi/release.nix
index c73b27c..2d6b758 100644
--- a/cppi/release.nix
+++ b/cppi/release.nix
@@ -54,6 +54,8 @@ in
src = cppi;
inherit nixpkgs meta;
+ systems = ["x86_64-linux" "i686-linux" "x86_64-freebsd" "x86_64-darwin"];
+
customEnv = {
tarball = pkgs: {
buildInputs = with pkgs; [ git texinfo bison cvs man rsync perl cpio automake111x xz gperf help2man gettext_0_18 flex];
diff --git a/diffutils/release.nix b/diffutils/release.nix
index 7c852db..e576fec 100644
--- a/diffutils/release.nix
+++ b/diffutils/release.nix
@@ -40,6 +40,8 @@ in
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+ systems = ["x86_64-darwin" "i686-freebsd" "x86_64-linux" "i686-linux" "i686-solaris"];
+
customEnv = {
tarball = pkgs: {
dontBuild = false; # to build `src/version.c'
diff --git a/emacs/release.nix b/emacs/release.nix
index 644f8d6..cbe5bb1 100644
--- a/emacs/release.nix
+++ b/emacs/release.nix
@@ -63,6 +63,9 @@ in
src = emacs;
inherit nixpkgs meta;
useLatestGnulib = false;
+
+ systems = [ "x86_64-linux" "x86_64-darwin" "i686-linux" "i686-freebsd" ];
+
customEnv = rec {
tarball = pkgs: {
diff --git a/gettext/release.nix b/gettext/release.nix
index cd88586..8202cb0 100644
--- a/gettext/release.nix
+++ b/gettext/release.nix
@@ -61,6 +61,8 @@ in
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+ systems = ["x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd"];
+
customEnv = {
tarball = pkgs: {
patches = [ ./tar-should-not-expect-a-root-user.patch ];
diff --git a/gmp/release.nix b/gmp/release.nix
index 390cd4b..b3546b0 100644
--- a/gmp/release.nix
+++ b/gmp/release.nix
@@ -55,6 +55,8 @@ in
useLatestGnulib = false;
enableGnuCrossBuild = true;
+ systems = ["i686-freebsd" "i686-solaris" "x86_64-darwin" "x86_64-linux" "i686-linux" "x86_64-freebsd"];
+
customEnv = {
tarball = pkgs: {
diff --git a/gnu-jobs.nix b/gnu-jobs.nix
index b90538e..853f04f 100644
--- a/gnu-jobs.nix
+++ b/gnu-jobs.nix
@@ -23,6 +23,7 @@
, nixpkgs
, enableGnuCrossBuild ? false
, useLatestGnulib ? true
+, systems ? [ "i686-linux" "x86_64-linux" ]
}:
let
@@ -63,20 +64,21 @@ let
// ( pkgs.lib.optionalAttrs (customEnv ? tarball) (customEnv.tarball pkgs) ) );
build =
- { system ? builtins.currentSystem }:
+ pkgs.lib.genAttrs systems (system:
- let pkgs = import nixpkgs {inherit system;};
- in with pkgs;
- releaseTools.nixBuild ({
- src = jobs.tarball;
+ let pkgs = import nixpkgs {inherit system;};
+ in with pkgs;
+ releaseTools.nixBuild ({
+ src = jobs.tarball;
- # Use a low priority on Cygwin. See
- # <https://github.com/NixOS/hydra/issues/15> for details.
- meta = meta //
- (lib.optionalAttrs stdenv.isCygwin { schedulingPriority = 1; });
+ # Use a low priority on Cygwin. See
+ # <https://github.com/NixOS/hydra/issues/15> for details.
+ meta = meta //
+ (lib.optionalAttrs stdenv.isCygwin { schedulingPriority = 1; });
- inherit name succeedOnFailure keepBuildDirectory;
- } // ( pkgs.lib.optionalAttrs (customEnv ? build) (customEnv.build pkgs)) );
+ inherit name succeedOnFailure keepBuildDirectory;
+ } // ( pkgs.lib.optionalAttrs (customEnv ? build) (customEnv.build pkgs)) )
+ );
coverage =
pkgs.releaseTools.coverageAnalysis ({
diff --git a/grep/release.nix b/grep/release.nix
index 2111a01..ad7dc6a 100644
--- a/grep/release.nix
+++ b/grep/release.nix
@@ -45,6 +45,8 @@ in
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+ systems = ["i686-linux" "x86_64-darwin" "x86_64-linux"];
+
customEnv = {
tarball = pkgs: {
diff --git a/gzip/release.nix b/gzip/release.nix
index 82cf58f..0897410 100644
--- a/gzip/release.nix
+++ b/gzip/release.nix
@@ -62,6 +62,8 @@ in
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+ systems = ["x86_64-darwin" "i686-freebsd" "i686-linux" "x86_64-linux" "i686-cygwin"];
+
customEnv = {
tarball = pkgs: {
diff --git a/hello/release.nix b/hello/release.nix
index babc084..ec1f0ad 100644
--- a/hello/release.nix
+++ b/hello/release.nix
@@ -40,7 +40,7 @@ in
src = hello;
inherit nixpkgs meta;
enableGnuCrossBuild = true;
-
+ systems = ["x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd"];
customEnv = {
tarball = pkgs: {
autoconfPhase = ''
diff --git a/idutils/release.nix b/idutils/release.nix
index 79fdb26..45bc620 100644
--- a/idutils/release.nix
+++ b/idutils/release.nix
@@ -60,6 +60,8 @@ in
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+ systems = ["x86_64-linux" "i686-linux" "i686-freebsd" "x86_64-darwin"];
+
customEnv = {
tarball = pkgs: {
diff --git a/libidn/release.nix b/libidn/release.nix
index a7b01aa..e9dba60 100644
--- a/libidn/release.nix
+++ b/libidn/release.nix
@@ -60,6 +60,8 @@ in
src = libidnSrc;
useLatestGnulib = false;
+ systems = ["i686-linux" "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "i686-solaris"];
+
inherit nixpkgs meta;
customEnv = {
diff --git a/libredwg/release.nix b/libredwg/release.nix
index 4193383..6ad2a74 100644
--- a/libredwg/release.nix
+++ b/libredwg/release.nix
@@ -42,6 +42,8 @@ in
name = "libredwg";
src = libredwgSrc;
inherit nixpkgs meta;
+
+ systems = ["x86_64-darwin" "i686-freebsd" "x86_64-linux" "i686-linux"];
customEnv = {
diff --git a/patch/release.nix b/patch/release.nix
index b84a667..85e4433 100644
--- a/patch/release.nix
+++ b/patch/release.nix
@@ -40,6 +40,8 @@ in
src = patchSrc;
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+
+ systems = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
customEnv = {
diff --git a/rcs/release.nix b/rcs/release.nix
index c8d2237..1a3f304 100644
--- a/rcs/release.nix
+++ b/rcs/release.nix
@@ -52,6 +52,8 @@ in
src = rcs;
inherit nixpkgs meta;
+ systems = ["x86_64-linux" "i686-linux" "i686-freebsd" "x86_64-darwin"];
+
customEnv = {
tarball = pkgs: {
diff --git a/tar/release.nix b/tar/release.nix
index ba164ed..e0e9f64 100644
--- a/tar/release.nix
+++ b/tar/release.nix
@@ -51,6 +51,8 @@ in
src = tarSrc;
inherit nixpkgs meta;
enableGnuCrossBuild = true;
+
+ systems = ["x86_64-darwin" "i686-linux" "x86_64-linux" "i686-freebsd"];
customEnv = {
diff --git a/wget/release.nix b/wget/release.nix
index 5c490a7..f288194 100644
--- a/wget/release.nix
+++ b/wget/release.nix
@@ -40,6 +40,8 @@ in
src = wget;
inherit nixpkgs meta;
+ systems = ["x86_64-linux" "i686-linux" "i686-freebsd" "x86_64-darwin"];
+
customEnv = {
tarball = pkgs: {
diff --git a/zile/release.nix b/zile/release.nix
index dade7c0..58b584d 100644
--- a/zile/release.nix
+++ b/zile/release.nix
@@ -57,6 +57,8 @@ in
name = "zile";
src = zile;
inherit nixpkgs meta;
+
+ systems = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
customEnv = {