Skip to content

Commit

Permalink
upgrade to ghc 9.8 and latest openfaas
Browse files Browse the repository at this point in the history
  • Loading branch information
danwdart committed Jun 28, 2024
1 parent 38994ce commit 5804814
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions bots.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ library
exposed-modules: MyHandler
build-depends:
, aeson
, base >=4.18.0.0
, base >=4.19.1.0
, bytestring
, containers
, ed25519
Expand All @@ -37,7 +37,7 @@ executable bots
main-is: Main.hs
build-depends:
, aeson
, base >=4.18.0.0
, base >=4.19.1.0
, bots
, bytestring
, openfaas
Expand All @@ -61,7 +61,7 @@ test-suite openfaas-test
hs-source-dirs: test
main-is: Spec.hs
build-depends:
, base >=4.18.0.0
, base >=4.19.1.0
, bots
, hspec
, QuickCheck
Expand Down
2 changes: 1 addition & 1 deletion cabal.cross.project
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source-repository-package
type: git
location: https://github.com/JolHarg/hs-openfaas.git
tag: b87f688f8fb3d8579c03979ab007db52947fd01e
tag: 692d4732ad71a26f250f33151ef143276c519b99

packages: *
with-compiler: x86_64-unknown-linux-gnu-ghc
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source-repository-package
type: git
location: https://github.com/JolHarg/hs-openfaas.git
tag: b87f688f8fb3d8579c03979ab007db52947fd01e
tag: 692d4732ad71a26f250f33151ef143276c519b99

packages: *
6 changes: 3 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
nixpkgs = nixpkgs;
compiler = compiler;
},
compiler ? "ghc96"
compiler ? "ghc98"
}:
let
pkgsForX86 = if builtins.currentSystem == "x86_64-linux" then nixpkgs else nixpkgs.pkgsCross.gnu64.pkgsBuildHost;
Expand All @@ -18,8 +18,8 @@ let
openfaas = self.callCabal2nix "openfaas" (nixpkgs.fetchFromGitHub {
owner = "JolHarg";
repo = "hs-openfaas";
rev = "b87f688f8fb3d8579c03979ab007db52947fd01e";
sha256 = "T7+/uNRnbHm1uKrHUrl1IqDwIr+8a/2WjC0/brkVQPo=";
rev = "692d4732ad71a26f250f33151ef143276c519b99";
sha256 = "OK1cFV0KfCC2+cp1iB5jsRixbsK+HsZorgi3wLtjPdw=";
}) {};
# Tests for aeson don't work because they should be run as host
# "Couldn't find a target code interpreter. Try with -fexternal-interpreter"
Expand Down

0 comments on commit 5804814

Please sign in to comment.