diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-07 09:21:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:14:12 -0700 |
| commit | a31bcbfae059a704afc6010c0c4dcffa6350112c (patch) | |
| tree | c24195bb61e3efea489e3222cf35663109c39886 /pkgs/top-level | |
| parent | 6085213bc5389fcdb64bc2649db0e7b81e914751 (diff) | |
| download | nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.tar nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.tar.gz nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.tar.bz2 nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.tar.lz nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.tar.xz nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.tar.zst nixlib-a31bcbfae059a704afc6010c0c4dcffa6350112c.zip | |
Revert "Revert "gmp: Use version 6 as the default""
This reverts commit 7d299447ae584bd064ef175fa889607cb387d0c9.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93aab5eed531..0124db33895b 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 |