JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-base-compat: update overrides for the new version

Browse Source
This commit is contained in:
Peter Simons 2018-07-03 10:28:07 +02:00
parent 0a635d3b78
commit e938b12cde
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -665,7 +665,7 @@ self: super: {
# Need newer versions of their dependencies than the ones we have in LTS-11.x.
cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_1; });
graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
# https://github.com/bos/configurator/issues/22
@ -1073,7 +1073,7 @@ self: super: {
# cabal2nix generates a dependency on base-compat, which is the wrong version
base-compat-batteries = super.base-compat-batteries.override {
base-compat = super.base-compat_0_10_1;
base-compat = super.base-compat_0_10_4;
};
}

6
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -96,14 +96,14 @@ self: super: {
# 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-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_4; });
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;
base-compat = self.base-compat_0_10_4;
aeson = self.aeson_1_4_0_0;
});
hledger-web = super.hledger-web.overrideScope (self: super: {
base-compat = self.base-compat_0_10_1;
base-compat = self.base-compat_0_10_4;
aeson = self.aeson_1_4_0_0;
});

2
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -391,7 +391,7 @@ self: super: {
enclosed-exceptions = dontCheck super.enclosed-exceptions;
# Older versions don't compile.
base-compat = self.base-compat_0_10_1;
base-compat = self.base-compat_0_10_4;
brick = self.brick_0_37_1;
dhall = self.dhall_1_14_0;
dhall_1_13_0 = doJailbreak super.dhall_1_14_0; # support ansi-terminal 0.8.x