From 513d648f40a178315b830fffd34903e542a5f103 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 Jun 2016 17:47:35 +0200 Subject: [PATCH] configuration-common.nix: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f1d1b56d3c..08df6545550 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -5,10 +5,8 @@ with import ./lib.nix { inherit pkgs; }; 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).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_1_22_4_0 = super.Cabal_1_22_4_0.overrideScope (self: super: { binary = self.binary_0_7_6_1; }); + cabal-install = 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.