diff options
| author | Peter Simons <simons@cryp.to> | 2018-12-03 20:03:37 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-12-04 22:08:46 +0100 |
| commit | 72b7f7f65b149dd6995ffc1b2c99b071476336b5 (patch) | |
| tree | f6ee2013651a8b1078ba22a31369c6bbab29632a /pkgs/development | |
| parent | 752b1484e477aba680aa4267a9ed9a1e90b06816 (diff) | |
| download | nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.tar nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.tar.gz nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.tar.bz2 nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.tar.lz nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.tar.xz nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.tar.zst nixlib-72b7f7f65b149dd6995ffc1b2c99b071476336b5.zip | |
hledger: update overrides for version 1.12
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50901b7d1dac..0c6621c9659b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -951,6 +951,13 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; + # hledger needs a newer megaparsec version than we have in LTS 12.x. + hledger-lib = super.hledger-lib.overrideScope (self: super: { + cassava-megaparsec = self.cassava-megaparsec_2_0_0; + hspec-megaparsec = self.hspec-megaparsec_2_0_0; + megaparsec = self.megaparsec_7_0_4; + }); + # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { @@ -976,7 +983,12 @@ self: super: { mkdir -p $out/share/info cp -v *.info* $out/share/info/ ''; - })); + })).overrideScope (self: super: { + cassava-megaparsec = self.cassava-megaparsec_2_0_0; + config-ini = self.config-ini_0_2_4_0; + hspec-megaparsec = self.hspec-megaparsec_2_0_0; + megaparsec = self.megaparsec_7_0_4; + }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' for i in $(seq 1 9); do diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index d61915c5abde..4d91daa89a13 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -54,9 +54,6 @@ self: super: { free = self.free_5_1; haddock-library = dontCheck super.haddock-library_1_7_0; HaTeX = doJailbreak super.HaTeX; - hledger = doJailbreak super.hledger; - hledger-lib = doJailbreak super.hledger-lib; - hledger-ui = doJailbreak super.hledger-ui; hpack = self.hpack_0_31_1; hslua = self.hslua_1_0_1; hslua-module-text = self.hslua-module-text_0_2_0; |