summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-12-19 22:04:00 +0100
committerPeter Simons <simons@cryp.to>2017-12-20 09:17:46 +0100
commit637261325950ca3c66ba1ff27522033f3a59ea6c (patch)
tree74ebe29194852683a1eea49c2d3e5f14e824f03f /pkgs
parenta5d5d03a9790390cc7892ffeffb4188b28f97a38 (diff)
downloadnixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.tar
nixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.tar.gz
nixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.tar.bz2
nixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.tar.lz
nixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.tar.xz
nixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.tar.zst
nixpkgs-637261325950ca3c66ba1ff27522033f3a59ea6c.zip
cabal-install: drop obsolete overrides
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0fa1e96db92..145f2351ff5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -32,9 +32,8 @@ self: super: {
   # compiled on Linux. We provide the name to avoid evaluation errors.
   unbuildable = throw "package depends on meta package 'unbuildable'";
 
-  # cabal-install needs Cabal 2.x. hackage-security's test suite does not compile with
-  # Cabal 2.x, though. See https://github.com/haskell/hackage-security/issues/188.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
+  # hackage-security's test suite does not compile with Cabal 2.x.
+  # See https://github.com/haskell/hackage-security/issues/188.
   hackage-security = dontCheck super.hackage-security;
 
   # Link statically to avoid runtime dependency on GHC.