From 7d299447ae584bd064ef175fa889607cb387d0c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jun 2015 23:59:56 +0200 Subject: [PATCH] Revert "gmp: Use version 6 as the default" This reverts commit 370fc79b948438694dc4767570afe43c5b1fb7c4, because it causes trouble on both Linux and Darwin, and we probably shouldn't have to worry about that kind of stuff right now with the 15.06 release being late'ish already. --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f7422cb125..4df6e675d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6206,8 +6206,7 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = gmp6; + gmp = gmp5; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp