Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acts-generic/acts-generic.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ library
-- other-extensions:
build-depends:
acts,
base >=4.14 && <4.22,
base >=4.14 && <4.23,

hs-source-dirs: src
default-language: Haskell2010
Expand Down
9 changes: 8 additions & 1 deletion acts-generic/src/Data/Act/Generic.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
Expand Down Expand Up @@ -68,7 +69,13 @@ instance (GAct s f, GAct s g) => GAct s (f :+: g) where
--
newtype GenericAct s a = GenericAct { getGenericAct :: a }

instance (Generic s, Generic a, GAct s (Rep a), Semigroup s) => Act s (GenericAct s a) where
instance (
#if __GLASGOW_HASKELL__ < 914
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
Generic s,
#endif
Generic a, GAct s (Rep a), Semigroup s) => Act s (GenericAct s a) where
act s (GenericAct a) = GenericAct (s `gact` a)


Expand Down
157 changes: 155 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ repository cardano-haskell-packages
-- repeat the index-state for hackage to work around haskell.nix parsing limitation
index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2025-08-05T15:28:56Z
, hackage.haskell.org 2025-10-22T00:22:49Z

-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2025-03-18T17:41:11Z
, cardano-haskell-packages 2025-10-21T11:16:53Z

packages: ./cardano-ping
./monoidal-synchronisation
Expand Down Expand Up @@ -62,3 +62,156 @@ source-repository-package
tag: 6d0f51fba415d3c641a8a8da37130e7adfc3ea01
--sha256: sha256-qM8RgmKOGBMlizPtXw2YOboYIzM6T3kvG9/Rp1F+bYQ=
subdir: kes-agent-crypto

if impl (ghc >= 9.14)
constraints:
, containers > 0.7
, foldl >= 1.4.18
, nothunks ^>= 0.2
-- Newest version causes Arbitrary instance clashes in quickcheck-instances.
, QuickCheck < 2.17.0.0

-- cabal-allow-newer
if impl (ghc >= 9.14)
allow-newer:
, OneTuple:base
, aeson:QuickCheck
, aeson:base
, aeson:bytestring
, aeson:containers
, aeson:deepseq
, aeson:ghc-prim
, aeson:template-haskell
, aeson:text-iso8601
, aeson:text-short
, aeson:time
, aeson:time-compat
, aeson:witherable
, assoc:base
, async:base
, base:ghc-internal
, base:ghc-prim
, bifunctors:template-haskell
, bifunctors:th-abstraction
, binary:containers
, binary-orphans:base
, boring:base
, canonical-json:containers
, cardano-diffusion:cborg
, cardano-diffusion:io-classes
, cardano-diffusion:typed-protocols
, cardano-ping:time
, cardano-prelude:canonical-json
, cborg:base
, cborg:bytestring
, cborg:containers
, criterion:microstache
, data-fix:base
, directory:time
, dmq-node:time
, exceptions:mtl
, filepath:base
, free:base
, free:exceptions
, free:mtl
, free:template-haskell
, generic-data:base
, generically:base
, ghc-heap:base
, ghc-heap:containers
, ghc-heap:ghc-internal
, ghc-heap:ghc-prim
, hashable:base
, hashable:containers
, hashable:ghc-bignum
, hsc2hs:base
, indexed-traversable:base
, indexed-traversable:containers
, indexed-traversable-instances:base
, integer-conversion:base
, integer-logarithms:base
, integer-logarithms:ghc-bignum
, io-classes:async
, io-classes:base
, io-classes:time
, io-sim:base
, io-sim:time
, kes-agent-crypto:base
, microstache:aeson
, microstache:base
, microstache:bytestring
, microstache:containers
, network-mux:containers
, network-mux:time
, network-uri:th-compat
, nothunks:containers
, nothunks:time
, nothunks:wherefrom-compat
, ntp-client:time
, os-string:bytestring
, os-string:exceptions
, os-string:template-haskell
, ouroboros-network:time
, parallel:base
, parsec:bytestring
, primitive:base
, process:base
, quickcheck-instances:array
, quickcheck-instances:base
, quickcheck-instances:bytestring
, quickcheck-instances:containers
, recursion-schemes:containers
, recursion-schemes:data-fix
, recursion-schemes:free
, recursion-schemes:template-haskell
, scientific:base
, scientific:containers
, scientific:integer-logarithms
, scientific:template-haskell
, semialign:base
, semialign:containers
, semigroupoids:bifunctors
, serialise:base
, serialise:bytestring
, serialise:containers
, serialise:ghc-prim
, serialise:hashable
, serialise:these
, serialise:time
, singletons:base
, splitmix:base
, statistics:parallel
, tagged:template-haskell
, tdigest:base
, text:array
, text:binary
, text-iso8601:time
, text-short:base
, text-short:ghc-prim
, text-short:template-haskell
, th-abstraction:template-haskell
, th-compat:template-haskell
, these:base
, time-compat:base
, time-compat:deepseq
, time-compat:time
, tree-diff:aeson
, tree-diff:base
, tree-diff:containers
, tree-diff:deepseq
, tree-diff:scientific
, tree-diff:tagged
, tree-diff:time
, tree-diff:uuid-types
, typed-protocols:base
, typed-protocols:singletons
, unix:base
, unordered-containers:base
, unordered-containers:hashable
, unordered-containers:template-haskell
, uuid-types:template-haskell
, vector-th-unbox:base
, vector-th-unbox:template-haskell
, wherefrom-compat:base
, with-utf8:base
, witherable:containers
26 changes: 13 additions & 13 deletions cardano-diffusion/cardano-diffusion.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ library api

build-depends:
aeson,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
cborg >=0.2.1 && <0.3,
deepseq,
nothunks,
Expand All @@ -86,7 +86,7 @@ test-suite api-tests

build-depends:
QuickCheck,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
cardano-diffusion:api,
ouroboros-network:api,
tasty,
Expand Down Expand Up @@ -149,7 +149,7 @@ library

build-depends:
aeson,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-diffusion:{api, protocols},
containers,
Expand Down Expand Up @@ -201,7 +201,7 @@ library orphan-instances

build-depends:
aeson,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
cardano-diffusion:{cardano-diffusion, api},
containers,
ouroboros-network:{ouroboros-network, api, orphan-instances},
Expand All @@ -212,7 +212,7 @@ executable demo-chain-sync
main-is: chain-sync.hs
build-depends:
async,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-diffusion,
containers,
Expand Down Expand Up @@ -279,7 +279,7 @@ library protocols
Ouroboros.Network.Protocol.TxSubmission2.Type as Cardano.Network.Protocol.TxSubmission2.Type,

build-depends:
base >=4.12 && <4.22,
base >=4.12 && <4.23,
bytestring >=0.10 && <0.13,
cardano-diffusion:api,
cborg >=0.2.1 && <0.3,
Expand Down Expand Up @@ -331,7 +331,7 @@ library protocols-tests-lib

build-depends:
QuickCheck,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-diffusion:api,
cborg,
Expand All @@ -351,7 +351,7 @@ test-suite protocols-tests
hs-source-dirs: protocols/tests
main-is: Main.hs
build-depends:
base >=4.14 && <4.22,
base >=4.14 && <4.23,
cardano-diffusion:protocols-tests-lib,
tasty,

Expand All @@ -374,7 +374,7 @@ test-suite protocols-cddl

build-depends:
QuickCheck,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-diffusion:{api, protocols, protocols-tests-lib},
cborg,
Expand Down Expand Up @@ -407,7 +407,7 @@ test-suite protocols-bench
hs-source-dirs: protocols/bench
main-is: Main.hs
build-depends:
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-diffusion:{api, protocols, protocols-tests-lib},
cborg,
Expand Down Expand Up @@ -435,7 +435,7 @@ library cardano-diffusion-tests-lib
build-depends:
QuickCheck >=2.16,
aeson,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-diffusion:{cardano-diffusion, api, orphan-instances, protocols-tests-lib},
cardano-slotting,
Expand Down Expand Up @@ -483,7 +483,7 @@ test-suite cardano-diffusion-sim-tests
hs-source-dirs: tests/sim
main-is: Main.hs
build-depends:
base >=4.14 && <4.22,
base >=4.14 && <4.23,
cardano-diffusion:cardano-diffusion-tests-lib,
tasty,
with-utf8,
Expand All @@ -504,7 +504,7 @@ library subscription
default-language: Haskell2010
default-extensions: ImportQualifiedPost
build-depends:
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring >=0.10 && <0.13,
cardano-diffusion ^>=0.1,
cborg >=0.2.8 && <0.3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,11 @@ prop_governor_peershare_1hr env@GovernorMockEnvironment {
)
in counterexample ( intercalate "\n"
. map (ppSimEvent 20 20 20)
. takeWhile (\e -> seTime e <= Time (60*60))
. takeWhile (\e ->
case e of
SimEvent {seTime} -> seTime < Time (60*60)
SimPOREvent {seTime} -> seTime < Time (60*60)
_ -> False)
. Trace.toList
$ ioSimTrace) $
subsetProperty found reachable
Expand Down
2 changes: 1 addition & 1 deletion cardano-ping/cardano-ping.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ library
exposed-modules: Cardano.Network.Ping
build-depends:
aeson >=2.1.1.0 && <3,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring >=0.10 && <0.13,
cborg >=0.2.8 && <0.3,
contra-tracer >=0.1 && <0.3,
Expand Down
10 changes: 5 additions & 5 deletions dmq-node/dmq-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ library
acts-generic,
aeson >=2.1.1.0 && <3,
aeson-pretty,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
base16-bytestring,
bytestring >=0.10 && <0.13,
cardano-binary,
cardano-crypto-class,
cborg >=0.2.1 && <0.3,
containers >=0.5 && <0.8,
containers >=0.5 && <0.9,
contra-tracer >=0.1 && <0.3,
deepseq >=1.0 && <1.6,
directory,
Expand All @@ -102,7 +102,7 @@ library
kes-agent-crypto ^>=0.1,
network ^>=3.2.7,
network-mux ^>=0.9.1,
optparse-applicative ^>=0.18,
optparse-applicative >=0.18 && < 0.20,
ouroboros-network:{ouroboros-network, api, framework, orphan-instances, protocols} ^>=0.23,
random ^>=1.2,
singletons,
Expand Down Expand Up @@ -160,7 +160,7 @@ test-suite dmq-tests
main-is: Main.hs
build-depends:
QuickCheck,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
bytestring,
cardano-crypto-class,
cardano-crypto-tests,
Expand Down Expand Up @@ -202,7 +202,7 @@ test-suite dmq-cddl

default-language: Haskell2010
build-depends:
base >=4.14 && <4.22,
base >=4.14 && <4.23,
base16-bytestring,
bytestring,
cborg,
Expand Down
4 changes: 2 additions & 2 deletions monoidal-synchronisation/monoidal-synchronisation.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extra-doc-files: CHANGELOG.md

library
exposed-modules: Data.Monoid.Synchronisation
build-depends: base >=4.14 && <4.22
build-depends: base >=4.14 && <4.23
hs-source-dirs: src
default-language: Haskell2010
default-extensions: ImportQualifiedPost
Expand All @@ -37,7 +37,7 @@ test-suite test
other-modules: Test.Data.Monoid.Synchronisation
build-depends:
QuickCheck,
base >=4.14 && <4.22,
base >=4.14 && <4.23,
io-classes,
io-sim,
monoidal-synchronisation,
Expand Down
Loading
Loading