diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-06-17 10:30:13 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-06-17 10:30:13 +0000 |
commit | a450978f2699a7e2fe799ba8e89b364584ed76ff (patch) | |
tree | 5920e0e1531ddea1ee336efe44d74facf19cf3be /pkgs/tools | |
parent | b691c30aa7c55f46fc3e690c308f1a31fd9d7dd2 (diff) | |
download | nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.tar nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.tar.gz nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.tar.bz2 nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.tar.lz nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.tar.xz nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.tar.zst nixlib-a450978f2699a7e2fe799ba8e89b364584ed76ff.zip |
* Glibc updated to 2.3.5.
* GCC 3.4.4 and 3.3.6. * Other stdenv packages updated. svn path=/nixpkgs/trunk/; revision=3188
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/gnused/default.nix | 6 |
7 files changed, 26 insertions, 24 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index e8aeb929f71b..4cd692d62579 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "gnutar-1.14"; + name = "gnutar-1.15"; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tar-1.14.tar.bz2; - md5 = "f1932e0fbd4641885bfdcc75495c91b7"; + url = http://ftp.gnu.org/gnu/tar/tar-1.15.tar.bz2; + md5 = "412695e2c2ecbe2753d128f303b3ccf4"; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 055ea5f4b600..d0907b5175e4 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "zip-2.3"; + name = "zip-2.31"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zip23.tar.gz; - md5 = "5206a99541f3b0ab90f1baa167392c4f"; + url = http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz; + md5 = "6bfc076664416251d7624ab3538d1cb9"; }; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 128a5d71a2c8..1fc13013672a 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "bzip2-1.0.2"; + name = "bzip2-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/bzip2-1.0.2.tar.gz; - md5 = "ee76864958d568677f03db8afad92beb"; + url = http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz; + md5 = "8a716bebecb6e647d2e8a29ea5d8447f"; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 6210f5e3fc59..da086e80c084 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "findutils-4.1.20"; + name = "findutils-4.2.20"; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/findutils-4.1.20.tar.gz; - md5 = "e90ce7222daadeb8616b8db461e17cbc"; + url = http://ftp.gnu.org/gnu/findutils/findutils-4.2.20.tar.gz; + md5 = "7c8e12165b221dd67a19c00d780437a4"; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a5d0d9e561fd..01a78e08d104 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, zlib}: +{stdenv, fetchurl, zlib, sslSupport ? false, openssl ? null}: + +assert sslSupport -> openssl != null; stdenv.mkDerivation { - name = "curl-7.12.0"; + name = "curl-7.14.0"; src = fetchurl { - url = http://losser.st-lab.cs.uu.nl/~armijn/.nix//curl-7.12.0.tar.bz2; - md5 = "47db6619b849600ba2771074f00da517"; + url = http://curl.haxx.se/download/curl-7.14.0.tar.bz2; + md5 = "46ce665e47d37fce1a0bad935cce58a9"; }; - buildInputs = [zlib]; + buildInputs = [zlib (if sslSupport then openssl else null)]; patches = [./configure-cxxcpp.patch]; - configureFlags = "--without-ssl"; + configureFlags = (if sslSupport then "--with-ssl" else "--without-ssl"); } diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index b48779d0bc53..15a7a5ad2393 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pcre}: stdenv.mkDerivation { - name = "gnugrep-2.5.1"; + name = "gnugrep-2.5.1a"; src = fetchurl { - url = http://losser.st-lab.cs.uu.nl/~eelco/mirror/grep-2.5.1.tar.bz2; - md5 = "ddd99e2d5d4f4611357e31e97f080cf2"; + url = http://ftp.gnu.org/gnu/grep/grep-2.5.1a.tar.bz2; + md5 = "52202fe462770fa6be1bb667bd6cf30c"; }; buildInputs = [pcre]; } diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index c88c339aa595..b4ebfa03a520 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "gnused-4.1.2"; + name = "gnused-4.1.4"; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sed-4.1.2.tar.gz; - md5 = "928f0e06422f414091917401f1a834d0"; + url = http://ftp.gnu.org/gnu/sed/sed-4.1.4.tar.gz; + md5 = "2a62ceadcb571d2dac006f81df5ddb48"; }; } |