* 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
This commit is contained in:
parent
d23d072610
commit
6d340b8835
@ -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];
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
import ./automake-1.7.9.nix
|
||||
import ./automake-1.9.x.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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user