| 16 Dec 2025 |
 Winter | do you mean a PR that merges staging-next into master? | 04:06:37 |
| Winter | it’s going to take a while. | 04:07:07 |
 eveeifyeve | No the pr that merged to staging -> staging-next | 04:07:14 |
| Winter | in that case, yeah, ^ | 04:09:26 |
| Winter | it’ll happen when the next cycle starts | 04:09:32 |
| Winter | so like +/- a few weeks for that PR to hit unstable | 04:10:05 |
| eveeifyeve | Okay well I will be waiting, if you can mention me on the next pr so I can know for both staging -> staging-next and staging-next -> master. | 06:29:04 |
| eveeifyeve | * Okay well I will be waiting, if you can mention me on the next pr please do so I can know for both staging -> staging-next and staging-next -> master. | 06:29:17 |
| eveeifyeve | I will cc the pr on both that updates nixpkgs. | 06:29:58 |
 9lore | can someone ping/cc me on next staging-nixos pr pls? | 21:29:18 |
 hexa | Redacted or Malformed Event | 21:48:41 |
| hexa | use @nixpkgs-bot:maralorn.de to follow a PRs merge state | 21:49:23 |
| 17 Dec 2025 |
 vcunat | New staging-next:
https://github.com/NixOS/nixpkgs/pull/471587 | 08:35:22 |
| vcunat | It wasn't a typo, you didn't want this one, right? | 08:35:41 |
 Emil Thorsøe | doesn't staging-next pull in staging-nixos anyway? | 09:02:14 |
| Emil Thorsøe | or like that would sound sensible to me | 09:02:28 |
 K900 | Yes | 09:04:36 |
| vcunat | I do merge staging-nixos whenever merging staging-next to master. (or at least I'm trying to remember) | 09:08:16 |
 emily | maybe we should have automated staging-nixos → staging-next merges | 09:21:08 |
| emily | rather than separate master → staging-next and master → staging-nixos merges | 09:21:18 |
| emily | that way it would happen by itself | 09:21:31 |
| vcunat | So master → staging-nixos → staging-next → staging? 🤔😁 | 09:25:44 |
| vcunat | Making the chain longer does have some risks, but maybe that's just... inherent to our situation. | 09:27:21 |
 Grimmauld (any/all) | its not a terrible idea tbh | 09:33:20 |
| Grimmauld (any/all) | if github buckles we'll just have to move away from github :P | 09:33:37 |
| emily | potentially means resolving a conflict only once rather than thrice, if master, staging-nixos, and staging-next all differ on something | 09:36:32 |
| emily | say, Python stuff: change to test driver on staging-nixos, mass update on staging/staging-next | 09:36:48 |
| emily | and some conflicting non-rebuilding Python packaging change on master | 09:37:07 |
| emily | well, I guess this is still two conflict resolutions to do. but less confusing ones hopefully | 09:37:23 |
| emily | otherwise you resolve the master/staging-nixos and master/staging-next ones separately and then have to deal with staging-nixos/staging-next later | 09:37:45 |
