From ee262b83ef77bad4194949d03992d0bc1549e8bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Mar 2018 17:39:51 +0100 Subject: [PATCH] cabal2nix: fix overrides for Cabal 2.2.x --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5826b875691a..4217b2d0357a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -607,7 +607,7 @@ self: super: { }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_27_0; }; + cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_27_0; hackage-db = self.hackage-db_2_0_1; }); hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; }); # https://github.com/bos/configurator/issues/22 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 20bd3b0398c5..2531f05cfa9b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -100,5 +100,9 @@ self: super: { Cabal = self.Cabal_2_2_0_0; text = self.text_1_2_3_0; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_0; + text = self.text_1_2_3_0; + }); }