| 11 Dec 2025 |
 vcunat | Oh, weird
https://github.com/NixOS/nixpkgs/pull/463308 | 19:24:00 |
| vcunat | 🤔 | 19:24:02 |
 Marcus | yeah, that one | 19:24:14 |
 Grimmauld (any/all) | that should have gone to staging-nixos i think | 19:25:00 |
| Grimmauld (any/all) | it might make sense to manually cherry-pick it over | 19:25:15 |
| vcunat | Man, merge queue collision. | 19:25:59 |
| vcunat | I hate how long it takes. | 19:26:13 |
| vcunat | So I did push the button minutes before merging staging-next into master. | 19:26:29 |
| vcunat | Sometimes it really annoys me. Because I have to do one action, then wait 10 minutes, then do the next step, then wait again, etc. | 19:27:58 |
| vcunat | And I missed this case. | 19:28:39 |
| vcunat | Like... the PR merged 7 minutes before staging-next merged to master, if I read it right, but it wasn't enough. | 19:29:17 |
| Marcus | I see it's also in staging tho. | 19:33:14 |
| Grimmauld (any/all) | might it make sense to block merges while there is entries in the merge queue to the source branch of the merge? That way staging-next would never merge if there is fixes in the pipeline going to staging-next | 19:34:13 |
| Grimmauld (any/all) | staging-next is periodically merged into staging, of course its also in staging | 19:34:45 |
 tgerbet | Rhaaaa fuuuuuuu sorry, these grub2 PRs should just go through staging TBH. We do not gain a lot by trying to shortcut staging | 19:35:26 |
| Grimmauld (any/all) | staging-nixos would be fine i think, that is the correct place to do these shortcuts | 19:35:58 |
| Grimmauld (any/all) | but wasn't possible bc your pr branch had commits from staging-next | 19:36:08 |
| tgerbet | Yep I just rebased without about it too much | 19:36:55 |
| tgerbet | * Yep I just rebased without thinking about it too much | 19:37:11 |
| vcunat | I believe it was just my mistake. | 19:38:26 |
| vcunat | I didn't wait long enough between pushing the buttons. | 19:38:34 |
| vcunat | So it didn't turn out the way I intended. | 19:38:48 |
| vcunat | (and I didn't notice, as the merges just succeeded) | 19:39:07 |
| vcunat | I'll remerge to staging-nixos in a moment. | 19:42:20 |
| vcunat | Yes, builds OK. Resolved the conflict the same way as in staging, and checked that staging-nixos will still merge cleanly with staging. | 19:43:22 |
| vcunat | (I skipped the merge queue this time.) | 19:44:27 |
| Marcus | I'm a bit confused by this, seeing the above conversation about staging-next being deactivated. So is what in staging now scheduled to go after the current staging-next-25.11? | 20:06:56 |
| vcunat | Yes. | 20:13:51 |
| Marcus | gonna be fun times 🙂 | 20:15:43 |
| Grimmauld (any/all) | oh also apparently rust 1.92 is a thing, didn't check PRs yet tho | 20:19:26 |
