diff options
| author | Peter Simons <simons@cryp.to> | 2018-07-03 10:28:07 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-07-04 19:14:18 +0200 |
| commit | e938b12cde00eff4a6647fd0490a50a1487b208e (patch) | |
| tree | d819e8557323d76f65a6481aa1124821162eb34d | |
| parent | 0a635d3b78f739d9b197f66da4e67f7d9574f4aa (diff) | |
| download | nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.tar nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.tar.gz nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.tar.bz2 nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.tar.lz nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.tar.xz nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.tar.zst nixlib-e938b12cde00eff4a6647fd0490a50a1487b208e.zip | |
haskell-base-compat: update overrides for the new version
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ef7e8e4d4e57..dfc67240632c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 1cfbfa879bb6..2647296ee5b1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -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; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 7ced7d217e52..0d08126e19da 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -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 |