Skip to content

Commit 87a3b73

Browse files
committed
Go back to building with GHC 9.6
1 parent a6af317 commit 87a3b73

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

.github/scripts/install-libsecp256k1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -eux -o pipefail
33

44
## The following script builds and installs libsecp256k1 to ~/.local/lib
55

6-
INSTALL_VERSION=0.6.0
6+
INSTALL_VERSION=0.5.1
77

88
if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
99
echo "This script is only meant to run on Windows under MSYS2"

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ jobs:
109109
openssl:p
110110
z3:p
111111
go:p
112-
- uses: haskell-actions/[email protected].0
112+
- uses: haskell-actions/[email protected].7
113113
id: setup
114114
with:
115-
ghc-version: '9.8.2'
115+
ghc-version: '9.6.5'
116116

117117
- name: Extract GHC & Cabal paths
118118
run: |

flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+7-10
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,14 @@
4747
}));
4848

4949
hspkgs = ps :
50-
ps.haskell.packages.ghc98.override {
50+
ps.haskellPackages.override {
5151
overrides = hfinal: hprev: {
52-
with-utf8 = ps.haskell.lib.compose.overrideCabal (drv: {
53-
version = "1.1.0.0";
54-
src = pkgs.fetchFromGitHub {
55-
owner = "serokell";
56-
repo = "haskell-with-utf8";
57-
rev = "cf6e31475da3d9f54439650a70170819daa35f54";
58-
sha256 = "sha256-hxUiZbbcA6RvrVgGk4Vbt/rZT6wnBF3bfYbbQflzQ24=";
59-
};
60-
}) hprev.with-utf8;
52+
with-utf8 =
53+
if (with ps.stdenv; hostPlatform.isDarwin && hostPlatform.isx86)
54+
then ps.haskell.lib.compose.overrideCabal (_ : { extraLibraries = [ps.libiconv]; }) hprev.with-utf8
55+
else hprev.with-utf8;
56+
# TODO: temporary fix for static build which is still on 9.4
57+
witch = ps.haskell.lib.doJailbreak hprev.witch;
6158
};
6259
};
6360
hlib = pkgs.haskell.lib;

hevm.cabal

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ common shared
8383
OverloadedStrings
8484
OverloadedLabels
8585
RecordWildCards
86-
TypeAbstractions
8786
TypeFamilies
8887
ViewPatterns
8988
DataKinds

0 commit comments

Comments
 (0)