Merge pull request #89 from amesgen/fix-tests

Fix `RealFrac Seconds` instance
corsis · Aug 9, 2023 · 1b41f50 · 1b41f50
2 parents dd4fcc6 + f588bcb
commit 1b41f50
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
@@ -6,7 +6,7 @@ jobs:
   wasi:
     runs-on: ubuntu-latest
     env:
-      GHC_WASM_META_REV: 5a5c10c3b7e2f9f55bb2f40601cb20c9eb599bb5
+      GHC_WASM_META_REV: 895f7067e1d4c918a45559da9d2d6a403a690703
       FLAVOUR: '9.6'
     steps:
     - name: Setup WASI GHC

diff --git a/System/Clock/Seconds.hs b/System/Clock/Seconds.hs
@@ -50,7 +50,7 @@ instance Fractional Seconds where
 
 instance RealFrac Seconds where
   properFraction (Seconds (TimeSpec s ns))
-    | s >= 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns)
+    | s >= 0 || ns == 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns)
     | otherwise = (fromIntegral (s+1), Seconds $ TimeSpec (-1) ns)
 
 -- | The 'getTime' function shall return the current value for the

diff --git a/cabal.project b/cabal.project
@@ -3,4 +3,9 @@ packages: .
 -- Andreas Abel, 2022-02-07, issue #72: Fix cyclic dependencies.
 -- The default would be tasty +clock, but this creates a dependency cycle.
 constraints:
-  tasty -clock
+  tasty -clock
+
+-- otherwise, we get CI failures
+if impl(ghc ==8.2.*)
+  package text
+    flags: -simdutf