From d631679b830674a1b9568407fa9108339ccd2fc6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 30 May 2016 20:48:28 -0400
Subject: [PATCH] cabal: fix expressions
---
pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2aeda8d49cc..af9e2d0f9120 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.