chore: bump Nix dependencies & bump to GHC 9.6.2

Signed-off-by: Drew Hess <[email protected]>
hackworthltd · Aug 16, 2023 · 89cc98e · 89cc98e
1 parent 93ece25
commit 89cc98e
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 52 deletions.
diff --git a/cabal.project b/cabal.project
@@ -22,6 +22,9 @@ package primer-api
 package primer-service
   test-options: "--size-cutoff=32768"
 
+-- Temporary during GHC 9.6 transition.
+allow-newer: *:*
+
 -- We need a newer version of Selda than what's been released to Hackage.
 source-repository-package
   type: git

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -40,11 +40,11 @@
         in
         builtins.trace "Nix Primer version is ${v}" "git-${v}";
 
-      ghcVersion = "ghc945";
+      ghcVersion = "ghc962";
 
       # We must keep the weeder version in sync with the version of
       # GHC we're using.
-      weederVersion = "2.5.0";
+      weederVersion = "2.6.0";
 
       # Fourmolu updates often alter formatting arbitrarily, and we want to
       # have more control over this.

diff --git a/primer-api/primer-api.cabal b/primer-api/primer-api.cabal
@@ -33,7 +33,7 @@ library
     -Wmissing-deriving-strategies -fhide-source-paths
 
   build-depends:
-    , base            >=4.12    && <4.18
+    , base            >=4.12    && <4.19
     , containers      >=0.6.0.1 && <0.7.0
     , deriving-aeson  >=0.2     && <0.3.0
     , extra           >=1.7.10  && <1.8.0

diff --git a/primer-benchmark/primer-benchmark.cabal b/primer-benchmark/primer-benchmark.cabal
@@ -41,7 +41,7 @@ library
   exposed-modules: Benchmarks
   build-depends:
     , aeson                            >=2.0      && <2.2
-    , base                             >=4.12     && <4.18
+    , base                             >=4.12     && <4.19
     , containers                       >=0.6.0.1  && <0.7.0
     , criterion                        ^>=1.6.0.0
     , deepseq                          ^>=1.4.6.1

diff --git a/primer-selda/primer-selda.cabal b/primer-selda/primer-selda.cabal
@@ -33,7 +33,7 @@ library
 
   build-depends:
     , aeson           >=2.0      && <2.2
-    , base            >=4.12     && <4.18
+    , base            >=4.12     && <4.19
     , bytestring      >=0.10.8.2 && <0.12.0
     , containers      >=0.6.0.1  && <0.7.0
     , logging-effect  ^>=1.4

diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal
@@ -40,7 +40,7 @@ library
 
   build-depends:
     , aeson                      >=2.0      && <2.2
-    , base                       >=4.12     && <4.18
+    , base                       >=4.12     && <4.19
     , containers                 >=0.6.0.1  && <0.7
     , deriving-aeson             >=0.2      && <0.3.0
     , exceptions                 >=0.10.4   && <0.11.0

diff --git a/primer/primer.cabal b/primer/primer.cabal
@@ -106,7 +106,7 @@ library
   build-depends:
     , aeson                        >=2.0     && <2.2
     , assoc                        ^>=1.1
-    , base                         >=4.12    && <4.18
+    , base                         >=4.12    && <4.19
     , containers                   >=0.6.0.1 && <0.7.0
     , deriving-aeson               >=0.2     && <0.3.0
     , exceptions                   >=0.10.4  && <0.11.0