diff options
| author | Peter Simons <simons@cryp.to> | 2018-10-01 11:01:39 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-10-02 21:08:48 +0200 |
| commit | a4badb243c3382623c4541d4760b05307cc195f7 (patch) | |
| tree | 04668de36ba12e4ff2c18715e008184473b4b747 | |
| parent | 8f400527a7dd7825942cb840a2e2adea261d7b62 (diff) | |
| download | nixlib-a4badb243c3382623c4541d4760b05307cc195f7.tar nixlib-a4badb243c3382623c4541d4760b05307cc195f7.tar.gz nixlib-a4badb243c3382623c4541d4760b05307cc195f7.tar.bz2 nixlib-a4badb243c3382623c4541d4760b05307cc195f7.tar.lz nixlib-a4badb243c3382623c4541d4760b05307cc195f7.tar.xz nixlib-a4badb243c3382623c4541d4760b05307cc195f7.tar.zst nixlib-a4badb243c3382623c4541d4760b05307cc195f7.zip | |
hledger: fix build of new version 1.11
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 40bd4a7f0c9a..e4dac4a88612 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -953,13 +953,6 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; - # https://github.com/simonmichael/hledger/issues/852 - hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch { - url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch"; - sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2"; - stripLen = 1; - }); - # 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: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cdc6a25f016a..aee9b8df8fa3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,6 +43,8 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 + # Newer versions don't work in LTS-12.x + - cassava-megaparsec < 2 # LTS Haskell 12.11 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 |