From a31bcbfae059a704afc6010c0c4dcffa6350112c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 7 Jul 2015 09:21:00 -0700 Subject: [PATCH] Revert "Revert "gmp: Use version 6 as the default"" This reverts commit 7d299447ae584bd064ef175fa889607cb387d0c9. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93aab5eed53..0124db33895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6315,7 +6315,8 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp = gmp5; + gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; + gmp = gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp