From a450978f2699a7e2fe799ba8e89b364584ed76ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Jun 2005 10:30:13 +0000 Subject: [PATCH] * Glibc updated to 2.3.5. * GCC 3.4.4 and 3.3.6. * Other stdenv packages updated. svn path=/nixpkgs/trunk/; revision=3188 --- .../development/compilers/gcc-3.3/default.nix | 6 +++--- .../development/compilers/gcc-3.4/default.nix | 6 +++--- .../tools/misc/binutils/default.nix | 7 +++---- .../tools/misc/binutils/no-lex.patch | 20 ------------------- pkgs/development/tools/misc/gnum4/default.nix | 6 +++--- .../linux/kernel-headers/default.nix | 6 +++--- pkgs/tools/archivers/gnutar/default.nix | 6 +++--- pkgs/tools/archivers/zip/default.nix | 6 +++--- pkgs/tools/compression/bzip2/default.nix | 6 +++--- pkgs/tools/misc/findutils/default.nix | 6 +++--- pkgs/tools/networking/curl/default.nix | 14 +++++++------ pkgs/tools/text/gnugrep/default.nix | 6 +++--- pkgs/tools/text/gnused/default.nix | 6 +++--- 13 files changed, 41 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/no-lex.patch diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc-3.3/default.nix index 18bae3528ede..843c8df2877d 100644 --- a/pkgs/development/compilers/gcc-3.3/default.nix +++ b/pkgs/development/compilers/gcc-3.3/default.nix @@ -5,11 +5,11 @@ assert langC; stdenv.mkDerivation { - name = "gcc-3.3.3"; + name = "gcc-3.3.6"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-3.3.3.tar.bz2; - md5 = "3c6cfd9fcd180481063b4058cf6faff2"; + url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2; + md5 = "6936616a967da5a0b46f1e7424a06414"; }; inherit noSysDirs langC langCC langF77; } diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix index 0d9df73a4235..6e82c5e983a4 100644 --- a/pkgs/development/compilers/gcc-3.4/default.nix +++ b/pkgs/development/compilers/gcc-3.4/default.nix @@ -6,11 +6,11 @@ assert langC; stdenv.mkDerivation { - name = "gcc-3.4.3"; + name = "gcc-3.4.4"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gcc-3.4.3.tar.bz2; - md5 = "e744b30c834360fccac41eb7269a3011"; + url = http://ftp.gnu.org/gnu/gcc/gcc-3.4.4/gcc-3.4.4.tar.bz2; + md5 = "b594ff4ea4fbef4ba9220887de713dfe"; }; # !!! apply only if noSysDirs is set patches = [./no-sys-dirs.patch]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 307de63c7fc9..010bf87f16b6 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, noSysDirs}: stdenv.mkDerivation { - name = "binutils-2.15"; + name = "binutils-2.16.1"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/binutils-2.15.tar.bz2; - md5 = "624e6b74983ac6b2960edaf2d522ca58"; + url = http://ftp.gnu.org/gnu/binutils/binutils-2.16.1.tar.bz2; + md5 = "6a9d529efb285071dad10e1f3d2b2967"; }; - patches = [./no-lex.patch]; inherit noSysDirs; } diff --git a/pkgs/development/tools/misc/binutils/no-lex.patch b/pkgs/development/tools/misc/binutils/no-lex.patch deleted file mode 100644 index face7299a0c1..000000000000 --- a/pkgs/development/tools/misc/binutils/no-lex.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc binutils-orig/ld/configure binutils-2.15/ld/configure -*** binutils-orig/ld/configure 2003-04-24 14:36:07.000000000 +0200 ---- binutils-2.15/ld/configure 2004-09-18 15:18:52.000000000 +0200 -*************** -*** 4414,4420 **** - - test -n "$LEX" && break - done -! test -n "$LEX" || LEX=""$missing_dir/missing flex"" - - # Extract the first word of "flex", so it can be a program name with args. - set dummy flex; ac_word=$2 ---- 4414,4420 ---- - - test -n "$LEX" && break - done -! test -n "$LEX" || LEX="$missing_dir/missing flex" - - # Extract the first word of "flex", so it can be a program name with args. - set dummy flex; ac_word=$2 diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 788c32cf6b8a..ad24bab99c76 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "gnum4-1.4"; + name = "gnum4-1.4.3"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/m4-1.4.tar.gz; - md5 = "9eb2dd07740b2d2f3c7adb3e8d299bda"; + url = http://ftp.gnu.org/gnu/m4/m4-1.4.3.tar.bz2; + md5 = "1f7d7eba70a0525c44c2edc3998925c7"; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 7ca0a1730d2c..39054ba3471b 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -3,10 +3,10 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "linux-headers-2.6.10-i386"; + name = "linux-headers-2.6.11.12-i386"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-2.6.10.tar.bz2; - md5 = "cffcd2919d9c8ef793ce1ac07a440eda"; + url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.12.tar.bz2; + md5 = "7e3b6e630bb05c1a8c1ba46e010dbe44"; }; } 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"; }; }