alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #41861 from obsidiansystems/ghc-gmp

Browse source 
ghc: Default integer-simple usage based one whether GNU MP is available
This commit is contained in:
John Ericson 2018-06-11 17:04:23 -04:00 committed by GitHub
parent 1ba43328da 812decd5c1
commit a3b3d95681
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/ghc/7.10.3.nix
View file

@ -16,7 +16,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null
enableIntegerSimple ? !(gmp.meta.available or false), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@ -30,8 +30,6 @@
ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (bootPkgs) ghc;

4
pkgs/development/compilers/ghc/8.0.2.nix
View file

@ -15,7 +15,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null
enableIntegerSimple ? !(gmp.meta.available or false), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@ -29,8 +29,6 @@
ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (bootPkgs) ghc;

4
pkgs/development/compilers/ghc/8.2.2.nix
View file

@ -16,7 +16,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null
enableIntegerSimple ? !(gmp.meta.available or false), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@ -34,8 +34,6 @@
deterministicProfiling ? false
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (bootPkgs) ghc;

4
pkgs/development/compilers/ghc/8.4.2.nix
View file

@ -15,7 +15,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null
enableIntegerSimple ? !(gmp.meta.available or false), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@ -32,8 +32,6 @@
ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (bootPkgs) ghc;

4
pkgs/development/compilers/ghc/head.nix
View file

@ -15,7 +15,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? false, gmp ? null
enableIntegerSimple ? !(gmp.meta.available or false), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@ -33,8 +33,6 @@
ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
}:
assert !enableIntegerSimple -> gmp != null;
let
inherit (bootPkgs) ghc;

1
pkgs/development/libraries/gmp/6.x.nix
View file

@ -75,6 +75,7 @@ let self = stdenv.mkDerivation rec {
asymptotically faster algorithms.
'';
broken = with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt;
platforms = platforms.all;
maintainers = [ maintainers.peti maintainers.vrthra ];
};

1
pkgs/top-level/haskell-packages.nix
View file

@ -8,7 +8,6 @@ let
integerSimpleExcludes = [
"ghc7103Binary"
"ghc821Binary"
"ghcCross"
"ghcjs"
"ghcjs710"
"ghcjs80"