Skip to content

Minor updates#1387

Merged
erikd merged 3 commits into
masterfrom
erikd/updates
Jun 3, 2026
Merged

Minor updates#1387
erikd merged 3 commits into
masterfrom
erikd/updates

Conversation

@erikd
Copy link
Copy Markdown
Contributor

@erikd erikd commented Jun 1, 2026

Context

Minior updates:

  • Update index-states
  • Remove allow-newers
  • Update Nix

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff
  • Changelog fragment added in .changes/

Copilot AI review requested due to automatic review settings June 1, 2026 23:24
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates project dependency pinning to newer Nix inputs and Cabal index-states, while adjusting build constraints/overrides for current compiler compatibility.

Changes:

  • Bumped Nix flake inputs (CHaP and hackage.nix) in flake.lock.
  • Updated index-state pins and reduced the allow-newer set for GHC ≥ 9.14 in cabal.project.
  • Added a new top-level Cabal constraint (validation < 1.2) in cabal.project.

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated 2 comments.

File Description
flake.lock Updates locked revisions/hashes for Nix inputs (CHaP, hackage.nix).
cabal.project Updates index-states and adjusts constraints/allow-newer overrides for builds.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread cabal.project Outdated
Comment thread cabal.project
@erikd erikd enabled auto-merge June 2, 2026 06:18
Comment thread cabal.project Outdated

-- ouroboros-consensus currently needs this. Version 1.2 has an breaking API change.
constraints:
, validation < 1.2
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

But this tree is still using ouroboros-consensus-3.0.0.0 so that constraint is needed. Unless you would prefer I do a revision of ouroboros-consensus-3.0.0.0

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

That's strange why. We have only ^>= 3.0 constraint so it should pull 3.0.1 with newer chap I think.

If that is not the case, we can merge your PR as it is.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I made a revision to ouroboros-consensus-3.0.0.0 to force validation < 1.2 and I removed the constraint as well.

@erikd erikd added this pull request to the merge queue Jun 2, 2026
@carbolymer carbolymer removed this pull request from the merge queue due to a manual request Jun 2, 2026
@carbolymer
Copy link
Copy Markdown
Contributor

Removed from queue, could you double check that validation constraint, @erikd ? Otherwise LGTM.

@erikd erikd enabled auto-merge June 2, 2026 22:19
@erikd erikd added this pull request to the merge queue Jun 2, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to no response for status checks Jun 3, 2026
@erikd erikd added this pull request to the merge queue Jun 3, 2026
Merged via the queue into master with commit f017b71 Jun 3, 2026
25 checks passed
@erikd erikd deleted the erikd/updates branch June 3, 2026 02:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants