summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2018-09-24 01:55:50 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2018-09-24 01:57:09 +0200
commit36e8d638d48cb60052febe191407e7ba011d4c68 (patch)
tree248e4336987dd26e1ef2801ba38ff0663ea7fcfb /pkgs/development/haskell-modules/configuration-common.nix
parente1d51fa9e6db87af72d34544bba707000861c000 (diff)
downloadnixlib-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/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix5
1 files changed, 3 insertions, 2 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".