Skip to content

Commit

Permalink
Update CHaP, remove constraints from cabal file
Browse files Browse the repository at this point in the history
I revised a bunch of stuff in CHaP, the constraints are no longer
needed.
  • Loading branch information
michaelpj committed Mar 22, 2023
1 parent a0c0ea8 commit 7a709cf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 24 deletions.
21 changes: 1 addition & 20 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ index-state: 2023-02-22T00:00:00Z
index-state:
, hackage.haskell.org 2023-02-22T00:00:00Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2023-02-22T19:09:40Z
, cardano-haskell-packages 2023-03-22T19:09:40Z

packages:
eras/allegra/impl
Expand Down Expand Up @@ -84,25 +84,6 @@ benchmarks: true
-- The only sensible test display option
test-show-details: streaming

allow-newer:
monoidal-containers:aeson,
size-based:template-haskell,
Unique:hashable,

constraints:
-- bizarre issue: in earlier versions they define their own 'GEq', in newer
-- ones they reuse the one from 'some', but there isn't e.g. a proper version
-- constraint from dependent-sum-template (which is the library we actually use).
, dependent-sum > 0.6.2.0

, protolude >= 0.3.2

, persistent < 2.14

-- cardano-crypto-class: has instance derivation problems with newer 'vector'
-- added to the cabal file on master but needed here still
, vector < 0.13

-- This is an unreleased version of `weigh` that includes `WallTime`.
-- It's okay for us to have this since it's only our benchmarks
-- that depend on `weigh`, not our released packages.
Expand Down
2 changes: 1 addition & 1 deletion libs/ledger-state/ledger-state.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ library
foldl,
vector,
microlens,
persistent,
persistent <2.14,
persistent-sqlite,
prettyprinter,
set-algebra,
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": "https://input-output-hk.github.io/cardano-haskell-packages/",
"owner": "input-output-hk",
"repo": "cardano-haskell-packages",
"rev": "ef967f7b080ffb86ad6f452e89a57d27d0ad8987",
"sha256": "098gyrniw5nvgfhw6a9616y40s7yk9w6vqapkfspgrf3y6m2r0lf",
"rev": "07bb6c7f3d5f6245fbc7b222ea082487736bdb67",
"sha256": "1mnms5r7bwjz2raw5v7mnl8svzl7jz6lqv64d1a9ccql3dhyp4wy",
"type": "tarball",
"url": "https://github.com/input-output-hk/cardano-haskell-packages/archive/ef967f7b080ffb86ad6f452e89a57d27d0ad8987.tar.gz",
"url": "https://github.com/input-output-hk/cardano-haskell-packages/archive/07bb6c7f3d5f6245fbc7b222ea082487736bdb67.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"hackage.nix": {
Expand Down

0 comments on commit 7a709cf

Please sign in to comment.