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.

Sign up for GitHub

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

Jump to bottom

Update to latest consensus release #392

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Update to latest consensus release #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

env:
# Modify this value to "invalidate" the cabal cache.
CABAL_CACHE_VERSION: "2023-11-17-2"
CABAL_CACHE_VERSION: "2023-11-30"

concurrency:
group: >
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2023-11-09T23:50:15Z
, cardano-haskell-packages 2023-11-17T12:59:10Z
, hackage.haskell.org 2023-11-20T23:52:53Z
, cardano-haskell-packages 2023-11-30T12:34:51Z

packages:
cardano-api
Expand Down
12 changes: 8 additions & 4 deletions cardano-api/cardano-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,14 @@ common maybe-Win32
if os(windows)
build-depends: Win32

common text
if impl(ghc == 8.10.7) && os(darwin) && arch(aarch64)
Copy link
Contributor

@michaelpj michaelpj Nov 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surely this is worth a comment here too? Also I'm surprised this is different to the bound you put in consensus?

build-depends: text >= 1.2.5.0
else
build-depends: text >= 2.0

library internal
import: project-config, maybe-unix, maybe-Win32
import: project-config, maybe-unix, maybe-Win32, text

visibility: public

Expand Down Expand Up @@ -177,7 +183,7 @@ library internal
, mtl
, network
, optparse-applicative-fork
, ouroboros-consensus ^>= 0.13
, ouroboros-consensus ^>= 0.14
, ouroboros-consensus-cardano ^>= 0.12
, ouroboros-consensus-diffusion ^>= 0.9
, ouroboros-consensus-protocol ^>= 0.6
Expand All @@ -197,7 +203,6 @@ library internal
, sop-core
, stm
, strict-sop-core
, text >= 2.0
, time
, transformers
, transformers-except ^>= 0.1.3
Expand Down Expand Up @@ -373,4 +378,3 @@ test-suite cardano-api-golden
, Test.Golden.Cardano.Api.Typed.Script
, Test.Golden.Cardano.Api.Value
, Test.Golden.ErrorsSpec

12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

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