mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
* Update a bunch of base packages.
svn path=/nixpkgs/trunk/; revision=4065
This commit is contained in:
parent
b5eb0b0b5f
commit
552de99c19
@ -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)
|
||||
|
@ -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];
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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];
|
||||
}
|
||||
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
@ -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];
|
||||
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user