From 8372e801ef062223756db69818a7b60cfd9bb066 Mon Sep 17 00:00:00 2001 From: amesgen Date: Tue, 8 Aug 2023 23:36:45 +0200 Subject: [PATCH 1/3] Fix `RealFrac Seconds` instance --- System/Clock/Seconds.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/System/Clock/Seconds.hs b/System/Clock/Seconds.hs index a9a1c78..f7457cb 100644 --- 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 From 3978e119cfa27bec830c1ee759afb72cd9628bbf Mon Sep 17 00:00:00 2001 From: amesgen Date: Tue, 8 Aug 2023 23:37:31 +0200 Subject: [PATCH 2/3] CI: bump ghc-wasm-meta --- .github/workflows/other.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml index 87f7fcd..e5cf5ed 100644 --- 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 From f588bcb0e04063abdb67eb489d229e1a5fd2a497 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 9 Aug 2023 00:07:39 +0200 Subject: [PATCH 3/3] Fix Windows CI on 8.2 --- cabal.project | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index f2a69e2..c51c90e 100644 --- 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 \ No newline at end of file + tasty -clock + +-- otherwise, we get CI failures +if impl(ghc ==8.2.*) + package text + flags: -simdutf