Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/building-running.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]` and extend PKG_CONFIG_PATH with
Expand Down
14 changes: 7 additions & 7 deletions doc/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
})

({
Expand Down
Loading