diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-31 09:51:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-31 09:53:49 +0100 |
| commit | 1fcd92ce923d33ab3d8c0b6c6d42473b135f114b (patch) | |
| tree | c0f696c1c2d3ff82067d891ee25bb4f44af54880 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 4d2b7638173afb4c0f0c12a43654bcff5c9500ab (diff) | |
| parent | ab3a12ed7ee0de4d247a8017151a1bf01829f6f7 (diff) | |
| download | nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.gz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.bz2 nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.lz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.xz nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.tar.zst nixlib-1fcd92ce923d33ab3d8c0b6c6d42473b135f114b.zip | |
Merge branch 'master' into staging
A few thousand rebuilds from master, again. Hydra: ?compare=1422362
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc86252a1aff..7eaecbc1b1ba 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1015,7 +1015,9 @@ self: super: { # 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; }; + + # Jailbreak "unix-compat >=0.1.2 && <0.5". + darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; }); - haddock-api = super.haddock-api.override - { haddock-library = self.haddock-library_1_4_4; }; } |