From 36ba2235b1763291a91122664e3a94a4a7f8f3ad Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sun, 3 Nov 2024 13:14:52 +0000 Subject: [PATCH 1/2] chore(hackage): bump `index-state`, more strict PvP Setting `allow-newer: all` is finally catching up to us, so we go back to a more strict policy, and override only what's necessary (mainly due to a few packages not explicitly supporting GHC 9.10 yet). Also, we bump servant & friends to the latest version. Signed-off-by: Drew Hess --- cabal.project | 4 ++-- flake.nix | 3 ++- primer-service/primer-service.cabal | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index ddd2e0a40..ef8e25d7e 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -index-state: 2024-07-13T00:00:00Z +index-state: 2024-11-02T00:00:00Z jobs: $ncpus @@ -30,7 +30,7 @@ haddock-quickjump: True haddock-hyperlink-source: True haddock-internal: True -allow-newer: all +allow-newer: servant-openapi3:base, openapi3:*, selda:*, hedgehog:pretty-show, hedgehog-classes:pretty-show package * ghc-options: -fwrite-ide-info diff --git a/flake.nix b/flake.nix index 8a7640315..eee9cae47 100644 --- a/flake.nix +++ b/flake.nix @@ -442,12 +442,13 @@ "fail" ]; - # These packages don't generate HIE files. See: + # These packages don't/can't generate HIE files. See: # https://github.com/input-output-hk/haskell.nix/issues/1242 packages.mtl-compat.writeHieFiles = false; packages.bytestring-builder.writeHieFiles = false; packages.fail.writeHieFiles = false; packages.diagrams.writeHieFiles = false; + packages.happy-lib.writeHieFiles = false; } { #TODO This shouldn't be necessary - see the commented-out `build-tool-depends` in primer.cabal. diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal index 2efe2bac4..510d566ca 100644 --- a/primer-service/primer-service.cabal +++ b/primer-service/primer-service.cabal @@ -57,11 +57,11 @@ library , primer-api ^>=0.7.2 , refined ^>=0.8 , semirings >=0.6 && <0.8 - , servant >=0.18 && <0.20.2 - , servant-client >=0.18 && <0.20.2 - , servant-client-core >=0.18 && <0.20.2 + , servant >=0.18 && <0.20.3 + , servant-client >=0.18 && <0.20.3 + , servant-client-core >=0.18 && <0.20.3 , servant-openapi3 ^>=2.0.1.2 - , servant-server >=0.18 && <0.20.2 + , servant-server >=0.18 && <0.20.3 , stm ^>=2.5 , stm-containers >=1.1 && <1.3.0 , streaming-commons ^>=0.2.2.4 From 3a91732cd13ab7ce61944d2490b6a29bd2652fd1 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sun, 3 Nov 2024 13:55:31 +0000 Subject: [PATCH 2/2] chore: upgrade `splitmix` Wasm fork to latest Signed-off-by: Drew Hess --- cabal.project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index ef8e25d7e..f062b9c92 100644 --- a/cabal.project +++ b/cabal.project @@ -101,5 +101,5 @@ if arch(wasm32) source-repository-package type: git location: https://github.com/amesgen/splitmix - tag: 83b906c4bcdc2720546f1779a16eb65e8e12ecba - --sha256: sha256-sR+Ne56SBzVbPfC7AJeQZn20YDfFwBDpRI873cTm1nU= + tag: 5f5b766d97dc735ac228215d240a3bb90bc2ff75 + --sha256: sha256-OCrEnjmESxtFHoeb4TCrQN//Oyx/7dKwiRr6P1/AqSk=