diff options
| author | Peter Simons <simons@cryp.to> | 2018-07-04 10:46:07 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-07-04 19:14:18 +0200 |
| commit | 259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62 (patch) | |
| tree | a3d1cd26128fab6e82157ef8288d47e1d62ca8dd /pkgs | |
| parent | e938b12cde00eff4a6647fd0490a50a1487b208e (diff) | |
| download | nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.tar nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.tar.gz nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.tar.bz2 nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.tar.lz nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.tar.xz nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.tar.zst nixlib-259215a6b3fa5d4ad4a2dfe63ff5caf10424ac62.zip | |
ghc-8.6.x: create an initial package set configuration
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 47 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 5 |
3 files changed, 55 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 0d08126e19da..a32a30a02737 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -23,7 +23,6 @@ self: super: { ghc-prim = null; ghci = null; haskeline = null; - hoopl = self.hoopl_3_10_2_2; # no longer a core library in GHC 8.4.x hpc = null; integer-gmp = null; mtl = null; @@ -40,6 +39,9 @@ self: super: { unix = null; xhtml = null; + # Use to be a core-library, but no longer is since GHC 8.4.x. + hoopl = self.hoopl_3_10_2_2; + doctest = dontCheck super.doctest_0_16_0; # tests depend on very recent QuickCheck hackage-db = super.hackage-db_2_0_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix new file mode 100644 index 000000000000..bc540cbe36d6 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -0,0 +1,47 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + + # Disable GHC 8.6.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # Use to be a core-library, but no longer is since GHC 8.4.x. + hoopl = self.hoopl_3_10_2_2; + +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6044c7d6c4b..cb8135294b83 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -156,6 +156,11 @@ in rec { ghc = bh.compiler.ghc843; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; + ghc861 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc861; + ghc = bh.compiler.ghc861; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; |