diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
| commit | 3e31d23d994b94b9883a39037e328c026491b999 (patch) | |
| tree | aa5fec3413ae5b31a32ce37423ed677206121883 /pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | |
| parent | 0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4 (diff) | |
| parent | 2c07921cff84dfb0b9e0f6c2d10ee2bfee6a85ac (diff) | |
| download | nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.gz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.bz2 nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.lz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.xz nixlib-3e31d23d994b94b9883a39037e328c026491b999.tar.zst nixlib-3e31d23d994b94b9883a39037e328c026491b999.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 7924a39fa96d..1a4638c51e15 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -35,6 +35,12 @@ self: super: { unix = null; xhtml = null; + # These are now core libraries in GHC 8.4.x. + mtl = self.mtl_2_2_2; + parsec = self.parsec_3_1_13_0; + stm = self.stm_2_4_5_0; + text = self.text_1_2_3_0; + # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; @@ -44,9 +50,6 @@ self: super: { # Requires ghc 8.2 ghc-proofs = dontDistribute super.ghc-proofs; - # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 - vector-algorithms = dontCheck super.vector-algorithms; - # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77 yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2; |