diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 18:15:13 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 18:15:13 +0100 |
commit | 4cc2a38854338ba783fb867ff924200b59867773 (patch) | |
tree | 5b6c24becb12735ccb81edcb3fdfdd685e582d3d /pkgs/development/haskell-modules/configuration-common.nix | |
parent | e576535408530584d3590ecbead71d30dbfcfb07 (diff) | |
parent | f448a79770db137448f12236fc10719ef7389abd (diff) | |
download | nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.gz nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.bz2 nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.lz nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.xz nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.zst nixlib-4cc2a38854338ba783fb867ff924200b59867773.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7eaecbc1b1ba..52eecb709a80 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1020,4 +1020,7 @@ self: super: { # Jailbreak "unix-compat >=0.1.2 && <0.5". darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; }); + # https://github.com/Twinside/Juicy.Pixels/issues/149 + JuicyPixels = dontHaddock super.JuicyPixels; + } |