| 2 Oct 2025 |
 jficz | Hi! What can I do to have this mautrix-whatsapp module backport PR merged? https://github.com/NixOS/nixpkgs/pull/446155
It's manual because of merge conflicts but otherwise equal to the original PR. | 19:29:33 |
 SigmaSquadron | Would it be possible to cherry-pick the original commits instead of making new ones? | 22:23:01 |
| jficz | In reply to @sigmasquadron:matrix.org
Would it be possible to cherry-pick the original commits instead of making new ones? That's what the bot tried to do but failed because of conflicts. I don't think it's possible to do it cleanly. | 22:35:24 |
| SigmaSquadron | You should still cherry-pick manually and edit the cherry-picks. | 22:45:07 |
| 3 Oct 2025 |
| jficz | ok, I'll try again but I did exactly that I believe (as suggested here, except yes, I somehow managed to base it against master so I rebased against release after that) | 20:57:29 |
| jficz | * ok, I'll try again but I did exactly that I believe (as suggested here, except yes, I somehow managed to base it against master at first so I rebased against release after that) | 20:58:43 |
|  moleksiak joined the room. | 23:30:58 |
| 4 Oct 2025 |
 dish [Fox/It/She] | Something to consider for now/future releases: Something a la the "Release Blockers" thread, but for things that are intended to be cleaned up post-branchoff. I've found a lot of stuff that was intended to be removed in 25.05 or 25.11, but hasn't been yet, so having a central place to track those sorts of things, so that there's a single checklist of items would be good. Obviously, maintainers of packages would be the ones adding things to it, but it's something to think about for the future, maybe? | 02:28:45 |
 leona | it might be, otherwise I don't know how helpful a tracking issue would be. We already have the label 2.status: wait for branch-off for PRs and issues that are blocked. I feel like a tracking issue is only really helpful when multiple people (and not just the maintainers of the respective module or package) can work on the issues. But also just my idea
Personally, I more like the idea for reducing the time where breaking changes are restricted by branching off earlier, but this would possibly require more energy and especially Hydra capacity, that we currently don't have. This idea was already mentioned last release cycle by multiple people, but IMO currently not actionable
| 07:45:33 |
| dish [Fox/It/She] | i mean multiple people could work on the issues or pull requests, but most things are just marked with comments and you need to search through the code to find stuff, since most likely it gets forgotten | 15:34:19 |
| 6 Oct 2025 |
|  tallyho-dulcet joined the room. | 09:16:41 |
|  felix joined the room. | 12:52:18 |
| 7 Oct 2025 |
 vcunat | Ideally we'd cut the breaking changes to release-critical packages now already, not moved to the weekend. | 15:11:53 |
| vcunat | Or leave them to more careful approval. | 15:12:36 |
| vcunat | But I think most of the relevant people know staging-next + release scheduling and the need to get breaking changes early. | 15:13:10 |
| vcunat | * But I think most of the relevant people know staging-next + release scheduling and the need to get breaking changes early anyway. | 15:13:14 |
| leona | For me this would be fine. As far as I understood it, most people just wanted to move breaking changes to non release critical packages further back. But I leave that also up to jopejoe1 | 15:14:10 |
|  alunduil changed their profile picture. | 23:11:54 |
| 8 Oct 2025 |
|  @pfpoitras:matrix.org left the room. | 04:51:31 |
 jopejoe1 | No strong opinion on that, but from what i understood there where also some changes to release critical packages people wanted to get in. | 20:02:39 |
|  dwd joined the room. | 20:55:35 |
| dwd changed their display name from Peri to dwd. | 20:55:57 |
| 9 Oct 2025 |
| dwd | Ahoy hoy, a bunch of packages just broke in unstable due to not having updated to cmake 3.5, is that going to be reflected in 25.11 or is it going to wait until 26.05? | 16:21:55 |
| vcunat | Current master is 25.11. | 16:23:57 |
| vcunat | You can see the fork-off in the schedule | 16:24:16 |
| dwd | ah ok | 16:24:21 |
| vcunat | * You can see the branch-off in the schedule | 16:24:39 |
| vcunat | in a couple weeks: https://github.com/NixOS/nixpkgs/issues/443568 | 16:24:45 |
 kuflierl | That sounds like a significant issue, maybe keep the old version as default? | 16:25:02 |
| vcunat | * in a several weeks: https://github.com/NixOS/nixpkgs/issues/443568 | 16:25:12 |
