diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-09-13 09:46:46 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-09-13 09:46:46 +0000 |
commit | 6d340b8835e5e732bf8d842a7493931db0b688a6 (patch) | |
tree | 5e606f625f5a4ecffc8d176faca33e29f32a1c56 | |
parent | d23d0726109cc4458fd193a40880d8a5330f7f1f (diff) | |
download | nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.tar nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.tar.gz nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.tar.bz2 nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.tar.lz nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.tar.xz nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.tar.zst nixlib-6d340b8835e5e732bf8d842a7493931db0b688a6.zip |
* Automake 1.9.x updated to 1.9.6.
* Made Automake 1.9.x the default (over 1.7.9). svn path=/nixpkgs/trunk/; revision=3813
-rw-r--r-- | pkgs/development/tools/misc/automake/automake-1.9.x.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/misc/automake/default.nix | 2 | ||||
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix index 1fe9e0b1c39a..745964accafc 100644 --- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, perl, autoconf}: stdenv.mkDerivation { - name = "automake-1.9.4"; + name = "automake-1.9.6"; builder = ./builder.sh; setupHook = ./setup-hook.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/automake-1.9.4.tar.gz; - md5 = "5b46bde56e321a7bab7832168cf0b9b8"; + url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz; + md5 = "c60f77a42f103606981d456f1615f5b4"; }; buildInputs = [perl autoconf]; } diff --git a/pkgs/development/tools/misc/automake/default.nix b/pkgs/development/tools/misc/automake/default.nix index f666f6487e74..a70268ea45c4 100644 --- a/pkgs/development/tools/misc/automake/default.nix +++ b/pkgs/development/tools/misc/automake/default.nix @@ -1 +1 @@ -import ./automake-1.7.9.nix +import ./automake-1.9.x.nix diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index fb5a6498d8c9..b66a3af69040 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -296,7 +296,7 @@ rec { m4 = gnum4; }; - automake = (import ../development/tools/misc/automake) { + automake17x = (import ../development/tools/misc/automake/automake-1.7.x.nix) { inherit fetchurl stdenv perl autoconf; }; @@ -304,6 +304,8 @@ rec { inherit fetchurl stdenv perl autoconf; }; + automake = automake19x; + libtool = (import ../development/tools/misc/libtool) { inherit fetchurl stdenv perl; m4 = gnum4; |