upgrade to ghc 9.6

JolHarg · Apr 21, 2024 · 52d94b4 · 52d94b4
1 parent eecdd0a
commit 52d94b4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bots.cabal b/bots.cabal
@@ -16,7 +16,7 @@ library
   exposed-modules:    MyHandler
   build-depends:
     , aeson
-    , base        >=4.17.0.0
+    , base        >=4.18.0.0
     , bytestring
     , containers
     , ed25519
@@ -37,7 +37,7 @@ executable bots
   main-is:            Main.hs
   build-depends:
     , aeson
-    , base        >=4.17.0.0
+    , base        >=4.18.0.0
     , bots
     , bytestring
     , openfaas
@@ -61,7 +61,7 @@ test-suite openfaas-test
   hs-source-dirs:     test
   main-is:            Spec.hs
   build-depends:
-    , base        >=4.17.0.0
+    , base        >=4.18.0.0
     , bots
     , hspec
     , QuickCheck

diff --git a/cabal.cross.project b/cabal.cross.project
@@ -1,7 +1,7 @@
 source-repository-package
   type: git
   location: https://github.com/JolHarg/hs-openfaas.git
-  tag: 14dd767c6b3234991e438ff6505edf8e57fad10e
+  tag: b87f688f8fb3d8579c03979ab007db52947fd01e
 
 packages: *
 with-compiler: x86_64-unknown-linux-gnu-ghc
diff --git a/cabal.project b/cabal.project
@@ -1,6 +1,6 @@
 source-repository-package
   type: git
   location: https://github.com/JolHarg/hs-openfaas.git
-  tag: 14dd767c6b3234991e438ff6505edf8e57fad10e
+  tag: b87f688f8fb3d8579c03979ab007db52947fd01e
 
 packages: *
diff --git a/default.nix b/default.nix
@@ -4,7 +4,7 @@
     nixpkgs = nixpkgs;
     compiler = compiler;
   },
-  compiler ? "ghc94"
+  compiler ? "ghc96"
 }:
 let
   pkgsForX86 = if builtins.currentSystem == "x86_64-linux" then nixpkgs else nixpkgs.pkgsCross.gnu64.pkgsBuildHost;
@@ -18,7 +18,7 @@ let
       openfaas = self.callCabal2nix "openfaas" (nixpkgs.fetchFromGitHub {
         owner = "JolHarg";
         repo = "hs-openfaas";
-        rev = "14dd767c6b3234991e438ff6505edf8e57fad10e";
+        rev = "b87f688f8fb3d8579c03979ab007db52947fd01e";
         sha256 = "CByWMoFukvUeUu1bPF6Qzh5wP92t+7pUS4VoueOGtKE=";
       }) {};
       # Tests for aeson don't work because they should be run as host