From 478f9f5e939ea0d4b63a4be7663ee8d634b64ab4 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Mon, 17 Jun 2024 15:33:19 +0200 Subject: [PATCH] Bump CHaP and Cardano API dependency version --- cabal.project | 11 +++---- cardano-cli/cardano-cli.cabal | 12 ++++---- flake.lock | 56 +++++++++++++++++------------------ 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/cabal.project b/cabal.project index 47ebdfe3a0..78b74e449e 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 2024-06-12T10:10:17Z - , cardano-haskell-packages 2024-06-12T10:10:17Z + , hackage.haskell.org 2024-06-17T19:25:27Z + , cardano-haskell-packages 2024-06-19T14:54:52Z packages: cardano-cli @@ -31,9 +31,10 @@ package bitvec -- Workaround for windows cross-compilation flags: -simd -constraints: - -- io-classes-mtl-0.1.2.0 is not buildable - io-classes-mtl < 0.1.2.0 +extra-packages: Cabal +if os(windows) + constraints: time ^>=1.14 + allow-newer: *:time tests: True diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 8d38cbe257..2078192197 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -205,7 +205,7 @@ library , binary , bytestring , canonical-json - , cardano-api ^>= 8.47.0.0 + , cardano-api ^>= 8.48 , cardano-binary , cardano-crypto , cardano-crypto-class ^>= 2.1.2 @@ -234,12 +234,12 @@ library , microlens , network , optparse-applicative-fork - , ouroboros-consensus >= 0.17 + , ouroboros-consensus ^>= 0.19 -- TODO: bump consensus back - , ouroboros-consensus-cardano >= 0.15 - , ouroboros-consensus-protocol >= 0.9 - , ouroboros-network-api - , ouroboros-network-protocols ^>=0.8 + , ouroboros-consensus-cardano ^>= 0.17 + , ouroboros-consensus-protocol ^>= 0.9.0.1 + , ouroboros-network-api ^>= 0.7.3 + , ouroboros-network-protocols , parsec , prettyprinter , prettyprinter-ansi-terminal diff --git a/flake.lock b/flake.lock index cc38db0d29..4f5202a1dc 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1718200515, - "narHash": "sha256-LhZDhH/Ii4X7r+bo7LGC+Q//OiUJ8uRwCJ5ULNpbj00=", + "lastModified": 1718810759, + "narHash": "sha256-P2o+f2CO8HPsuOmF7QBUkoWOXdi63sxZRscB9NNupdI=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "b731179078dc9960d68c3d0297d1c26f69e33614", + "rev": "cc41e678ea839c250a21242686f07693e19320b8", "type": "github" }, "original": { @@ -36,17 +36,17 @@ "blst": { "flake": false, "locked": { - "lastModified": 1691598027, - "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", + "lastModified": 1656163412, + "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", "owner": "supranational", "repo": "blst", - "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", + "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" }, "original": { "owner": "supranational", - "ref": "v0.3.11", "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" } }, @@ -210,11 +210,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1716770092, - "narHash": "sha256-N4YGGedV+OfpVPQNqjBfZYfCjBjbWfZ5pdHcapVOScg=", + "lastModified": 1718671049, + "narHash": "sha256-ekvF/Dm545abRWUSMDKxPO/ylkF1JYZcab14XE3ndYc=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "179e52b7d49e43ffc2f1826a01e0c1b750db6073", + "rev": "d975d89cda8e6018df5eadde34b42e0a52bd0f95", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1716771027, - "narHash": "sha256-rWtqMkpEDcF1901KEm/Y+hL+y1SidBJA/KdnAePae5c=", + "lastModified": 1718701646, + "narHash": "sha256-068rEjRFuasfvuapoPrzrfm+b6kHGeOmFyrEwg92eBU=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "200be01f6c0390da8044fbd2998dc7b1e49121a3", + "rev": "c019b636f237668d8bbd52c5729732bc0e4f887c", "type": "github" }, "original": { @@ -473,11 +473,11 @@ "nixlib": "nixlib" }, "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "lastModified": 1693483555, + "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", "owner": "divnix", "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", "type": "github" }, "original": { @@ -494,11 +494,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1708437078, - "narHash": "sha256-EUsAEG0LmnMmX7Z6JW2LX8/VhpAJ2dXVwVGXWn5LmxQ=", + "lastModified": 1702362799, + "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "5ab7134bb21d7bd858dbe1c702761aa7e15eaf88", + "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", "type": "github" }, "original": { @@ -510,11 +510,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1710581758, - "narHash": "sha256-UNUXGiKLGUv1TuQumV70rfjCJERP4w8KZEDxsMG0RHc=", + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "50ea210590ab0519149bfd163d5ba199be925fb6", + "rev": "2ed34002247213fc435d0062350b91bab920626e", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -819,11 +819,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1716769250, - "narHash": "sha256-oTWTrrliw5GMe1qh27WWY7ToN3nfmPieZUYgSyR2uaM=", + "lastModified": 1718670223, + "narHash": "sha256-/OQ1pAA8prPpajKkS3G+FU9CwSBM9Gk8SsrCotnSu/o=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "d250d0a37d4c8ce39052eeb0174bcea64bc7be33", + "rev": "eec12e078945857d1ee4fc622fe032148ab9edff", "type": "github" }, "original": {