Merge branch 'staging' into v/modular

Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
parent 4c3e6a4675 acba6b4da2
commit 8da52a642a
767 changed files with 19114 additions and 13711 deletions
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "boehm-gc-7.2d";
+  name = "boehm-gc-7.2f";

  src = fetchurl {
-    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz;
-    sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr";
+    url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz;
+    sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16";
  };

  outputs = [ "dev" "out" "doc" ];