Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it build with ghc-9.8 #192

Merged
merged 4 commits into from
Nov 16, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.2.8", "9.6.2"]
ghc: ["8.10.7", "9.2.8", "9.6.2", "9.8.1"]
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v1

- uses: haskell/actions/setup@v1
- uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: 3.10.1.0
cabal-version: latest

- name: Haskell versions
run: |
Expand All @@ -41,7 +41,7 @@ jobs:
cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt

- name: Set cache version
run: echo "CACHE_VERSION=9w76Z3Q" >> $GITHUB_ENV
run: echo "CACHE_VERSION=9w76Z3Qx" >> $GITHUB_ENV

- uses: actions/cache@v2
name: Cache cabal store
Expand Down
10 changes: 1 addition & 9 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
-- See CONTRIBUTING for Nix commands you need to run if you change it:
index-state: 2023-05-18T20:27:48Z
index-state: 2023-11-15T16:30:04Z

packages:
cardano-prelude
cardano-prelude-test

if impl(ghc >= 9.6)
allow-newer:
, *:base
, *:ghc-prim
, protolude:binary
, protolude:bytestring
, protolude:text

test-show-details: direct

6 changes: 3 additions & 3 deletions cardano-prelude/cardano-prelude.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.2

name: cardano-prelude
version: 0.1.0.3
version: 0.1.0.4
synopsis: A Prelude replacement for the Cardano project
description: A Prelude replacement for the Cardano project
author: IOHK
Expand Down Expand Up @@ -40,8 +40,8 @@ library
Cardano.Prelude.Orphans
Cardano.Prelude.Strict

build-depends: base >= 4.14 && < 4.19
, aeson
build-depends: base >= 4.14 && < 5
, aeson >= 2.0
, base16-bytestring >= 1
, bytestring
, canonical-json >= 0.6.0.1
Expand Down
150 changes: 113 additions & 37 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading