summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Alan Dorman <mdorman@ironicdesign.com>2016-05-30 20:48:28 -0400
committerPeter Simons <simons@cryp.to>2016-06-02 09:30:38 +0200
commitd631679b830674a1b9568407fa9108339ccd2fc6 (patch)
treee29231aefb7d5183e3604d7f6f18b78f6efd40b2 /pkgs
parent76db3f6e63ecb5d06ee8dfa24ec739f89a82106a (diff)
downloadnixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.tar
nixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.tar.gz
nixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.tar.bz2
nixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.tar.lz
nixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.tar.xz
nixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.tar.zst
nixpkgs-d631679b830674a1b9568407fa9108339ccd2fc6.zip
cabal: fix expressions
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2aeda8d49c..af9e2d0f912 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -7,7 +7,8 @@ self: super: {
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_7 = dontCheck super.Cabal_1_18_1_7;
   Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4;
-  Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
+  Cabal_1_22_4_0 = (dontCheck super.Cabal_1_22_4_0).overrideScope (self: super: { binary = self.binary_0_7_6_1; });
+  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
   cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_7; });
 
   # Link statically to avoid runtime dependency on GHC.