Skip to content

Commit

Permalink
Merge pull request #670 from IntersectMBO/mgalazyn/chore/update-o-c-c
Browse files Browse the repository at this point in the history
Update ouroboros-consensus-cardano-0.14.2
  • Loading branch information
carbolymer authored Mar 21, 2024
2 parents 8def78a + 8c3ea4b commit b0c830a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
7 changes: 1 addition & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repository cardano-haskell-packages
-- you need to run if you change them
index-state:
, hackage.haskell.org 2024-03-15T22:05:53Z
, cardano-haskell-packages 2024-03-20T14:04:39Z
, cardano-haskell-packages 2024-03-21T15:31:54Z

packages:
cardano-cli
Expand All @@ -40,11 +40,6 @@ test-show-details: direct
-- Always write GHC env files, because they are needed for ghci.
write-ghc-environment-files: always

-- FIXME: remove this when bumping ouroboros-consensus
-- this is required to build with ouroboros-consensus-cardano-0.14.0.1
allow-newer:
cardano-git-rev

-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ library
, network
, optparse-applicative-fork
, ouroboros-consensus >= 0.16
, ouroboros-consensus-cardano >= 0.14
, ouroboros-consensus-cardano >= 0.14.2
, ouroboros-consensus-protocol >= 0.7
, ouroboros-network-api
, ouroboros-network-protocols
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

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

0 comments on commit b0c830a

Please sign in to comment.