Skip to content

[Backport release-25.11] jetbrains: pycharm/idea unified builds; deprecate writerside & aqua#471061

Merged
MattSturgeon merged 2 commits intoNixOS:release-25.11from
theCapypara:backport-466331-to-release-25.11
Dec 15, 2025
Merged

[Backport release-25.11] jetbrains: pycharm/idea unified builds; deprecate writerside & aqua#471061
MattSturgeon merged 2 commits intoNixOS:release-25.11from
theCapypara:backport-466331-to-release-25.11

Conversation

@theCapypara
Copy link
Member

@theCapypara theCapypara commented Dec 15, 2025

Backport for #466331

The automatic backport just failed due to some changes in the maintainer lists not being backported; I backported the maintainer lists from 25.11 in a seperate commit.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Important

e7c64cc is not a cherry-pick, because: Too many changes to maintainer list that can't be easily cherry picked.. Please review this commit manually.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 4.workflow: backport This targets a stable branch labels Dec 15, 2025
@MattSturgeon
Copy link
Contributor

MattSturgeon commented Dec 15, 2025

I just used the maintainer lists from 25.11 on the new entries for this PR.

I'd prefer to consider "syncing maintainers with master" to be a separate logical unit, so a separate commit. This way the actual backport commit will be an exact cherry-pick.

@theCapypara theCapypara force-pushed the backport-466331-to-release-25.11 branch from 0b2baba to fae97d5 Compare December 15, 2025 21:51
@theCapypara
Copy link
Member Author

theCapypara commented Dec 15, 2025

Sure, how about this?

Edit: Actually I'm not sure what I did now is allowed?

Ensure the commits exist on the master branch. In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes

I guess I would need to also chery-pick these commits properly, but I can't, there are too many conflicts:

I added the Not-cherry-picked-because: <reason> footer to the first commit now, I hope that's correct? Sorry I've never done this...

Contains maintainer changes from these commits (ides.json ONLY):

- 3cffb9c
- 8a64ca6
- c0ec79b

Not-cherry-picked-because: Too many changes to maintainer list that can't be easily cherry picked.
@theCapypara theCapypara force-pushed the backport-466331-to-release-25.11 branch from fae97d5 to a6614d1 Compare December 15, 2025 22:01
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

Perfect, thanks.

Yeah, the point of the bot's review is to:

  1. Lint any issues with cherry-picks, i.e. missing the commit hash reference.
  2. Highlight any difference with the commit being cherry-picked, to aid manual review.
  3. Highlight any commits that aren't cherry-picked, so that they aren't glossed over in review.

This means reviewers can have confidence in commits the bot doesn't highlight, because they are clean cherry-picks of something already merged into master.

The things the bot does highlight aren't necessarily problems; they're just things that need manual review.

@MattSturgeon MattSturgeon added this pull request to the merge queue Dec 15, 2025
Merged via the queue into NixOS:release-25.11 with commit e09d49b Dec 15, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants