3
0
Fork 0
forked from mirrors/nixpkgs

hledger: fix ghc-8.2.x build of the new 1.10 version

This commit is contained in:
Peter Simons 2018-07-01 22:26:09 +02:00
parent 065c936863
commit 0b36a94ed4
2 changed files with 13 additions and 6 deletions

View file

@ -94,4 +94,17 @@ self: super: {
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));
# Hledger depends indirectly on different versions of base-compat. The
# override can probably be removed once we update to LTS 12.x.
hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_1; });
hledger-ui = super.hledger-ui.overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; });
hledger = super.hledger.overrideScope (self: super: {
base-compat = self.base-compat_0_10_1;
aeson = self.aeson_1_4_0_0;
});
hledger-web = super.hledger-web.overrideScope (self: super: {
base-compat = self.base-compat_0_10_1;
aeson = self.aeson_1_4_0_0;
});
}

View file

@ -429,10 +429,4 @@ self: super: {
lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch;
# Version 1.9.1 excludes base-compat 0.10.x for the benefit of older
# compilers, but ghc 8.4.x works fine with the new version.
hledger-lib = doJailbreak super.hledger-lib;
hledger = doJailbreak super.hledger;
hledger-ui = doJailbreak super.hledger-ui;
}