summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index e4d0e00a3266..8e18435c0c4f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,8 +39,8 @@ self: super: {
   # 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; };
+  # jailbreak-cabal doesn't seem to work right with the native Cabal version.
+  jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
@@ -60,11 +60,16 @@ self: super: {
   ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
   # Older, LTS-8-based versions don't compile.
-  vector = super.vector_0_12_0_1;
+  base-orphans = self.base-orphans_0_6;
+  hspec-meta = self.hspec-meta_2_4_4;
+  lens = self.lens_4_15_3;
   primitive = self.primitive_0_6_2_0;
+  semigroupoids = self.semigroupoids_5_2;
   syb = self.syb_0_7;
+  vector = super.vector_0_12_0_1;
 
   # Work around overly restrictive constraints on the version of 'base'.
-  doctest = doJailbreak super.doctest;
+  ChasingBottoms = doJailbreak super.ChasingBottoms;
+  hashable = doJailbreak super.hashable;
 
 }