summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-05-23 12:49:42 +0200
committerPeter Simons <simons@cryp.to>2015-05-23 15:09:29 +0200
commit70a7f7c14da197968a381a5890a5000656934a01 (patch)
tree94bd02bb7dd57076374aca3cd244bac81571a51f /pkgs/development/haskell-modules/configuration-common.nix
parent18a6e7171e5f0238c50876198648dd7808cfc6e2 (diff)
downloadnixpkgs-70a7f7c14da197968a381a5890a5000656934a01.tar
nixpkgs-70a7f7c14da197968a381a5890a5000656934a01.tar.gz
nixpkgs-70a7f7c14da197968a381a5890a5000656934a01.tar.bz2
nixpkgs-70a7f7c14da197968a381a5890a5000656934a01.tar.lz
nixpkgs-70a7f7c14da197968a381a5890a5000656934a01.tar.xz
nixpkgs-70a7f7c14da197968a381a5890a5000656934a01.tar.zst
nixpkgs-70a7f7c14da197968a381a5890a5000656934a01.zip
haskell-configuration-common: use overrideScope on cabal-install instead of override
This patch works around https://github.com/NixOS/nixpkgs/issues/7953 so
that we can use overrideScope on this attribute in the GHC 7.6.x package
set (see next commit).
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b27b43c12be..5adc679f0ec 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,8 +8,8 @@ self: super: {
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
   Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
-  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
-  cabal-install_1_18_1_0 = dontCheck (super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
+  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
+  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
 
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;