diff options
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 87b1d34f7ed..d8d1e3f499a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -111,6 +111,10 @@ self: super: { # Test suite has stricter version bounds retry = dontCheck super.retry; + # test/System/Posix/Types/OrphansSpec.hs:19:13: + # Not in scope: type constructor or class ‘Int32’ + base-orphans = dontCheck super.base-orphans; + # Test suite fails with time >= 1.5 http-date = dontCheck super.http-date; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4f142cd932d..95f58b7322d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -15,6 +15,7 @@ , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false +, enableExecutableProfiling ? false , enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 @@ -86,6 +87,7 @@ let (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (enableFeature enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") + (enableFeature enableExecutableProfiling "executable-profiling") (enableFeature enableSharedLibraries "shared") (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) |