commit 26f659e65f326b9f134e625dadcfa0881ec4e545 · pyrox.dev/nixpkgs

pkgs/development/haskell-modules/configuration-common.nix

···

       170
       170
        
         hoodle-core = dontHaddock super.hoodle-core;

     

       171
       171
        
         hsc3-db = dontHaddock super.hsc3-db;

     

       172
       172
        
       

     

       173
       173
       +
         # Fix build with time >= 1.10 while retaining compat with time < 1.9

     

       174
       174
       +
         mbox = appendPatch ./patches/mbox-time-1.10.patch

     

       175
       175
       +
           (overrideCabal { editedCabalFile = null; revision = null; } super.mbox);

     

       176
       176
       +
       

     

       173
       177
        
         # Too strict bounds on base, optparse-applicative: https://github.com/edsko/friendly/issues/5

     

       174
       178
        
         friendly = doJailbreak super.friendly;

     

       175
       179

+52

pkgs/development/haskell-modules/patches/mbox-time-1.10.patch

···

       1
       1
       +
       diff -rN -u old-mbox/Data/MBox/String.hs new-mbox/Data/MBox/String.hs

     

       2
       2
       +
       --- old-mbox/Data/MBox/String.hs	2022-11-22 19:14:52.332543098 +0100

     

       3
       3
       +
       +++ new-mbox/Data/MBox/String.hs	2022-11-22 19:14:52.332543098 +0100

     

       4
       4
       +
       @@ -1,3 +1,4 @@

     

       5
       5
       +
       +{-# LANGUAGE CPP #-}

     

       6
       6
       +
        

     

       7
       7
       +
        -----------------------------------------------------------------------------

     

       8
       8
       +
        {- |

     

       9
       9
       +
       @@ -31,7 +32,11 @@

     

       10
       10
       +
        -- | Reads a date header as a UTCTime

     

       11
       11
       +
        parseDateHeader :: String -> Maybe UTCTime

     

       12
       12
       +
        parseDateHeader header = listToMaybe . catMaybes $ map tryParse formats where

     

       13
       13
       +
       +#if MIN_VERSION_time(1,9,0)

     

       14
       14
       +
       +  tryParse f = parseTimeM True LC.defaultTimeLocale f header

     

       15
       15
       +
       +#else

     

       16
       16
       +
          tryParse f = parseTime LC.defaultTimeLocale f header

     

       17
       17
       +
       +#endif

     

       18
       18
       +
          formats =

     

       19
       19
       +
            [ "%a, %_d %b %Y %T %z"

     

       20
       20
       +
            , "%a, %_d %b %Y %T %Z"

     

       21
       21
       +
       diff -rN -u old-mbox/Data/MBox.hs new-mbox/Data/MBox.hs

     

       22
       22
       +
       --- old-mbox/Data/MBox.hs	2022-11-22 19:14:52.332543098 +0100

     

       23
       23
       +
       +++ new-mbox/Data/MBox.hs	2022-11-22 19:14:52.332543098 +0100

     

       24
       24
       +
       @@ -1,3 +1,4 @@

     

       25
       25
       +
       +{-# LANGUAGE CPP #-}

     

       26
       26
       +
        {-# LANGUAGE ViewPatterns #-}

     

       27
       27
       +
        

     

       28
       28
       +
        -----------------------------------------------------------------------------

     

       29
       29
       +
       @@ -34,7 +35,11 @@

     

       30
       30
       +
        parseDateHeader :: T.Text -> Maybe UTCTime

     

       31
       31
       +
        parseDateHeader txt = listToMaybe . catMaybes $ map tryParse formats where

     

       32
       32
       +
          header = T.unpack txt

     

       33
       33
       +
       +#if MIN_VERSION_time(1,9,0)

     

       34
       34
       +
       +  tryParse f = parseTimeM True LC.defaultTimeLocale f header

     

       35
       35
       +
       +#else

     

       36
       36
       +
          tryParse f = parseTime LC.defaultTimeLocale f header

     

       37
       37
       +
       +#endif

     

       38
       38
       +
          formats =

     

       39
       39
       +
            [ "%a, %_d %b %Y %T %z"

     

       40
       40
       +
            , "%a, %_d %b %Y %T %Z"

     

       41
       41
       +
       diff -rN -u old-mbox/mbox.cabal new-mbox/mbox.cabal

     

       42
       42
       +
       --- old-mbox/mbox.cabal	2022-11-22 19:14:52.332543098 +0100

     

       43
       43
       +
       +++ new-mbox/mbox.cabal	2022-11-22 19:14:52.332543098 +0100

     

       44
       44
       +
       @@ -13,7 +13,7 @@

     

       45
       45
       +
        Cabal-Version:       >= 1.6

     

       46
       46
       +
        

     

       47
       47
       +
        library

     

       48
       48
       +
       -  build-depends:     base >= 4, base < 6, safe, time < 1.9, time-locale-compat, text

     

       49
       49
       +
       +  build-depends:     base >= 4, base < 6, safe, time, time-locale-compat, text

     

       50
       50
       +
          exposed-modules:   Data.MBox, Data.MBox.String

     

       51
       51
       +
          ghc-options:       -Wall

     

       52
       52
       +