Author: eelco
Date: Thu May 10 15:16:27 2012
New Revision: 34051
URL: https://nixos.org/websvn/nix/?rev=34051&sc=1
Log:
* Merge the stdenv branch.
Added:
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch
- copied unchanged from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch
nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch
- copied unchanged from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch
nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.5.nix
- copied unchanged from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/5.0.5.nix
Replaced:
nixpkgs/trunk/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
- copied unchanged from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
Deleted:
nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.3.nix
nixpkgs/trunk/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch
nixpkgs/trunk/pkgs/os-specific/linux/gw6c/
Modified:
nixpkgs/trunk/ (props changed)
nixpkgs/trunk/pkgs/build-support/clang-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/release/rpm-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix (props changed)
nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/builder.sh
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/builder.sh
nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix
nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
nixpkgs/trunk/pkgs/development/libraries/zlib/default.nix
nixpkgs/trunk/pkgs/development/tools/parsing/bison/bison-2.5.nix
nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/default.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix (props changed)
nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix
nixpkgs/trunk/pkgs/stdenv/generic/setup.sh (contents, props changed)
nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Thu May
10 15:16:27 2012 (r34051)
@@ -9,11 +9,11 @@
let
majorVersion = "2.7";
- version = "${majorVersion}.2";
+ version = "${majorVersion}.3";
src = fetchurl {
url =
"http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";;
- sha256 = "1axx9h1r157fanldmnj1q2gdw2sm0sg8h3mx1l2adddmgq3fnmsh";
+ sha256 = "0g3672il41rcfjk7sphfqdsa6qf53y8g3ai8yk1sslxi3khmfr3j";
};
patches =
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/builder.sh Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/builder.sh Thu May
10 15:16:27 2012 (r34051)
@@ -51,5 +51,4 @@
rm -f $out/lib/libgcc_s.so.1
}
-
genericBuild
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Thu May
10 15:16:27 2012 (r34051)
@@ -76,6 +76,9 @@
/* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch
+ /* don't use /etc/ld.so.cache, for non-nixos systems */
+ ./dont_use_system_ld_so_cache.patch
+
/* Without this patch many KDE binaries crash. */
./glibc-elf-localscope.patch
] ++ stdenv.lib.optional installLocales ./catalan-firstdays.patch;
Copied:
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch
(from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch
Thu May 10 15:16:27 2012 (r34051, copy of r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch)
@@ -0,0 +1,43 @@
+diff -Naur glibc-2.13-orig/elf/ldconfig.c glibc-2.13/elf/ldconfig.c
+--- glibc-2.13-orig/elf/ldconfig.c 2011-01-17 23:34:07.000000000 -0500
++++ glibc-2.13/elf/ldconfig.c 2012-04-10 23:28:45.957492340 -0400
+@@ -51,7 +51,7 @@
+ #endif
+
+ #ifndef LD_SO_CONF
+-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
++# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
+ #endif
+
+ /* Get libc version number. */
+diff -Naur glibc-2.13-orig/elf/Makefile glibc-2.13/elf/Makefile
+--- glibc-2.13-orig/elf/Makefile 2011-01-17 23:34:07.000000000 -0500
++++ glibc-2.13/elf/Makefile 2012-04-10 23:27:05.666477442 -0400
+@@ -459,11 +459,11 @@
+ $(objpfx)sprof: $(libdl)
+
+ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
+-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
+-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
++PREFIX-FLAGS := -D'PREFIX="$(prefix)"'
++CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \
+ -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
+-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
+-CFLAGS-cache.c = $(SYSCONF-FLAGS)
++CFLAGS-dl-cache.c = $(PREFIX-FLAGS)
++CFLAGS-cache.c = $(PREFIX-FLAGS)
+
+ CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst
%,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1)
+
+diff -Naur glibc-2.13-orig/sysdeps/generic/dl-cache.h
glibc-2.13/sysdeps/generic/dl-cache.h
+--- glibc-2.13-orig/sysdeps/generic/dl-cache.h 2011-01-17 23:34:07.000000000
-0500
++++ glibc-2.13/sysdeps/generic/dl-cache.h 2012-04-10 23:28:20.077488815
-0400
+@@ -29,7 +29,7 @@
+ #endif
+
+ #ifndef LD_SO_CACHE
+-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
++# define LD_SO_CACHE PREFIX "/etc/ld.so.cache"
+ #endif
+
+ #ifndef add_system_dir
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/builder.sh Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/builder.sh Thu May
10 15:16:27 2012 (r34051)
@@ -51,5 +51,4 @@
rm -f $out/lib/libgcc_s.so.1
}
-
genericBuild
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix Thu May
10 15:16:27 2012 (r34051)
@@ -75,6 +75,9 @@
/* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch
+ /* don't use /etc/ld.so.cache, for non-nixos systems */
+ ./dont_use_system_ld_so_cache.patch
+
/* Without this patch many KDE binaries crash. */
./glibc-elf-localscope.patch
];
Copied:
nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch
(from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch
Thu May 10 15:16:27 2012 (r34051, copy of r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch)
@@ -0,0 +1,43 @@
+diff -Naur glibc-2.13-orig/elf/ldconfig.c glibc-2.13/elf/ldconfig.c
+--- glibc-2.13-orig/elf/ldconfig.c 2011-01-17 23:34:07.000000000 -0500
++++ glibc-2.13/elf/ldconfig.c 2012-04-10 23:28:45.957492340 -0400
+@@ -51,7 +51,7 @@
+ #endif
+
+ #ifndef LD_SO_CONF
+-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
++# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
+ #endif
+
+ /* Get libc version number. */
+diff -Naur glibc-2.13-orig/elf/Makefile glibc-2.13/elf/Makefile
+--- glibc-2.13-orig/elf/Makefile 2011-01-17 23:34:07.000000000 -0500
++++ glibc-2.13/elf/Makefile 2012-04-10 23:27:05.666477442 -0400
+@@ -459,11 +459,11 @@
+ $(objpfx)sprof: $(libdl)
+
+ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
+-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
+-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
++PREFIX-FLAGS := -D'PREFIX="$(prefix)"'
++CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \
+ -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
+-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
+-CFLAGS-cache.c = $(SYSCONF-FLAGS)
++CFLAGS-dl-cache.c = $(PREFIX-FLAGS)
++CFLAGS-cache.c = $(PREFIX-FLAGS)
+
+ CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst
%,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1)
+
+diff -Naur glibc-2.13-orig/sysdeps/generic/dl-cache.h
glibc-2.13/sysdeps/generic/dl-cache.h
+--- glibc-2.13-orig/sysdeps/generic/dl-cache.h 2011-01-17 23:34:07.000000000
-0500
++++ glibc-2.13/sysdeps/generic/dl-cache.h 2012-04-10 23:28:20.077488815
-0400
+@@ -29,7 +29,7 @@
+ #endif
+
+ #ifndef LD_SO_CACHE
+-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
++# define LD_SO_CACHE PREFIX "/etc/ld.so.cache"
+ #endif
+
+ #ifndef add_system_dir
Copied: nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.5.nix (from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/5.0.5.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.5.nix Thu May 10
15:16:27 2012 (r34051, copy of r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/5.0.5.nix)
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, m4, cxx ? true }:
+
+stdenv.mkDerivation rec {
+ name = "gmp-5.0.5";
+
+ src = fetchurl {
+ url = "mirror://gnu/gmp/${name}.tar.bz2";
+ sha256 = "1jfymbr90mpn0zw5sg001llqnvf2462y77vgjknrmfs1rjn8ln0z";
+ };
+
+ patches = [ ./ignore-bad-cpuid.patch ];
+
+ buildNativeInputs = [ m4 ];
+
+ configureFlags =
+ # Build a "fat binary", with routines for several sub-architectures (x86).
+ [ "--enable-fat" ]
+ ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]);
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "GMP, the GNU multiple precision arithmetic library";
+
+ longDescription =
+ '' GMP is a free library for arbitrary precision arithmetic, operating
+ on signed integers, rational numbers, and floating point numbers.
+ There is no practical limit to the precision except the ones implied
+ by the available memory in the machine GMP runs on. GMP has a rich
+ set of functions, and the functions have a regular interface.
+
+ The main target applications for GMP are cryptography applications
+ and research, Internet security applications, algebra systems,
+ computational algebra research, etc.
+
+ GMP is carefully designed to be as fast as possible, both for small
+ operands and for huge operands. The speed is achieved by using
+ fullwords as the basic arithmetic type, by using fast algorithms,
+ with highly optimised assembly code for the most common inner loops
+ for a lot of CPUs, and by a general emphasis on speed.
+
+ GMP is faster than any other bignum library. The advantage for GMP
+ increases with the operand sizes for many operations, since GMP uses
+ asymptotically faster algorithms.
+ '';
+
+ homepage = http://gmplib.org/;
+ license = "LGPLv3+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons
];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
Copied: nixpkgs/trunk/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch
(from r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch Thu May
10 15:16:27 2012 (r34051, copy of r34050,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/ignore-bad-cpuid.patch)
@@ -0,0 +1,31 @@
+Don't abort when seeing the default CPU model/platform returned by
+QEMU.
+
+diff -ru -x '*~' gmp-5.0.4-orig/mpn/x86_64/fat/fat.c
gmp-5.0.4/mpn/x86_64/fat/fat.c
+--- gmp-5.0.4-orig/mpn/x86_64/fat/fat.c 2012-02-10 11:23:05.000000000
+0100
++++ gmp-5.0.4/mpn/x86_64/fat/fat.c 2012-04-01 21:38:35.843066724 +0200
+@@ -194,13 +194,16 @@
+ {
+ switch (family)
+ {
++#if 0
+ case 4:
+ case 5:
+ abort (); /* 32-bit processors */
++#endif
+
+ case 6:
+ switch (model)
+ {
++#if 0
+ case 0x00:
+ case 0x01:
+ case 0x02:
+@@ -217,6 +220,7 @@
+ case 0x0d: /* Dothan */
+ case 0x0e: /* Yonah */
+ abort (); /* 32-bit processors */
++#endif
+
+ case 0x0f: /* Conroe Merom Kentsfield Allendale */
+ case 0x10:
Modified: nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix Thu May 10
15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix Thu May 10
15:16:27 2012 (r34051)
@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
- name = "libpng-1.5.9";
+ name = "libpng-1.5.10";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
- sha256 = "0rd0kn7bpdhbv4gw6475plc51a4p5kzk26kag0d08wfvb7ip8wxq";
+ sha256 = "0pb096zn6iyza28js4j7krvcw23b979igfi315aqmvx622bw6jfx";
};
propagatedBuildInputs = [ zlib ];
Modified: nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/openssl/default.nix Thu May
10 15:16:27 2012 (r34051)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
let
- name = "openssl-1.0.0g";
+ name = "openssl-1.0.0i";
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
@@ -23,8 +23,7 @@
./gnu.patch # submitted upstream
]
- ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch
- ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd")
./freebsd-x86_64-asm.patch;
+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
in
@@ -36,7 +35,7 @@
"http://www.openssl.org/source/${name}.tar.gz";
"http://openssl.linux-mirror.org/source/${name}.tar.gz";
];
- sha1 = "2b517baada2338663c27314cb922f9755e73e07f";
+ sha1 = "b7aa11cbd7d264c2b1f44e3d55b334fb33f7b674";
};
patches = patchesCross false;
Modified: nixpkgs/trunk/pkgs/development/libraries/zlib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/zlib/default.nix Thu May 10
15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/libraries/zlib/default.nix Thu May 10
15:16:27 2012 (r34051)
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, static ? false }:
-let version = "1.2.6"; in
+let version = "1.2.7"; in
stdenv.mkDerivation rec {
name = "zlib-${version}";
@@ -10,7 +10,7 @@
[ "http://www.zlib.net/${name}.tar.gz"; # old versions vanish from here
"mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
];
- sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
+ sha256 = "1i96gsdvxqb6skp9a58bacf1wxamwi9m9pg4yn7cpf7g7239r77s";
};
configureFlags = if static then "" else "--shared";
Modified: nixpkgs/trunk/pkgs/development/tools/parsing/bison/bison-2.5.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/parsing/bison/bison-2.5.nix Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/bison/bison-2.5.nix Thu May
10 15:16:27 2012 (r34051)
@@ -12,7 +12,7 @@
++ stdenv.lib.optional doCheck perl;
propagatedBuildInputs = [ m4 ];
- M4 = "m4";
+ M4 = "${m4}/bin/m4";
doCheck = true;
Modified: nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix Thu May 10 15:14:08
2012 (r34050)
+++ nixpkgs/trunk/pkgs/shells/bash/bash-4.2-patches.nix Thu May 10 15:16:27
2012 (r34051)
@@ -21,4 +21,8 @@
(patch "018" "0ka9pfnjmdak8lvmbryv2r1kkrlffnxbqjxq656la39pf9qlbag2")
(patch "019" "0mpb0whacppwcdx7pcnf0ah5vjvkw14ang6r2rh9fmkn401cvdx8")
(patch "020" "0vrwv9wpbr692kf427npmsxzvn007d9alk6jf99v7307s3q76is9")
+(patch "021" "1p5s6apnnbmx4yf1kzndw7fiwvdxamkcgqiv937mwmr6w9xsk1x8")
+(patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx")
+(patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax")
+(patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r")
]
Modified: nixpkgs/trunk/pkgs/stdenv/generic/setup.sh
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/generic/setup.sh Thu May 10 15:14:08 2012
(r34050)
+++ nixpkgs/trunk/pkgs/stdenv/generic/setup.sh Thu May 10 15:16:27 2012
(r34051)
@@ -432,15 +432,15 @@
case "$curSrc" in
*.tar.xz | *.tar.lzma)
# Don't rely on tar knowing about .xz.
- xz -d < $curSrc | tar xvf -
+ xz -d < $curSrc | tar xf -
;;
*.tar | *.tar.* | *.tgz | *.tbz2)
# GNU tar can automatically select the decompression method
# (info "(tar) gzip").
- tar xvf $curSrc
+ tar xf $curSrc
;;
*.zip)
- unzip $curSrc
+ unzip -qq $curSrc
;;
*)
if [ -d "$curSrc" ]; then
@@ -767,6 +767,19 @@
}
+installCheckPhase() {
+ runHook preInstallCheck
+
+ echo "installcheck flags: $makeFlags ${makeFlagsArray[@]}
$installCheckFlags ${installCheckFlagsArray[@]}"
+ make ${makefile:+-f $makefile} \
+ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+ $makeFlags "${makeFlagsArray[@]}" \
+ $installCheckFlags "${installCheckFlagsArray[@]}"
${installCheckTarget:-installcheck}
+
+ runHook postInstallCheck
+}
+
+
distPhase() {
runHook preDist
@@ -795,6 +808,7 @@
checkPhase) header "running tests";;
installPhase) header "installing";;
fixupPhase) header "post-installation fixup";;
+ installCheckPhase) header "running install tests";;
*) header "$phase";;
esac
}
@@ -811,7 +825,7 @@
if [ -z "$phases" ]; then
phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
configurePhase $preBuildPhases buildPhase checkPhase \
- $preInstallPhases installPhase fixupPhase \
+ $preInstallPhases installPhase fixupPhase installCheckPhase \
$preDistPhases distPhase $postPhases";
fi
@@ -820,6 +834,7 @@
if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi
if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue;
fi
if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi
+ if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then
continue; fi
if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi
if [ -n "$tracePhases" ]; then
Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Thu May
10 15:14:08 2012 (r34050)
+++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Thu May
10 15:16:27 2012 (r34051)
@@ -34,6 +34,8 @@
CFLAGS=-O3 CXXFLAGS=-O3
'';
+ doInstallCheck = true;
+
crossAttrs = {
postUnpack =
'' export CPATH="${bzip2.hostDrv}/include"
@@ -51,14 +53,11 @@
'' + stdenv.lib.optionalString (
stdenv.cross ? nix && stdenv.cross.nix ? system
) ''--with-system=${stdenv.cross.nix.system}'';
- doCheck = false;
- postInstall = ":";
+ doInstallCheck = false;
};
enableParallelBuilding = true;
- postInstall = "make installcheck";
-
meta = {
description = "The Nix Deployment System";
homepage = http://nixos.org/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu May 10 15:14:08
2012 (r34050)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu May 10 15:16:27
2012 (r34051)
@@ -3705,7 +3705,7 @@
# GMP 4.3.2 is broken on Darwin, so use 4.3.1.
callPackage ../development/libraries/gmp/4.3.1.nix { }
else
- callPackage ../development/libraries/gmp/5.0.3.nix { };
+ callPackage ../development/libraries/gmp/5.0.5.nix { };
gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
