diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/gcc-3.4/builder.sh | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc-3.4/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/audiofile/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/audiofile/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/openssl/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/popt/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/popt/default.nix | 3 |
10 files changed, 22 insertions, 36 deletions
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh index 3dfc5a1132d..2ae98d17fbd 100644 --- a/pkgs/development/compilers/gcc-3.4/builder.sh +++ b/pkgs/development/compilers/gcc-3.4/builder.sh @@ -12,6 +12,7 @@ if test "$noSysDirs" = "1"; then # being generated to make sure that they use our glibc. if test -e $NIX_GCC/nix-support/orig-glibc; then glibc=$(cat $NIX_GCC/nix-support/orig-glibc) + # Ugh. Copied from gcc-wrapper/builder.sh. We can't just # source in $NIX_GCC/nix-support/add-flags, since that # would cause *this* GCC to be linked against the @@ -32,6 +33,11 @@ if test "$noSysDirs" = "1"; then hook=$(pwd)/ld-wrapper-hook echo "NIX_GLIBC_FLAGS_SET=1" > $hook export NIX_LD_WRAPPER_START_HOOK=$hook + + # Use *real* header files, otherwise a limits.h is + # generated that does not include Glibc's limits.h + # (notably missing SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY=$glibc/include fi export NIX_EXTRA_CFLAGS=$extraCFlags diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix index 6e82c5e983a..b12112f9008 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.4"; + name = "gcc-3.4.5"; builder = ./builder.sh; src = fetchurl { - url = http://ftp.gnu.org/gnu/gcc/gcc-3.4.4/gcc-3.4.4.tar.bz2; - md5 = "b594ff4ea4fbef4ba9220887de713dfe"; + url = http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.5/gcc-3.4.5.tar.bz2; + md5 = "7c3c3c3e764dcee5eb771432062d69e1"; }; # !!! apply only if noSysDirs is set patches = [./no-sys-dirs.patch]; diff --git a/pkgs/development/libraries/audiofile/builder.sh b/pkgs/development/libraries/audiofile/builder.sh deleted file mode 100644 index b3b3f83bb42..00000000000 --- a/pkgs/development/libraries/audiofile/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -buildinputs="" -source $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd audiofile-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index cf41fe6c9aa..f0156d45e3b 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "audiofile-0.2.3"; - builder = ./builder.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.5.tar.gz; md5 = "fd07c62a17ceafa317929e55e51e26c5"; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 57bb7b9efcd..cec777acbb3 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, kernelHeaders, installLocales ? true}: stdenv.mkDerivation { - name = "glibc-2.3.5"; + name = "glibc-2.3.6"; builder = ./builder.sh; substitute = ../../../build-support/substitute/substitute.sh; src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.3.5.tar.bz2; - md5 = "93d9c51850e0513aa4846ac0ddcef639"; + url = http://ftp.gnu.org/pub/gnu/glibc/glibc-2.3.6.tar.bz2; + md5 = "bfdce99f82d6dbcb64b7f11c05d6bc96"; }; linuxthreadsSrc = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.3.5.tar.bz2; - md5 = "77011b0898393c56b799bc011a0f37bf"; + url = http://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.6.tar.bz2; + md5 = "d4eeda37472666a15cc1f407e9c987a9"; }; patches = [ ./glibc-pwd.patch ]; diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh index 1004d279a51..0ec9de37d76 100644 --- a/pkgs/development/libraries/openssl/builder.sh +++ b/pkgs/development/libraries/openssl/builder.sh @@ -6,7 +6,7 @@ configureFlags=shared postInstall=postInstall postInstall() { # Bug fix: openssl does a `chmod 644' on the pkgconfig directory. - chmod 755 $out/lib/pkgconfig || exit 1 + chmod 755 $out/lib/pkgconfig } genericBuild diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5012ec5b968..4ea4e151d20 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "openssl-0.9.7g"; + name = "openssl-0.9.7i"; builder = ./builder.sh; src = fetchurl { - url = http://www.openssl.org/source/openssl-0.9.7h.tar.gz; - sha1 = "9fe535fce89af967b29c4727dedd25f2b4cc2f0d"; + url = http://www.openssl.org/source/openssl-0.9.7i.tar.gz; + sha1 = "f69d82b206ff8bff9d0e721f97380b9e"; }; buildInputs = [perl]; patches = [./darwin-makefile.patch]; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 9eb88545768..1b3a7ed104b 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pcre-6.0"; + name = "pcre-6.4"; src = fetchurl { - url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.0.tar.bz2; - md5 = "9352eb6d2be5ad9d8360d2377d3cafac"; + url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.4.tar.bz2; + md5 = "c5c73e8767479e8a7751324b0aa32291"; }; } diff --git a/pkgs/development/libraries/popt/builder.sh b/pkgs/development/libraries/popt/builder.sh deleted file mode 100644 index 67696b46467..00000000000 --- a/pkgs/development/libraries/popt/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -buildinputs="$gettext" -source $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd popt-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index e8d23dbe188..1170760c828 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -4,10 +4,9 @@ assert gettext != null; stdenv.mkDerivation { name = "popt-1.7"; - builder = ./builder.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz; md5 = "5988e7aeb0ae4dac8d83561265984cc9"; }; - gettext = gettext; + buildInputs = [gettext]; } |