Skip to content
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

Upgrade nixpkgs to nixos-24.05 and remove nixos-unstable again #2217

Merged
merged 10 commits into from
Aug 6, 2024

Conversation

avdv
Copy link
Member

@avdv avdv commented Jul 5, 2024

Note, this also requires upgrading rules_nixpkgs to version 0.12.

@avdv avdv force-pushed the cb/upgrade-nixpkgs-nixos-24.05 branch 7 times, most recently from 748252c to 6784ca9 Compare July 9, 2024 07:18
@avdv avdv requested a review from ylecornec August 5, 2024 06:58
@avdv avdv marked this pull request as ready for review August 5, 2024 06:58
Copy link
Member

@ylecornec ylecornec left a comment

Choose a reason for hiding this comment

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

There are a few merge conflicts but otherwise it looks good to me 👍

- use lts-22.27 for ghc 9.6.5
- drop override for protoc and ghc-source-gen packages and use packages from hackage instead
- re-pin stackage snapshots
The stackage snapshot has lsp 2.3, and that conflicted with ghcide 2.2.
@avdv avdv force-pushed the cb/upgrade-nixpkgs-nixos-24.05 branch from 6784ca9 to 841caaf Compare August 5, 2024 13:02
@avdv avdv force-pushed the cb/upgrade-nixpkgs-nixos-24.05 branch from 841caaf to 7c5bcff Compare August 6, 2024 05:52
@avdv avdv added the merge-queue merge on green CI label Aug 6, 2024
@mergify mergify bot merged commit 848ba21 into master Aug 6, 2024
49 checks passed
@mergify mergify bot deleted the cb/upgrade-nixpkgs-nixos-24.05 branch August 6, 2024 09:21
@mergify mergify bot removed the merge-queue merge on green CI label Aug 6, 2024
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.

None yet

2 participants