Skip to content

Commit ab2de02

Browse files
authored
Merge pull request #1230 from IntersectMBO/erikd/updates
Minor updates
2 parents d2281aa + 26edd83 commit ab2de02

4 files changed

Lines changed: 54 additions & 111 deletions

File tree

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Changelog fragment template - copy this file and fill in the fields.
2+
# Or use 'herald new' for interactive creation.
3+
#
4+
# Files starting with _ are ignored by herald.
5+
#
6+
# Available projects and kinds are defined in .herald.yml
7+
8+
# Which project this change belongs to (see 'projects' in .herald.yml)
9+
# Uncomment exactly one:
10+
project: cardano-api
11+
# project: cardano-api-gen
12+
# project: cardano-rpc
13+
# project: cardano-wasm
14+
15+
# Pull request number associated with this change
16+
pr: 1230
17+
18+
# One or more change kinds (see 'kinds' in .herald.yml)
19+
kind:
20+
# - breaking # the API has changed in a breaking way
21+
# - feature # introduces a new feature
22+
# - compatible # the API has changed but is non-breaking
23+
# - bugfix # fixes a defect
24+
# - optimisation # measurable performance improvements
25+
# - documentation # change in code docs, haddocks
26+
# - refactoring # code quality improvements
27+
# - test # fixes or modifies tests
28+
- maintenance # not directly related to the code
29+
# - release # related to a new release preparation
30+
description: |
31+
Describe your change here.
32+
33+
Update index-states
34+
Reduce allow-newers

cabal.project

Lines changed: 12 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2026-04-17T09:20:55Z
17-
, cardano-haskell-packages 2026-05-25T13:25:40Z
16+
, hackage.haskell.org 2026-05-28T20:13:41Z
17+
, cardano-haskell-packages 2026-05-28T08:12:31Z
1818

1919
active-repositories:
2020
, :rest
@@ -56,13 +56,6 @@ constraints:
5656
-- haskell.nix patch does not work for 1.6.8
5757
, any.crypton-x509-system < 1.6.8
5858

59-
if impl(ghc >= 9.12)
60-
allow-newer:
61-
-- we need newer io-classes: https://github.com/input-output-hk/typed-protocols/tree/coot/io-classes-1.9
62-
, io-classes:time
63-
, ouroboros-network:time
64-
, nothunks:time
65-
, network-mux:time
6659

6760
-- WASM compilation specific
6861

@@ -132,122 +125,38 @@ if arch(wasm32)
132125
-- Do NOT add more source-repository-package stanzas here unless they are strictly
133126
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
134127

135-
-- cabal-allow-newer
136-
if impl(ghc >= 9.14)
128+
-- cabal-allow-newer begin
129+
if impl(ghc >=9.14)
137130
allow-newer:
138-
, aeson:QuickCheck
139-
, aeson:containers
140-
, aeson:template-haskell
141-
, aeson:time
142-
, bin:QuickCheck
143-
, bin:base
144-
, binary:containers
145-
, binary-orphans:base
146-
, blockio:base
147-
, blockio:io-classes
148-
, boring:base
149131
, bytestring-trie:base
150132
, canonical-json:containers
151-
, cardano-addresses:containers
152-
, cardano-addresses:template-haskell
153-
, cardano-diffusion:io-classes
154-
, cardano-prelude:canonical-json
155133
, cborg:base
156134
, cborg:containers
157135
, cborg-json:base
158136
, compact:base
159-
, config-ini:containers
160-
, constraints:boring
161-
, constraints-extras:template-haskell
162-
, criterion:microstache
163-
, data-elevator:base
164-
, dec:base
165137
, dependent-map:containers
166138
, dictionary-sharing:containers
167139
, diff-containers:base
168-
, discrimination:ghc-bignum
169-
, discrimination-ieee754:base
170-
, fin:QuickCheck
171-
, fin:base
172-
, fin:universe-base
173140
, fs-sim:QuickCheck
174-
, ghc:binary
175-
, ghc:time
176141
, grapesy:base
177142
, grapesy:containers
143+
, grapesy:tls
178144
, grpc-spec:base
179145
, grpc-spec:containers
180-
, hedgehog-extras:base
181146
, hedgehog-quickcheck:QuickCheck
182-
, http-api-data:text-iso8601
183-
, indexed-traversable:base
184-
, indexed-traversable:containers
185-
, indexed-traversable-instances:base
186-
, io-classes:base
187-
, io-sim:io-classes
188-
, lens-family:base
147+
, http2-tls:tls
189148
, lens-family:containers
190-
, lens-family:lens-family-core
191149
, lens-family-core:containers
192-
, lsm-tree:base
193-
, lsm-tree:cborg
194-
, lsm-tree:containers
195-
, lsm-tree:io-classes
196-
, microstache:base
197-
, microstache:containers
198-
, network-mux:io-classes
199-
, nonempty-vector:base
150+
, lsm-tree:data-elevator
151+
, newtype-generics:base
200152
, ordered-containers:containers
201-
, ouroboros-consensus:cborg
202-
, ouroboros-consensus:fs-sim
203-
, ouroboros-consensus:io-classes
204-
, ouroboros-consensus:quickcheck-state-machine
205-
, ouroboros-network:io-classes
206-
, parsec:base
207-
, plutus-core:dependent-map
208-
, plutus-ledger-api:plutus-core
209-
, proto-lens:base
210-
, proto-lens:lens-family
211-
, proto-lens-arbitrary:base
212-
, proto-lens-discrimination:base
213-
, proto-lens-optparse:base
214-
, proto-lens-protobuf-types:base
215-
, proto-lens-protoc:base
216-
, proto-lens-protoc:ghc
217-
, proto-lens-runtime:base
218-
, proto-lens-setup:base
219-
, quickcheck-instances:QuickCheck
220-
, quickcheck-instances:array
221-
, quickcheck-instances:base
222-
, quickcheck-instances:containers
223-
, quickcheck-instances:uuid-types
224-
, quickcheck-state-machine:QuickCheck
225-
, ral:QuickCheck
226-
, ral:base
227-
, ral:fin
228-
, ral:indexed-traversable
153+
, partial-order:containers
229154
, safe-wild-cards:template-haskell
230-
, semialign:base
231-
, semialign:containers
232155
, serdoc-core:template-haskell
233156
, serialise:base
234157
, serialise:containers
235158
, serialise:time
236-
, text:array
237-
, text:base
238-
, text:template-haskell
239-
, text-iso8601:time
240-
, these:base
241-
, time-compat:time
242-
, trace-dispatcher:aeson
243-
, tree-diff:QuickCheck
244-
, tree-diff:base
245-
, tree-diff:containers
246-
, tree-diff:semialign
247-
, tree-diff:time
248-
, typed-protocols:io-classes
249-
, universe-base:base
250-
, universe-base:containers
251-
, unix:time
252-
, uuid-types:template-haskell
159+
, time-locale-compat:time
253160
, with-utf8:base
161+
-- cabal-allow-newer end
162+

cardano-api/cardano-api.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ library gen
324324
Test.Hedgehog.Roundtrip.CBOR
325325

326326
build-depends:
327-
QuickCheck <2.18,
327+
QuickCheck,
328328
aeson >=1.5.6.0,
329329
base16-bytestring,
330330
bytestring,
@@ -359,7 +359,7 @@ test-suite cardano-api-test
359359
buildable: False
360360
build-depends:
361361
FailT,
362-
QuickCheck <2.18,
362+
QuickCheck,
363363
aeson >=1.5.6.0,
364364
base16-bytestring,
365365
bytestring,

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)