Merge branch 'fixtime110' of https://github.com/TeofilC/mono-traversable

snoyberg · Dec 7, 2021 · 847ae87 · 847ae87
2 parents 86f1b7e + 515da72
commit 847ae87
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,6 +19,14 @@ jobs:
         #- "--resolver nightly"
         - lts-18.16 # Win32 issue
         - lts-16
+        stack-yaml:
+        - stack.yaml
+        - stack-new-time.yaml
+        exclude:
+        - resolver: lts-16
+          stack-yaml: stack-new-time.yaml
+        - os: windows-latest
+          stack-yaml: stack-new-time.yaml
 
     steps:
       - name: Clone project
@@ -31,4 +39,4 @@ jobs:
             mkdir -p ../_newstack
             stack upgrade --force-download --local-bin-path ../_newstack
             ../_newstack/stack --version
-            ../_newstack/stack test --fast --no-terminal --resolver=${{ matrix.resolver }}
+            ../_newstack/stack test --fast --no-terminal --stack-yaml=${{ matrix.stack-yaml }} --resolver=${{ matrix.resolver }}
diff --git a/classy-prelude/ChangeLog.md b/classy-prelude/ChangeLog.md
@@ -1,5 +1,8 @@
 # ChangeLog for classy-prelude
 
+## 1.5.0.2
+* Fix building with time >= 1.10 [#207](https://github.com/snoyberg/mono-traversable/pull/207).
+
 ## 1.5.0.1
 
 * Export a compatiblity shim for `parseTime` as it has been removed in `time-1.10`.

diff --git a/classy-prelude/package.yaml b/classy-prelude/package.yaml
@@ -1,5 +1,5 @@
 name:          classy-prelude
-version:       1.5.0.1
+version:       1.5.0.2
 synopsis:      A typeclass-based Prelude.
 description:   See docs and README at <http://www.stackage.org/package/classy-prelude>
 category:      Control, Prelude

diff --git a/classy-prelude/src/ClassyPrelude.hs b/classy-prelude/src/ClassyPrelude.hs
@@ -200,6 +200,7 @@ import Data.Time
     , getCurrentTime
     , defaultTimeLocale
     )
+import qualified Data.Time as Time
 
 import qualified Data.Set as Set
 import qualified Data.Map as Map
@@ -629,8 +630,8 @@ interact = liftIO . LTextIO.interact
 
 #if MIN_VERSION_time(1,10,0)
 parseTime 
-  :: ParseTime t
-  => TimeLocale -- ^ Time locale.
+  :: Time.ParseTime t
+  => Time.TimeLocale -- ^ Time locale.
   -> String -- ^ Format string.
   -> String -- ^ Input string.
   -> Maybe t -- ^ The time value, or 'Nothing' if the input could not be parsed using the given format.

diff --git a/stack-new-time.yaml b/stack-new-time.yaml
@@ -0,0 +1,18 @@
+resolver: lts-18.5
+skip-ghc-check: true
+packages:
+- minlen
+- mono-traversable
+- mono-traversable-instances
+- chunked-data
+- classy-prelude
+- classy-prelude-conduit
+- classy-prelude-yesod
+- mutable-containers
+
+extra-deps:
+  - time-1.10@sha256:536801b30aa2ce66da07cb19847827662650907efb2af4c8bef0a6276445075f,5738
+  - Cabal-3.4.1.0@sha256:664179b2b713dd0436d870640eb342c7758726b23bd6d85d2a6c573452d75e77,30533
+  - directory-1.3.7.0@sha256:4d59f9714700e69d139084b47204fc91f13f31546aac39d666279996192b0d11,2940
+  - process-1.6.13.2@sha256:a6530a5698796e29d85817f74ca3ae20d2172fb9fa52b492c2e6816e1306bfe8,2963
+  - unix-2.7.2.2@sha256:15f5365c5995634e45de1772b9504761504a310184e676bc2ef60a14536dbef9,3496
diff --git a/stack-new-time.yaml.lock b/stack-new-time.yaml.lock
@@ -0,0 +1,47 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    hackage: time-1.10@sha256:536801b30aa2ce66da07cb19847827662650907efb2af4c8bef0a6276445075f,5738
+    pantry-tree:
+      size: 6693
+      sha256: 1591d9d1034f19cd38fbda525969f805b5ca083b45da85602cf2b04c1a82f640
+  original:
+    hackage: time-1.10@sha256:536801b30aa2ce66da07cb19847827662650907efb2af4c8bef0a6276445075f,5738
+- completed:
+    hackage: Cabal-3.4.1.0@sha256:664179b2b713dd0436d870640eb342c7758726b23bd6d85d2a6c573452d75e77,30533
+    pantry-tree:
+      size: 45845
+      sha256: 3ff649b92452af2cd492e01e0e6bbed2008471f62038b758e48fafe1fd6a724d
+  original:
+    hackage: Cabal-3.4.1.0@sha256:664179b2b713dd0436d870640eb342c7758726b23bd6d85d2a6c573452d75e77,30533
+- completed:
+    hackage: directory-1.3.7.0@sha256:4d59f9714700e69d139084b47204fc91f13f31546aac39d666279996192b0d11,2940
+    pantry-tree:
+      size: 3433
+      sha256: 88b74942886e886b22ac1f3f0f65168563df4848766f372aaf014f712d3abb9a
+  original:
+    hackage: directory-1.3.7.0@sha256:4d59f9714700e69d139084b47204fc91f13f31546aac39d666279996192b0d11,2940
+- completed:
+    hackage: process-1.6.13.2@sha256:a6530a5698796e29d85817f74ca3ae20d2172fb9fa52b492c2e6816e1306bfe8,2963
+    pantry-tree:
+      size: 1543
+      sha256: 045d10d710f046aa69ab3dd3f425b9479820809d6c3ca1596e0b995bcf49ac7a
+  original:
+    hackage: process-1.6.13.2@sha256:a6530a5698796e29d85817f74ca3ae20d2172fb9fa52b492c2e6816e1306bfe8,2963
+- completed:
+    hackage: unix-2.7.2.2@sha256:15f5365c5995634e45de1772b9504761504a310184e676bc2ef60a14536dbef9,3496
+    pantry-tree:
+      size: 3536
+      sha256: 36434ced74d679622d61b69e8d92e1bd632d9ef3e284c63094653b2e473b0553
+  original:
+    hackage: unix-2.7.2.2@sha256:15f5365c5995634e45de1772b9504761504a310184e676bc2ef60a14536dbef9,3496
+snapshots:
+- completed:
+    size: 585817
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/5.yaml
+    sha256: 22d24d0dacad9c1450b9a174c28d203f9bb482a2a8da9710a2f2a9f4afee2887
+  original: lts-18.5