Skip to content

Commit 83f87e3

Browse files
committed
depricate use of ghc8.10
1 parent 63eda8a commit 83f87e3

File tree

7 files changed

+20
-27
lines changed

7 files changed

+20
-27
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Add your description here, if it fixes a particular issue please provide a [link
88
- [ ] Commits have useful messages
99
- [ ] New tests are added if needed and existing tests are updated
1010
- [ ] Any changes are noted in the [changelog](https://github.com/IntersectMBO/cardano-db-sync/blob/master/db-sync/CHANGELOG.md)
11-
- [ ] Code is formatted with [`fourmolu`](https://github.com/fourmolu/fourmolu) on version 0.10.1.0 (which can be run with `scripts/fourmolize.sh`)
11+
- [ ] Code is formatted with [`fourmolu`](https://github.com/fourmolu/fourmolu) on version 0.16.2.0 (which can be run with `scripts/fourmolize.sh`)
1212
- [ ] Self-reviewed the diff
1313

1414
# Migrations

.github/workflows/check-fourmolu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
- name: Run fourmolu
1919
uses: haskell-actions/run-fourmolu@v9
2020
with:
21-
version: "0.10.1.0"
21+
version: "0.16.2.0"

.github/workflows/check-hlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up HLint
2222
uses: rwe/actions-hlint-setup@v1
2323
with:
24-
version: "3.2.7"
24+
version: "3.8"
2525

2626
- name: Run HLint
2727
uses: rwe/actions-hlint-run@v2

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
os: [ubuntu-latest]
2222
# TODO: Add ghc910 when input-output-hk/devx is fixed
23-
compiler-nix-name: [ghc810, ghc96, ghc98]
23+
compiler-nix-name: [ghc96, ghc98]
2424
include:
2525
# We want a single job, because macOS runners are scarce.
2626
- os: macos-latest

doc/building-running.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ If building locally, to find `cardano-db-sync` executable location use:
100100

101101
```
102102
find . -name cardano-db-sync -executable -type f
103-
./dist-newstyle/build/x86_64-linux/ghc-8.10.4/cardano-db-sync-12.0.0/build/cardano-db-sync/cardano-db-sync
103+
./dist-newstyle/build/x86_64-linux/ghc-9.6.5/cardano-db-sync-12.0.0/build/cardano-db-sync/cardano-db-sync
104104
```
105105

106106
On macOS `brew install postgresl [email protected]` and extend PKG_CONFIG_PATH with

doc/installing.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ This guide assumes you have the following tools:
1111

1212
In addition, Cardano DB Sync requires the following software (instructions below):
1313

14-
* [GHC](https://www.haskell.org/ghcup/install/) >= 8.10.7
15-
* [Cabal](https://www.haskell.org/ghcup/install/) >= 3.10.1.0
14+
* [GHC](https://www.haskell.org/ghcup/install/) >= 9.6.5
15+
* [Cabal](https://www.haskell.org/ghcup/install/) >= 3.12.1.0
1616
* [libsodium-vrf](https://github.com/IntersectMBO/libsodium)
1717
* [secp256k1](https://github.com/bitcoin-core/secp256k1)
1818
* [blst](https://github.com/supranational/blst)
@@ -41,10 +41,10 @@ dependencies.
4141
Once GHCup is installed, open a new terminal (to get an updated environment) and run:
4242

4343
```bash
44-
ghcup install ghc 8.10.7
45-
ghcup install cabal 3.10.1.0
46-
ghcup set ghc 8.10.7
47-
ghcup set cabal 3.10.1.0
44+
ghcup install ghc 9.6.5
45+
ghcup install cabal 3.12.1.0
46+
ghcup set ghc 9.6.5
47+
ghcup set cabal 3.12.1.0
4848
```
4949

5050
Check that you will use the GHCup tools (and not any other installation on the system):
@@ -235,7 +235,7 @@ Explicitly set the GHC version that we installed earlier. This avoids defaulting
235235
system version of GHC that might be different than the one you have installed.
236236

237237
```bash
238-
echo "with-compiler: ghc-8.10.7" >> cabal.project.local
238+
echo "with-compiler: ghc-9.8.5" >> cabal.project.local
239239
```
240240

241241
macOS installs OpenSSL in a different location than expected by default. If you have

flake.nix

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,15 @@
6767
})
6868

6969
(final: prev: {
70-
# HLint 3.2.x requires GHC >= 8.10 && < 9.0
71-
hlint = final.haskell-nix.tool "ghc8107" "hlint" {
72-
version = "3.2.7";
70+
hlint = final.haskell-nix.tool "ghc96" "hlint" {
71+
version = "3.8";
7372
};
7473

75-
# Fourmolu 0.10.x requires GHC >= 9.0 && < 9.6
7674
fourmolu = final.haskell-nix.tool "ghc928" "fourmolu" {
77-
version = "0.10.1.0";
75+
version = "0.16.2.0";
7876
};
79-
80-
# Weeder 2.2.0 requires GHC >= 8.10 && < 9.0
81-
weeder = final.haskell-nix.tool "ghc8107" "weeder" {
82-
version = "2.2.0";
77+
weeder = final.haskell-nix.tool "ghc96" "weeder" {
78+
version = "2.9.0";
8379
};
8480
})
8581

@@ -141,10 +137,7 @@
141137
project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, pkgs, ... }: rec {
142138
src = ./.;
143139
name = "cardano-db-sync";
144-
compiler-nix-name =
145-
if system == "x86_64-linux"
146-
then lib.mkDefault "ghc810"
147-
else lib.mkDefault "ghc96";
140+
compiler-nix-name = lib.mkDefault "ghc96";
148141
flake.variants =
149142
let
150143
compilers =
@@ -169,7 +162,7 @@
169162
cabal = "latest";
170163
haskell-language-server = {
171164
src =
172-
if config.compiler-nix-name == "ghc8107" then
165+
if config.compiler-nix-name == "ghc96" then
173166
nixpkgs.haskell-nix.sources."hls-1.10"
174167
else
175168
nixpkgs.haskell-nix.sources."hls-2.9";
@@ -181,7 +174,7 @@
181174
shell.buildInputs = with nixpkgs.pkgsBuildBuild; [
182175
gitAndTools.git
183176
hlint
184-
] ++ lib.optionals (config.compiler-nix-name == "ghc8107") [
177+
] ++ lib.optionals (config.compiler-nix-name == "ghc96") [
185178
# Weeder requires the GHC version to match HIE files
186179
weeder
187180
] ++ lib.optionals (system != "aarch64-darwin") [

0 commit comments

Comments
 (0)