Skip to content

allow Diff 1.x #4608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2025
Merged

allow Diff 1.x #4608

merged 1 commit into from
Jun 8, 2025

Conversation

peterbecich
Copy link
Member

@peterbecich peterbecich commented Jun 1, 2025

https://hackage.haskell.org/package/Diff

Compilation succeeds with Diff ^>= 1.0

cabal test --enable-tests --constraint 'Diff>=1.0'

1 test fails:

1 out of 376 tests failed (535.93s)
FAIL (1.74s)
        plugins/hls-refactor-plugin/test/Main.hs:3966:
        CodeAction with title "add signature: hello :: GHC.Types.Any -> IO ()" not found in ["add signature: hello :: GHC.Types.ZonkAny 0 -> IO ()"]
        Use -p '/hello = print/' to rerun this test only.

@peterbecich peterbecich enabled auto-merge (rebase) June 1, 2025 06:53
@michaelpj
Copy link
Collaborator

I'm confused - does this work or not? If there's a test failure I guess we shouldn't merge it?

@fendor
Copy link
Collaborator

fendor commented Jun 1, 2025

The test failure is for GHC 9.10.2, which we don't test in CI right now. So, can be ignored. However, I think we should only support Diff ^>= 1.0, no reason to support both, right?

@peterbecich
Copy link
Member Author

should only support Diff ^>= 1.0, no reason to support both, right?

NixPkgs haskell-updates branch has two versions of Diff:

  • Diff (0.5)
  • Diff_1_0_2 (1.0.2)

The existence of the old version 0.5 (pinned here https://github.com/NixOS/nixpkgs/blob/c8fe7786a1c661dc76f4398dbf952939f4aed378/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml#L631) indicates many other packages still require 0.5. By removing the support for 0.5 we are taking away some flexibility in building haskell-language-server in Nix.

@cassandracomar
Copy link

we're able to loosen the version bounds in nixpkgs via jailbreaking. so this will take a little work to add jailbreaks for any reverse dependencies that restrict the version of Diff to < 0.6, but it's no more unusual than many of the other version upgrades we do regularly. as these changes are gated for awhile in the haskell-updates branch for testing, there's also plenty of time for reverse dependencies to pick up the new Diff version as well.

of note, I haven't yet found a package that builds with Diff-0.5.X that doesn't also build with Diff-1.0.X.

Copy link
Collaborator

@fendor fendor left a comment

Choose a reason for hiding this comment

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

LGTM

@fendor
Copy link
Collaborator

fendor commented Jun 4, 2025

Looks like we do need to allow both Diff versions.

@peterbecich
Copy link
Member Author

#4608 (comment) reset to the first commit

@michaelpj michaelpj added the merge me Label to trigger pull request merge label Jun 5, 2025
Copy link
Contributor

mergify bot commented Jun 5, 2025

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated.

You should update or rebase your pull request manually. If you do, this pull request will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@peterbecich peterbecich merged commit b1966ff into haskell:master Jun 8, 2025
32 checks passed
@peterbecich peterbecich deleted the diff-1 branch June 8, 2025 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Label to trigger pull request merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants