Merge stdenv-updates-gcc47 into stdenv-updates

Conflicts (simple): pkgs/development/libraries/gmp/5.0.5.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/top-level/all-packages.nix
2013-03-09 12:01:39 +01:00
parent 5e434ef318 755dac3c6d
commit 637e799ead
6 changed files with 17 additions and 14 deletions
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
  name = "gmp-5.1.1";

  src = fetchurl {
-    urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
+    urls = [ "mirror://gnu/gmp/${name}.tar.bz2" 
+      "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
    sha256 = "1bdgf04k2i12pfivxgjq68iarz3ngix9hpzbmkgijrdk92gpgm50";
  };