From 25adbc91bb4032f2c606dcab094768cea86127c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 11:21:23 +0200 Subject: [PATCH] automake: add version 1.12.1 --- .../tools/misc/automake/automake-1.12.x.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/automake-1.12.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix new file mode 100644 index 00000000000..41aaff76876 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: + +stdenv.mkDerivation rec { + name = "automake-1.12.1"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "0gqpbk51lbk0a4ixwdp4cnabzaj9qdsxypr1cmbs5hjan9lhhx9j"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + inherit doCheck; + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + homepage = http://www.gnu.org/software/automake/; + description = "GNU Automake, a GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c012ce86adc..a5d2ab0dc56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2847,6 +2847,12 @@ let && !stdenv.isFreeBSD; }; + automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { + doCheck = !stdenv.isArm && !stdenv.isCygwin + # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. + && stdenv.system != "i686-solaris"; + }; + automoc4 = callPackage ../development/tools/misc/automoc4 { }; avrdude = callPackage ../development/tools/misc/avrdude { };