about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-02-27 14:08:23 +0100
committerPeter Simons <simons@cryp.to>2020-02-28 20:42:26 +0100
commit9347a3e5bebbb5104c2b32ed96ceaddb4850802d (patch)
treeccf63f3f15dae6f97d26b9a526b71b0b0d0a5bf7 /pkgs/development/haskell-modules
parentba190861e8789918a1f828b85759ad418c6aa76a (diff)
downloadnixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.tar
nixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.tar.gz
nixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.tar.bz2
nixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.tar.lz
nixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.tar.xz
nixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.tar.zst
nixlib-9347a3e5bebbb5104c2b32ed96ceaddb4850802d.zip
ghc-8.10.x: add overrides to fix regex-* packages
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix21
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 96c50aa43d30..734e6ac29774 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -45,26 +45,19 @@ self: super: {
   # Jailbreak to fix the build.
   async = doJailbreak super.async;
   hashable = doJailbreak super.hashable;
-  primitive_0_7_0_0 = doJailbreak (dontCheck super.primitive_0_7_0_0);  # evaluating the test suite gives an infinite recursion
-  regex-base_0_94_0_0 = doJailbreak super.regex-base_0_94_0_0;
-  regex-compat_0_95_2_0 = doJailbreak super.regex-compat_0_95_2_0;
-  regex-posix_0_96_0_0 = doJailbreak super.regex-posix_0_96_0_0;
+  parallel = doJailbreak super.parallel;
+  regex-base = doJailbreak super.regex-base;
+  regex-compat = doJailbreak super.regex-compat;
+  regex-pcre-builtin = doJailbreak super.regex-pcre-builtin;
+  regex-posix = doJailbreak super.regex-posix;
+  regex-tdfa = doJailbreak super.regex-tdfa;
+  split = doJailbreak super.split;
   tar = doJailbreak super.tar;
   tasty-expected-failure = doJailbreak super.tasty-expected-failure;
   unliftio-core = doJailbreak super.unliftio-core;
   vector = doJailbreak super.vector;
   zlib = doJailbreak super.zlib;
-  parallel = doJailbreak super.parallel;
-  split = doJailbreak super.split;
 
   # Use the latest version to fix the build.
-  generic-deriving = self.generic-deriving_1_13_1;
-  optparse-applicative = self.optparse-applicative_0_15_1_0;
-  primitive = self.primitive_0_7_0_0;
-  regex-base = self.regex-base_0_94_0_0;
-  regex-compat = self.regex-compat_0_95_2_0;
-  regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
-  regex-posix = self.regex-posix_0_96_0_0;
-  regex-tdfa = self.regex-tdfa_1_3_1_0;
 
 }