about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 83efa6b0b5a3..ade4d5e915dc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -1,6 +1,6 @@
-{ pkgs }:
+{ pkgs, haskellLib }:
 
-with import ./lib.nix { inherit pkgs; };
+with haskellLib;
 
 self: super: {
 
@@ -35,9 +35,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # cabal-install can use the native Cabal library.
-  cabal-install = super.cabal-install.override { Cabal = null; };
-
   # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
@@ -47,8 +44,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  ## GHC 8.0.2
-
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 
@@ -60,4 +55,8 @@ self: super: {
 
   # Newer versions require ghc>=8.2
   apply-refact = super.apply-refact_0_3_0_1;
+
+  # This builds needs the latest Cabal version.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; });
+
 }