From 8aaddd26db8fb215303dd3affb5c7c8fef2fa1e0 Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Thu, 30 Nov 2023 15:24:40 +0100 Subject: [PATCH] Update to latest consensus release --- .github/workflows/haskell.yml | 2 +- cabal.project | 4 ++-- cardano-api/cardano-api.cabal | 12 ++++++++---- flake.lock | 12 ++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ce2cf95e3a..a1b2b83ae5 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -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: > diff --git a/cabal.project b/cabal.project index 15376c3871..a6be891d9d 100644 --- a/cabal.project +++ b/cabal.project @@ -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 diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index bd4cdecb34..e3125e0a69 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -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) + 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 @@ -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 @@ -197,7 +203,6 @@ library internal , sop-core , stm , strict-sop-core - , text >= 2.0 , time , transformers , transformers-except ^>= 0.1.3 @@ -373,4 +378,3 @@ test-suite cardano-api-golden , Test.Golden.Cardano.Api.Typed.Script , Test.Golden.Cardano.Api.Value , Test.Golden.ErrorsSpec - diff --git a/flake.lock b/flake.lock index e53c996665..fbc98fba93 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1700059500, - "narHash": "sha256-iqxeABYUfFDIu9iw0h9VWIo5DQi5ud/jz8qprKl23ig=", + "lastModified": 1701353939, + "narHash": "sha256-wsljJKhdO0EhfYlXDZ6ZMNnXgNC7C2Wh+TYqSNkwBRo=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "eba9803193b8c2175b0e27799e2ec1a802798e35", + "rev": "c1a79fca672e85c9545694ff037594bafc869bcb", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1700007731, - "narHash": "sha256-tsgvIfkvKujhymW2EWAME1FHEmdiyvUbWS9r7Cdqnfw=", + "lastModified": 1701303758, + "narHash": "sha256-8XqVEQwmJBxRPFa7SizJuZxbG+NFEZKWdhtYPTQ7ZKM=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "f7760ad0bc4014d7fb0786326d14842e9ebd0641", + "rev": "8a0e3ae9295b7ef8431b9be208dd06aa2789be53", "type": "github" }, "original": {