diff --git a/hledger-lib/Hledger/Data/Dates.hs b/hledger-lib/Hledger/Data/Dates.hs index d63ec678f..f4af2e1ab 100644 --- a/hledger-lib/Hledger/Data/Dates.hs +++ b/hledger-lib/Hledger/Data/Dates.hs @@ -673,8 +673,8 @@ advancetonthweekday n wd s = -- -- | Parse a couple of date-time string formats to a time type. -- parsedatetimeM :: String -> Maybe LocalTime -- parsedatetimeM s = asum [ --- parseTime defaultTimeLocale "%Y/%m/%d %H:%M:%S" s, --- parseTime defaultTimeLocale "%Y-%m-%d %H:%M:%S" s +-- parseTimeM TruedefaultTimeLocale "%Y/%m/%d %H:%M:%S" s, +-- parseTimeM TruedefaultTimeLocale "%Y-%m-%d %H:%M:%S" s -- ] -- | Try to parse a couple of date string formats: diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs index 37a51f998..303167c99 100644 --- a/hledger-lib/Hledger/Read/CsvReader.hs +++ b/hledger-lib/Hledger/Read/CsvReader.hs @@ -1263,10 +1263,10 @@ parseDateWithCustomOrDefaultFormats mformat s = asum $ map parsewith formats ,"%Y-%-m-%-d" ,"%Y.%-m.%-d" -- ,"%-m/%-d/%Y" - -- ,parseTime defaultTimeLocale "%Y/%m/%e" (take 5 s ++ "0" ++ drop 5 s) - -- ,parseTime defaultTimeLocale "%Y-%m-%e" (take 5 s ++ "0" ++ drop 5 s) - -- ,parseTime defaultTimeLocale "%m/%e/%Y" ('0':s) - -- ,parseTime defaultTimeLocale "%m-%e-%Y" ('0':s) + -- ,parseTimeM TruedefaultTimeLocale "%Y/%m/%e" (take 5 s ++ "0" ++ drop 5 s) + -- ,parseTimeM TruedefaultTimeLocale "%Y-%m-%e" (take 5 s ++ "0" ++ drop 5 s) + -- ,parseTimeM TruedefaultTimeLocale "%m/%e/%Y" ('0':s) + -- ,parseTimeM TruedefaultTimeLocale "%m-%e-%Y" ('0':s) ] (:[]) mformat diff --git a/hledger-web/Hledger/Web/Import.hs b/hledger-web/Hledger/Web/Import.hs index e7ec60ef6..abc86e647 100644 --- a/hledger-web/Hledger/Web/Import.hs +++ b/hledger-web/Hledger/Web/Import.hs @@ -4,7 +4,7 @@ module Hledger.Web.Import import Prelude as Import hiding (head, init, last, readFile, tail, writeFile) -import Yesod as Import hiding (Route (..)) +import Yesod as Import hiding (Route (..), parseTime) import Control.Monad as Import import Data.Bifunctor as Import @@ -15,7 +15,7 @@ import Data.Foldable as Import import Data.List as Import (unfoldr) import Data.Maybe as Import import Data.Text as Import (Text) -import Data.Time as Import hiding (parseTime) +import Data.Time as Import import Data.Traversable as Import import Data.Void as Import (Void) import Text.Blaze as Import (Markup) diff --git a/stack.yaml b/stack.yaml index 94d1b298a..844fc4896 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,22 +6,13 @@ packages: - hledger-lib - hledger - hledger-ui -# - hledger-web +- hledger-web -# for hledger-web -#allow-newer: true -extra-deps: +# extra-deps: # for hledger-lib: # for hledger: # for hledger-ui: # for hledger-web: -# - yesod-1.6.2@sha256:4359fcb48a1e8a5cf862338de0fad56d9a50f038c8774137257bcb5276545ec0,2028 -# - yesod-static-1.6.1.0@sha256:0f075bcb8c90626ef738367333e3ac745fd7872619c6db388c0555f2ce768a5a,4419 -# - yesod-test-1.6.12@sha256:3a44e58051da38ba3cc2f29a3f2579a4a1c68c3077b5c5d2ad2f4f792d737184,2924 -# - yesod-core-1.6.21.0@sha256:d95ce6c0ff787a617fd0e1a6d4fc09ea57745ffca1e3795b01248ffcf596f83f,8124 -# - yesod-form-1.7.0@sha256:fd857fb9ea4f5af8500ec8613aa026e3a478c874b93da9d8ab8f17f329ec8c9e,3387 -# - yesod-persistent-1.6.0.7@sha256:7ece60b1a1e0c9f56ec2f1cf67dd9d0c3962ccabc878b975bef7f743709d267d,1732 -# - base64-0.4.2.3@sha256:97bd6f7decaab6110725ef1675a3ed8576233f6bab6599bb813f6caf68d36c94,2876 # doesn't build with 9.2 yet # for Shake.hs: nix: