Author: ludo
Date: Sun Jan 23 20:42:28 2011
New Revision: 25675
URL: https://svn.nixos.org/websvn/nix/?rev=25675&sc=1
Log:
guile: Factorize common settings.
Modified:
hydra-config/gnu/trunk/guile/release.nix
Modified: hydra-config/gnu/trunk/guile/release.nix
==============================================================================
--- hydra-config/gnu/trunk/guile/release.nix Sun Jan 23 19:49:15 2011
(r25674)
+++ hydra-config/gnu/trunk/guile/release.nix Sun Jan 23 20:42:28 2011
(r25675)
@@ -43,6 +43,10 @@
libunistring pkgconfig boehmgc libffi
];
+ buildOutOfSourceTree = true;
+ succeedOnFailure = true;
+ keepBuildDirectory = true;
+
/* Return the default configuration flags. */
defaultConfigureFlags = pkgs:
with pkgs;
@@ -89,12 +93,13 @@
in
with pkgs;
releaseTools.nixBuild {
- inherit name meta;
+ inherit name;
src = tarball;
configureFlags =
(defaultConfigureFlags pkgs) ++ configureFlags;
buildInputs = buildInputsFrom pkgs;
- buildOutOfSourceTree = true;
+ inherit meta buildOutOfSourceTree
+ succeedOnFailure keepBuildDirectory;
});
/* The exotic configurations under test. */
@@ -106,9 +111,6 @@
[ "CPPFLAGS=-DSCM_DEBUG=1" ]
];
- succeedOnFailure = true;
- keepBuildDirectory = true;
-
jobs = rec {
tarball =
@@ -215,8 +217,7 @@
echo "doc manual $out/share/doc/guile/guile.html index.html" >>
"$out/nix-support/hydra-build-products"
echo "doc-pdf manual $out/share/doc/guile/guile.pdf" >>
"$out/nix-support/hydra-build-products"
'';
- buildOutOfSourceTree = true;
- inherit meta succeedOnFailure keepBuildDirectory;
+ inherit meta buildOutOfSourceTree succeedOnFailure keepBuildDirectory;
};
# The default build, executed on all platforms.
@@ -233,8 +234,7 @@
src = tarball;
configureFlags = defaultConfigureFlags pkgs;
buildInputs = buildInputsFrom pkgs;
- buildOutOfSourceTree = true;
- inherit meta succeedOnFailure keepBuildDirectory;
+ inherit meta buildOutOfSourceTree succeedOnFailure
keepBuildDirectory;
};
# Check what it's like to build with an old compiler.
@@ -264,9 +264,8 @@
buildInputs = [ pkgs.gcc34 ] ++
(map use_gcc3 (buildInputsFrom pkgs));
- buildOutOfSourceTree = true;
preUnpack = "gcc --version";
- inherit meta succeedOnFailure keepBuildDirectory;
+ inherit meta buildOutOfSourceTree succeedOnFailure
keepBuildDirectory;
};
# Check what it's like to build with an old compiler.
@@ -292,9 +291,8 @@
];
makeFlags = [ "V=1" ];
buildInputs = buildInputsFrom pkgs;
- buildOutOfSourceTree = true;
patches = [ ./tinycc-isnan.patch ];
- inherit meta succeedOnFailure keepBuildDirectory;
+ inherit meta buildOutOfSourceTree succeedOnFailure
keepBuildDirectory;
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
