diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-11-22 19:25:02 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-11-22 19:25:08 +0100 |
| commit | 26f659e65f326b9f134e625dadcfa0881ec4e545 (patch) | |
| tree | 21a6e1d0e190cdd065065df5017ca7ad98f3fd78 /pkgs/development/haskell-modules/patches | |
| parent | 58b8532158c7e4757a01b5dddb498bb0b1cb4c96 (diff) | |
| download | nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.tar nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.tar.gz nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.tar.bz2 nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.tar.lz nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.tar.xz nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.tar.zst nixlib-26f659e65f326b9f134e625dadcfa0881ec4e545.zip | |
haskellPackages.mbox: fix build for time >= 1.10
Patch proposed to upstream via email, using a trivial replacement as suggested in the time documentation.
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
| -rw-r--r-- | pkgs/development/haskell-modules/patches/mbox-time-1.10.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/patches/mbox-time-1.10.patch b/pkgs/development/haskell-modules/patches/mbox-time-1.10.patch new file mode 100644 index 000000000000..f72b8483b339 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/mbox-time-1.10.patch @@ -0,0 +1,52 @@ +diff -rN -u old-mbox/Data/MBox/String.hs new-mbox/Data/MBox/String.hs +--- old-mbox/Data/MBox/String.hs 2022-11-22 19:14:52.332543098 +0100 ++++ new-mbox/Data/MBox/String.hs 2022-11-22 19:14:52.332543098 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + + ----------------------------------------------------------------------------- + {- | +@@ -31,7 +32,11 @@ + -- | Reads a date header as a UTCTime + parseDateHeader :: String -> Maybe UTCTime + parseDateHeader header = listToMaybe . catMaybes $ map tryParse formats where ++#if MIN_VERSION_time(1,9,0) ++ tryParse f = parseTimeM True LC.defaultTimeLocale f header ++#else + tryParse f = parseTime LC.defaultTimeLocale f header ++#endif + formats = + [ "%a, %_d %b %Y %T %z" + , "%a, %_d %b %Y %T %Z" +diff -rN -u old-mbox/Data/MBox.hs new-mbox/Data/MBox.hs +--- old-mbox/Data/MBox.hs 2022-11-22 19:14:52.332543098 +0100 ++++ new-mbox/Data/MBox.hs 2022-11-22 19:14:52.332543098 +0100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE ViewPatterns #-} + + ----------------------------------------------------------------------------- +@@ -34,7 +35,11 @@ + parseDateHeader :: T.Text -> Maybe UTCTime + parseDateHeader txt = listToMaybe . catMaybes $ map tryParse formats where + header = T.unpack txt ++#if MIN_VERSION_time(1,9,0) ++ tryParse f = parseTimeM True LC.defaultTimeLocale f header ++#else + tryParse f = parseTime LC.defaultTimeLocale f header ++#endif + formats = + [ "%a, %_d %b %Y %T %z" + , "%a, %_d %b %Y %T %Z" +diff -rN -u old-mbox/mbox.cabal new-mbox/mbox.cabal +--- old-mbox/mbox.cabal 2022-11-22 19:14:52.332543098 +0100 ++++ new-mbox/mbox.cabal 2022-11-22 19:14:52.332543098 +0100 +@@ -13,7 +13,7 @@ + Cabal-Version: >= 1.6 + + library +- build-depends: base >= 4, base < 6, safe, time < 1.9, time-locale-compat, text ++ build-depends: base >= 4, base < 6, safe, time, time-locale-compat, text + exposed-modules: Data.MBox, Data.MBox.String + ghc-options: -Wall + |