Merge remote-tracking branch 'origin/stdenv-updates' into illumos

Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
This commit is contained in:
Danny Wilson
2013-03-17 13:22:24 +01:00
388 changed files with 6760 additions and 2009 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
sha256 = "c169e962b8a0f7b7bcde5c5e0e2235248f1d78b155dfad684591d1a57e330b54";
sha256 = "0m0b6dzablci8mlavpsmn5w1v3r46li0wpjwvsybgxx0p1ifjsf1";
};
nativeBuildInputs = [ perl gnum4 ];