From 552de99c19d975a9f66d08c78558f1c2b317cdaa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Oct 2005 14:29:30 +0000 Subject: [PATCH] * Update a bunch of base packages. svn path=/nixpkgs/trunk/; revision=4065 --- pkgs/development/interpreters/python/default.nix | 6 +++--- pkgs/development/libraries/gnome/libgnomeui/default.nix | 2 +- pkgs/development/libraries/libtiff/default.nix | 6 +++--- pkgs/development/libraries/libxml2/builder.sh | 2 +- pkgs/development/libraries/libxml2/default.nix | 6 +++--- pkgs/development/libraries/libxslt/default.nix | 4 ++-- pkgs/os-specific/linux/kernel-headers/default.nix | 6 +++--- pkgs/stdenv/generic/setup.sh | 4 ++-- pkgs/tools/misc/findutils/default.nix | 6 +++--- pkgs/tools/text/gawk/default.nix | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 8b0e6260ca93..0859e42d4e56 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -3,10 +3,10 @@ assert zlibSupport -> zlib != null; stdenv.mkDerivation { - name = "python-2.4.1"; + name = "python-2.4.2"; src = fetchurl { - url = http://www.python.org/ftp/python/2.4.1/Python-2.4.1.tar.bz2; - md5 = "de3e9a8836fab6df7c7ce545331afeb3"; + url = http://www.python.org/ftp/python/2.4.2/Python-2.4.2.tar.bz2; + md5 = "98db1465629693fc434d4dc52db93838"; }; buildInputs = [ (if zlibSupport then zlib else null) diff --git a/pkgs/development/libraries/gnome/libgnomeui/default.nix b/pkgs/development/libraries/gnome/libgnomeui/default.nix index f7260aa178ef..e03f0fd0f24d 100644 --- a/pkgs/development/libraries/gnome/libgnomeui/default.nix +++ b/pkgs/development/libraries/gnome/libgnomeui/default.nix @@ -7,5 +7,5 @@ assert pkgconfig != null && libgnome != null && libgnomecanvas != null stdenv.mkDerivation { inherit (input) name src; buildInputs = [pkgconfig libglade esound libjpeg gnomekeyring]; - propagatedBuildInputs = [libgnome libgnomecanvas libbonoboui]; + propagatedBuildInputs = [libgnome libgnomecanvas libbonoboui libjpeg]; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 43000691bece..7664edc39eb2 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -3,11 +3,11 @@ assert zlib != null && libjpeg != null; stdenv.mkDerivation { - name = "libtiff-3.7.2"; + name = "libtiff-3.7.4"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/tiff-3.7.2.tar.gz; - md5 = "9d7123bd0dbde2a3853fb758346adb78"; + url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.7.4.tar.gz; + md5 = "f37a7907bca4e235da85eb0126caa2b0"; }; propagatedBuildInputs = [zlib libjpeg]; inherit zlib libjpeg; diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh index 9ee072d12e54..f78324024953 100755 --- a/pkgs/development/libraries/libxml2/builder.sh +++ b/pkgs/development/libraries/libxml2/builder.sh @@ -8,7 +8,7 @@ fi patchPhase() { echo "Patching" mv configure configure.old - sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.3/site-packages^" < configure.old > configure + sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" < configure.old > configure chmod u+x configure } patchPhase=patchPhase diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 80fdd82ef1fc..24cbafbcbbb5 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -4,12 +4,12 @@ assert zlib != null; assert pythonSupport -> python != null; stdenv.mkDerivation { - name = "libxml2-2.6.19"; + name = "libxml2-2.6.22"; builder = ./builder.sh; src = fetchurl { - url = ftp://xmlsoft.org/libxml2-2.6.19.tar.gz; - md5 = "61587d43389a414fc2f5223b428e325e"; + url = ftp://xmlsoft.org/libxml2-2.6.22.tar.gz; + md5 = "1db8d06b4f49a665a8f47dc6d94450e6"; }; python = if pythonSupport then python else null; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 60fb1ee2a4f4..3794a1044958 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -5,8 +5,8 @@ assert libxml2 != null; stdenv.mkDerivation { name = "libxslt-1.1.14"; src = fetchurl { - url = ftp://xmlsoft.org/libxslt-1.1.14.tar.gz; - md5 = "db71660bb7d01ccd4e6be990af8d813b"; + url = ftp://xmlsoft.org/libxslt-1.1.15.tar.gz; + md5 = "238de9eda71b570ff7b78aaf65308fc6"; }; buildInputs = [libxml2]; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 39054ba3471b..aa4a076689d2 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.11.12-i386"; + name = "linux-headers-2.6.13.4-i386"; builder = ./builder.sh; src = fetchurl { - url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.12.tar.bz2; - md5 = "7e3b6e630bb05c1a8c1ba46e010dbe44"; + url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.4.tar.bz2; + md5 = "94768d7eef90a9d8174639b2a7d3f58d"; }; } diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index eb78968702cc..7998e5b69f92 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -535,11 +535,11 @@ checkPhase() { patchELF() { # Patch all ELF executables and shared libraries. - header "patching ELF executables and libraries (BLA)" + header "patching ELF executables and libraries" find "$prefix" \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm +0100 \) \ - \) -exec patchelf --shrink-rpath {} \; + \) -print -exec patchelf --shrink-rpath {} \; stopNest } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index c49d08535e56..7a6b68594b68 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, coreutils}: stdenv.mkDerivation { - name = "findutils-4.2.20"; + name = "findutils-4.2.25"; src = fetchurl { - url = http://ftp.gnu.org/gnu/findutils/findutils-4.2.20.tar.gz; - md5 = "7c8e12165b221dd67a19c00d780437a4"; + url = http://ftp.gnu.org/gnu/findutils/findutils-4.2.25.tar.gz; + md5 = "e92fef6714ffa9972f28a1a423066921"; }; buildInputs = [coreutils]; patches = [./findutils-path.patch]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index e1e865edf562..2c495f8c2711 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "gawk-3.1.4"; + name = "gawk-3.1.5"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/gawk-3.1.4.tar.bz2; - md5 = "b8b532beaf02350e69d2d5dc98cb1e37"; + url = ftp://ftp.gnu.org/gnu/gawk/gawk-3.1.5.tar.bz2; + md5 = "5703f72d0eea1d463f735aad8222655f"; }; }