diff --git a/pkgs/development/tools/misc/autoconf/2.62.nix b/pkgs/development/tools/misc/autoconf/2.62.nix deleted file mode 100644 index 4194fcb94bdc..000000000000 --- a/pkgs/development/tools/misc/autoconf/2.62.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, m4, perl, lzma}: - -stdenv.mkDerivation rec { - name = "autoconf-2.62"; - src = fetchurl { - url = "mirror://gnu/autoconf/${name}.tar.lzma"; - sha256 = "0wc70i36cjw5kszvp50d02w8fzh2yxnsa9la6chrf7csb0dnn4jn"; - }; - - buildInputs = [m4 perl lzma]; - unpackCmd="lzma -d < $src | tar -x "; - - doCheck = true; - - meta = { - homepage = http://www.gnu.org/software/autoconf/; - description = "GNU Autoconf, a part of the GNU Build System"; - - longDescription = '' - GNU Autoconf is an extensible package of M4 macros that produce - shell scripts to automatically configure software source code - packages. These scripts can adapt the packages to many kinds of - UNIX-like systems without manual user intervention. Autoconf - creates a configuration script for a package from a template - file that lists the operating system features that the package - can use, in the form of M4 macro calls. - ''; - - license = "GPLv2+"; - }; -} diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 4c0c870d23e4..4194fcb94bdc 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,10 +1,31 @@ -{stdenv, fetchurl, m4, perl}: +{stdenv, fetchurl, m4, perl, lzma}: -stdenv.mkDerivation { - name = "autoconf-2.61"; +stdenv.mkDerivation rec { + name = "autoconf-2.62"; src = fetchurl { - url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.61.tar.bz2; - md5 = "36d3fe706ad0950f1be10c46a429efe0"; + url = "mirror://gnu/autoconf/${name}.tar.lzma"; + sha256 = "0wc70i36cjw5kszvp50d02w8fzh2yxnsa9la6chrf7csb0dnn4jn"; + }; + + buildInputs = [m4 perl lzma]; + unpackCmd="lzma -d < $src | tar -x "; + + doCheck = true; + + meta = { + homepage = http://www.gnu.org/software/autoconf/; + description = "GNU Autoconf, a part of the GNU Build System"; + + longDescription = '' + GNU Autoconf is an extensible package of M4 macros that produce + shell scripts to automatically configure software source code + packages. These scripts can adapt the packages to many kinds of + UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template + file that lists the operating system features that the package + can use, in the form of M4 macro calls. + ''; + + license = "GPLv2+"; }; - buildInputs = [m4 perl]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cf30cfe4b4e..079532972386 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1979,14 +1979,7 @@ let pkgs = rec { name = "ant-" + j2sdk14x.name; }; - autoconf = autoconf261; - autoconfLatest = autoconf262; - - autoconf261 = import ../development/tools/misc/autoconf { - inherit fetchurl stdenv perl m4; - }; - - autoconf262 = import ../development/tools/misc/autoconf/2.62.nix { + autoconf = import ../development/tools/misc/autoconf { inherit fetchurl stdenv perl m4 lzma; }; @@ -3391,8 +3384,7 @@ let pkgs = rec { inherit freetype fontconfig gettext gperf curl libjpeg libtiff libpng libxml2 libxslt sqlite icu cairo perl intltool automake libtool - pkgconfig; - autoconf = autoconfLatest; + pkgconfig autoconf; flex = flex2535; bison = bison23; } null; @@ -5599,12 +5591,11 @@ let pkgs = rec { carrier = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/carrier "2.4.2") { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python - libtool automake; + libtool automake autoconf; GStreamer = gst_all.gstreamer; inherit (gtkLibs) gtk glib; inherit (gnome) startupnotification GConf ; inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto; - autoconf = autoconfLatest; } null; funpidgin = carrier;