diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-09-24 01:55:50 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-09-24 01:57:09 +0200 |
commit | 36e8d638d48cb60052febe191407e7ba011d4c68 (patch) | |
tree | 248e4336987dd26e1ef2801ba38ff0663ea7fcfb /pkgs | |
parent | e1d51fa9e6db87af72d34544bba707000861c000 (diff) | |
download | nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.tar nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.tar.gz nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.tar.bz2 nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.tar.lz nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.tar.xz nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.tar.zst nixlib-36e8d638d48cb60052febe191407e7ba011d4c68.zip |
haskellPackages.haddock-api: fix build
Also remove haddock-library == 1.4.4 since it's not needed anymore
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 5 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 69ab8139668e..8beca9572e7e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -927,8 +927,9 @@ self: super: { text-icu = dontCheck super.text-icu; # https://github.com/haskell/cabal/issues/4969 - haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4; - haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; }; + haddock-api = (super.haddock-api.overrideScope (self: super: { + haddock-library = self.haddock-library_1_6_0; + })).override { hspec = self.hspec_2_4_8; }; # Jailbreak "unix-compat >=0.1.2 && <0.5". # Jailbreak "graphviz >=2999.18.1 && <2999.20". diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2eefe636ca97..7f9e31432892 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2400,7 +2400,6 @@ extra-packages: - haddock-api == 2.17.* # required on GHC 8.0.x - haddock-library == 1.2.* # required for haddock-api-2.16.x - haddock-library == 1.4.3 # required for haddock-api-2.17.x - - haddock-library == 1.4.4 # required for haddock-api-2.18.x - haddock-library == 1.5.* # required for stylish-cabal-0.4.0.1 - happy <1.19.6 # newer versions break Agda - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support |