Skip to content

Conversation

@geo2a
Copy link
Contributor

@geo2a geo2a commented Jan 2, 2026

This change is necessary for Consensus to build with the current Network

@github-project-automation github-project-automation bot moved this to In Progress in Ouroboros Network Jan 2, 2026
@geo2a geo2a force-pushed the geo2a/10.7-integration branch 2 times, most recently from 543f0fe to 5f64770 Compare January 6, 2026 09:20
@geo2a geo2a changed the title [DO NOT MERGE] Commutative changes for 10.7 Commutative changes for 10.7 Jan 6, 2026
@geo2a geo2a force-pushed the geo2a/10.7-integration branch from 5f64770 to c49ee1e Compare January 9, 2026 08:41
@geo2a geo2a changed the title Commutative changes for 10.7 Allow using QuickCheck < 2.16 Jan 9, 2026
@geo2a geo2a marked this pull request as ready for review January 9, 2026 08:43
@geo2a geo2a requested review from a team as code owners January 9, 2026 08:43
@geo2a geo2a force-pushed the geo2a/10.7-integration branch 2 times, most recently from 7c9d0a9 to d137062 Compare January 9, 2026 10:17
@geo2a
Copy link
Contributor Author

geo2a commented Jan 9, 2026

It seems like we are hitting a false positive of -Werror=unused-packages due to using Cabal mixins, see: https://gitlab.haskell.org/ghc/ghc/-/issues/24173

I'm not sure there's a solution to this issue.

Copy link
Collaborator

@coot coot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, with some minor adjustments.

ghc-options: -Wno-redundant-constraints
ghc-options:
-Wno-redundant-constraints
-Wno-unused-packages
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment, that this is only required until we support quickcheck-monoids.

Comment on lines +92 to +93
import "quickcheck-monoids" Test.QuickCheck.Monoids
#endif
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can squash this on top of the first commit, which contain similar changes.

Comment on lines 12 to 13

{-# LANGUAGE CPP #-}
{-# LANGUAGE CPP #-}
Copy link
Collaborator

@coot coot Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the empty line, sort the pragmas and squash it onto the commit where it was introduced.

@geo2a geo2a force-pushed the geo2a/10.7-integration branch from 8e9d895 to 1cf2b22 Compare January 13, 2026 10:58
@geo2a geo2a enabled auto-merge January 13, 2026 10:58
@geo2a geo2a added this pull request to the merge queue Jan 13, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jan 13, 2026
@geo2a geo2a added this pull request to the merge queue Jan 14, 2026
@geo2a geo2a removed this pull request from the merge queue due to a manual request Jan 14, 2026
@geo2a geo2a force-pushed the geo2a/10.7-integration branch from 1cf2b22 to 0d1b5d5 Compare January 14, 2026 08:38
@geo2a geo2a enabled auto-merge January 14, 2026 08:39
@geo2a geo2a force-pushed the geo2a/10.7-integration branch from 0d1b5d5 to 3991765 Compare January 14, 2026 13:07
For not, '-Wno-redundant-constraints' is needed in testing libraries
to prevent false-positives that lead to build errors with `-Werror`.
See https://gitlab.haskell.org/ghc/ghc/-/issues/24173 for details.
@geo2a geo2a force-pushed the geo2a/10.7-integration branch from 3991765 to 2b1777f Compare January 14, 2026 15:29
@geo2a geo2a added this pull request to the merge queue Jan 14, 2026
Merged via the queue into main with commit 33abc7d Jan 14, 2026
309 checks passed
@geo2a geo2a deleted the geo2a/10.7-integration branch January 14, 2026 16:03
@github-project-automation github-project-automation bot moved this from In Progress to Done in Ouroboros Network Jan 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants