diff options
| author | Peter Simons <simons@cryp.to> | 2016-06-03 15:08:21 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-06-03 16:12:41 +0200 |
| commit | d27881c014802d367dfb40e76a37c738e3ef187b (patch) | |
| tree | 5f9ea08bd8c8fde229230eb2917134aadc400c9d /pkgs | |
| parent | d2bb38e59baa469784e1089a6017b638bb39d276 (diff) | |
| download | nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.tar nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.tar.gz nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.tar.bz2 nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.tar.lz nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.tar.xz nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.tar.zst nixlib-d27881c014802d367dfb40e76a37c738e3ef187b.zip | |
haskell-pandoc: fix build
Diffstat (limited to 'pkgs')
| -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 af9e2d0f9120..9f1d1b56d3ca 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -586,8 +586,10 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # https://github.com/jgm/pandoc/issues/2709 - pandoc = doJailbreak (disableSharedExecutables super.pandoc); + # Relax overspecified constraints. Unfortunately, jailbreak won't work. + pandoc = overrideCabal super.pandoc (drv: { + preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal"; + }); # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. |