From 3699343318b82440ba7ee5e51467bcfda7290f18 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 16 Dec 2008 18:35:46 +0000
Subject: [PATCH] fix the regexpr version fix, we really do require 0.5.1

---
 Ledger/Utils.hs | 10 +---------
 hledger.cabal   |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Ledger/Utils.hs b/Ledger/Utils.hs
index 783912c04..b74ee737f 100644
--- a/Ledger/Utils.hs
+++ b/Ledger/Utils.hs
@@ -36,7 +36,7 @@ import Debug.Trace
 import Test.HUnit
 import Text.Printf
 import Text.Regex
-import Text.RegexPR hiding (gsubRegexPRBy)
+import Text.RegexPR
 import Text.ParserCombinators.Parsec
 
 
@@ -120,14 +120,6 @@ containsRegex r s = case matchRegex r s of
                       Just _ -> True
                       otherwise -> False
 
--- regexpr-0.5.1 includes this now, keep a little longer to minimise installation pain
--- | Replace all occurrences of a regexp in string using the given replacement function
-gsubRegexPRBy :: String -> (String -> String) -> String -> String
-gsubRegexPRBy pat f str = 
-    case (matchRegexPR pat str) of 
-      Just ((match, (before,after)), _) -> before ++ f match ++ gsubRegexPRBy pat f after
-      Nothing -> str
-    
 
 -- lists
 
diff --git a/hledger.cabal b/hledger.cabal
index c6ce4d8dd..38341f27c 100644
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -19,7 +19,7 @@ Extra-Tmp-Files:
 Cabal-Version:  >= 1.2
 
 Executable hledger
-  Build-Depends:  base, containers, haskell98, directory, parsec, regex-compat, regexpr,
+  Build-Depends:  base, containers, haskell98, directory, parsec, regex-compat, regexpr>=0.5.1,
                   old-locale, time, HUnit, vty==3.1.2, mtl, bytestring
   Main-Is:        hledger.hs
   Other-Modules: