From b79d544f1442c03213c24167fb95007fc5a2bb90 Mon Sep 17 00:00:00 2001 From: Cmdv Date: Mon, 10 Nov 2025 14:26:46 +0000 Subject: [PATCH] remove-ghc810 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/haskell.yml | 2 +- doc/building-running.md | 2 +- doc/installing.md | 14 +++++++------- flake.nix | 3 --- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 540cb1ed6..a89835818 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,7 +8,7 @@ Add your description here, if it fixes a particular issue please provide a [link - [ ] Commits have useful messages - [ ] New tests are added if needed and existing tests are updated - [ ] Any changes are noted in the [changelog](https://github.com/IntersectMBO/cardano-db-sync/blob/master/db-sync/CHANGELOG.md) -- [ ] Code is formatted with [`fourmolu`](https://github.com/fourmolu/fourmolu) on version 0.10.1.0 (which can be run with `scripts/fourmolize.sh`) +- [ ] Code is formatted with [`fourmolu`](https://github.com/fourmolu/fourmolu) on version 0.17.0.0 (which can be run with `scripts/fourmolize.sh`) - [ ] Self-reviewed the diff # Migrations diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 6aca50a07..62236ad19 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-latest] # TODO: Add ghc910 when input-output-hk/devx is fixed - compiler-nix-name: [ghc810, ghc96, ghc98, ghc912] + compiler-nix-name: [ghc96, ghc98, ghc912] include: # We want a single job, because macOS runners are scarce. - os: macos-latest diff --git a/doc/building-running.md b/doc/building-running.md index 417f12fcc..5574e058a 100644 --- a/doc/building-running.md +++ b/doc/building-running.md @@ -100,7 +100,7 @@ If building locally, to find `cardano-db-sync` executable location use: ``` find . -name cardano-db-sync -executable -type f -./dist-newstyle/build/x86_64-linux/ghc-8.10.4/cardano-db-sync-12.0.0/build/cardano-db-sync/cardano-db-sync +./dist-newstyle/build/x86_64-linux/ghc-9.6.7/cardano-db-sync-12.0.0/build/cardano-db-sync/cardano-db-sync ``` On macOS `brew install postgresl openssl@1.1` and extend PKG_CONFIG_PATH with diff --git a/doc/installing.md b/doc/installing.md index a4b9274af..13b7f2d1b 100644 --- a/doc/installing.md +++ b/doc/installing.md @@ -12,8 +12,8 @@ This guide assumes you have the following tools: In addition, Cardano DB Sync requires the following software (instructions below): - * [GHC](https://www.haskell.org/ghcup/install/) >= 8.10.7 - * [Cabal](https://www.haskell.org/ghcup/install/) >= 3.10.1.0 + * [GHC](https://www.haskell.org/ghcup/install/) >= 9.6.7 + * [Cabal](https://www.haskell.org/ghcup/install/) >= 3.12.1.0 * [libsodium-vrf](https://github.com/IntersectMBO/libsodium) * [secp256k1](https://github.com/bitcoin-core/secp256k1) * [blst](https://github.com/supranational/blst) @@ -42,10 +42,10 @@ dependencies. Once GHCup is installed, open a new terminal (to get an updated environment) and run: ```bash -ghcup install ghc 8.10.7 -ghcup install cabal 3.10.1.0 -ghcup set ghc 8.10.7 -ghcup set cabal 3.10.1.0 +ghcup install ghc 9.6.7 +ghcup install cabal 3.12.1.0 +ghcup set ghc 9.6.7 +ghcup set cabal 3.12.1.0 ``` Check that you will use the GHCup tools (and not any other installation on the system): @@ -236,7 +236,7 @@ Explicitly set the GHC version that we installed earlier. This avoids defaulting system version of GHC that might be different than the one you have installed. ```bash -echo "with-compiler: ghc-8.10.7" >> cabal.project.local +echo "with-compiler: ghc-9.6.7" >> cabal.project.local ``` macOS installs OpenSSL in a different location than expected by default. If you have diff --git a/flake.nix b/flake.nix index f944407e5..87f6b1e0c 100644 --- a/flake.nix +++ b/flake.nix @@ -212,9 +212,6 @@ packages.katip.doExactConfig = true; # Split data to reduce closure size packages.ekg.components.library.enableSeparateDataOutput = true; - # Haddock is failing for these two packages (at least with GHC 8.10.7) - packages.ouroboros-network.doHaddock = config.compiler-nix-name != "ghc8107"; - packages.cardano-node.doHaddock = config.compiler-nix-name != "ghc8107"; }) ({