summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-10-24 21:49:32 +0200
committerPeter Simons <simons@cryp.to>2018-10-25 11:12:38 +0200
commit26974e962ebc5c1e3dfd8f6a84402ad72dc43d24 (patch)
treea7f53b13ec878ed2701cb6534c9cd23620037c91 /pkgs/development/haskell-modules
parentf1fd7da4067f0ee17e3d19b5a2cb200321c50e86 (diff)
downloadnixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.tar
nixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.tar.gz
nixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.tar.bz2
nixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.tar.lz
nixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.tar.xz
nixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.tar.zst
nixlib-26974e962ebc5c1e3dfd8f6a84402ad72dc43d24.zip
cabal2nix: fix build with ghc 8.4.x
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 052779e9a1e8..213651405f35 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -63,12 +63,11 @@ self: super: {
   # more verbose but friendlier for Hydra.
   stack = (doJailbreak super.stack).override {
     Cabal = self.Cabal_2_4_0_1;
-    hpack = self.hpack_0_31_0;
+    hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; };
     yaml = self.yaml_0_11_0_0;
     hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
   };
   hpack_0_31_0 = super.hpack_0_31_0.override {
-    Cabal = self.Cabal_2_4_0_1;
     yaml = self.yaml_0_11_0_0;
   };