public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automake: Update to 1.12.4

Browse Source 
Also disable tests, they're really way too slow.

http://hydra.nixos.org/build/3082076
This commit is contained in:
Eelco Dolstra 2012-10-16 14:09:57 -04:00
parent 49c8c2bc72
commit 6c75d07e65
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: { stdenv, fetchurl, perl, autoconf, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "automake-1.11.6"; name = "automake-1.11.6";
@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [perl autoconf makeWrapper]; buildInputs = [perl autoconf makeWrapper];
inherit doCheck;
# Disable indented log output from Make, otherwise "make.test" will # Disable indented log output from Make, otherwise "make.test" will
# fail. # fail.
preCheck = "unset NIX_INDENT_MAKE"; preCheck = "unset NIX_INDENT_MAKE";

6
pkgs/development/tools/misc/automake/automake-1.12.x.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "automake-1.12.2"; name = "automake-1.12.4";
# TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
# available upstream; see # available upstream; see
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz"; url = "mirror://gnu/automake/${name}.tar.xz";
sha256 = "5fb56e918189b377a22368e19baaf70252bd85a9969ed5f8a8373f49e8faf07f"; sha256 = "0wppdm0wfizs6nmiwlkigcmh2pn33dywdkl7b407j3pvwn622vsi";
}; };
buildInputs = [perl autoconf makeWrapper]; buildInputs = [perl autoconf makeWrapper];

15
pkgs/top-level/all-packages.nix
View File

@ -2912,20 +2912,9 @@ let
automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips
# Some of the parallel tests seem to hang on `i386-pc-solaris2.11'.
&& stdenv.system != "i686-solaris"
# One test fails to terminate on FreeBSD: <http://bugs.gnu.org/8788>. automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
&& !stdenv.isFreeBSD;
};
automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix {
doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips
# Some of the parallel tests seem to hang on `i386-pc-solaris2.11'.
&& stdenv.system != "i686-solaris";
};
automoc4 = callPackage ../development/tools/misc/automoc4 { }; automoc4 = callPackage ../development/tools/misc/automoc4 { };