From 14fe075e06b8a226bbd8274315e19ff9253b0509 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 13 Sep 2012 19:33:06 +0200 Subject: [PATCH] Make regex-compat and regex-posix compile with ghc-7.6.1. --- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9f8f85b2df02..01b4f2e75abe 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -20,6 +20,7 @@ haskellPlatform = null; binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; + regexCompat = self.regexCompat_0_95_1.override { regexPosix = self.regexPosix_0_95_2; }; }; ghc741Prefs = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4aeb4bfb3c1..b7c14710f5bf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,8 +135,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck = self.QuickCheck_2_5; # 7.6 ok random = self.random_1_0_1_1; # 7.6 ok regexBase = self.regexBase_0_93_2; # 7.6 ok - regexCompat = self.regexCompat_0_95_1; # 7.6 fail - regexPosix = self.regexPosix_0_95_1; # 7.6 fail + regexCompat = self.regexCompat_0_95_1; # 7.6 ok + regexPosix = self.regexPosix_0_95_2; # 7.6 ok stm = self.stm_2_4; # 7.6 ok syb = self.syb_0_3_7; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok