diff options
author | Nathan van Doorn <nvd1234@gmail.com> | 2018-09-18 15:29:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-18 15:29:58 +0100 |
commit | d6dc56180b5d64cf6e12da10255b03358c661002 (patch) | |
tree | c12b290127d5664b9c7a9bafb8302f7df19ff6eb /pkgs/development/haskell-modules | |
parent | 0a308534615dc3cbb37f3c9400323a9089083343 (diff) | |
download | nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.tar nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.tar.gz nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.tar.bz2 nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.tar.lz nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.tar.xz nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.tar.zst nixlib-d6dc56180b5d64cf6e12da10255b03358c661002.zip |
haskellPackages.JuicyPixels: re-enable Haddock
This was made to avoid an issue which was fixed in `3.2.9.3`. The version currently in `nixpkgs 18.03` is `3.2.9.4`, which includes this fix.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2f89623ecdeb..399bb21f6e62 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -933,9 +933,6 @@ self: super: { # Jailbreak "graphviz >=2999.18.1 && <2999.20". darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; }); - # https://github.com/Twinside/Juicy.Pixels/issues/149 - JuicyPixels = dontHaddock super.JuicyPixels; - # aarch64 and armv7l fixes. happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 |