!UNVBThoJtlIiVwiDjU:nixos.org

Staging

316 Members
Staging merges | Running staging cycles: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+head%3Astaging-next+head%3Astaging-next-25.05 | Review Reports: https://malob.github.io/nix-review-tools-reports/107 Servers

Load older messages


SenderMessageTime
11 Dec 2025
@grimmauld:m.grimmauld.deGrimmauld (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-next19:34:13
@grimmauld:m.grimmauld.deGrimmauld (any/all)staging-next is periodically merged into staging, of course its also in staging19:34:45
@tgerbet:matrix.orgtgerbetRhaaaa fuuuuuuu sorry, these grub2 PRs should just go through staging TBH. We do not gain a lot by trying to shortcut staging19:35:26
@grimmauld:m.grimmauld.deGrimmauld (any/all) staging-nixos would be fine i think, that is the correct place to do these shortcuts19:35:58
@grimmauld:m.grimmauld.deGrimmauld (any/all)but wasn't possible bc your pr branch had commits from staging-next19:36:08
@tgerbet:matrix.orgtgerbetYep I just rebased without about it too much19:36:55
@tgerbet:matrix.orgtgerbet* Yep I just rebased without thinking about it too much19:37:11
@vcunat:matrix.orgvcunatI believe it was just my mistake.19:38:26
@vcunat:matrix.orgvcunatI didn't wait long enough between pushing the buttons.19:38:34
@vcunat:matrix.orgvcunatSo it didn't turn out the way I intended.19:38:48
@vcunat:matrix.orgvcunat(and I didn't notice, as the merges just succeeded)19:39:07
@vcunat:matrix.orgvcunat I'll remerge to staging-nixos in a moment. 19:42:20
@vcunat:matrix.orgvcunat 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:matrix.orgvcunat(I skipped the merge queue this time.)19:44:27
@marcusramberg:matrix.orgMarcusI'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:matrix.orgvcunatYes.20:13:51
@marcusramberg:matrix.orgMarcusgonna be fun times 🙂20:15:43
@grimmauld:m.grimmauld.deGrimmauld (any/all)oh also apparently rust 1.92 is a thing, didn't check PRs yet tho20:19:26
@marcusramberg:matrix.orgMarcusimage.png
Download image.png
20:22:38
@marcusramberg:matrix.orgMarcusgcc15, perl 5.42, clang, soo much python and haskell, whatever this is... 20:22:39
@grimmauld:m.grimmauld.deGrimmauld (any/all) we should just block non-merge commits without : in commit title :P 20:25:07
@qyliss:fairydust.spaceAlyssa Rosshonestly not a bad idea20:25:25
@qyliss:fairydust.spaceAlyssa Rosscan you block unexplained reverts while you're at it?20:25:33
@qyliss:fairydust.spaceAlyssa Ross(but don't let that hold you back from the colon lint)20:25:46
@grimmauld:m.grimmauld.deGrimmauld (any/all)the colon lint was literally a dumb heuristic and a 5 second idea20:26:02
@grimmauld:m.grimmauld.deGrimmauld (any/all)i am sure wolfgang tell me it doesn't work for some reason20:26:16
@grimmauld:m.grimmauld.deGrimmauld (any/all) but if we can check that, then maybe 20:26:29
@vcunat:matrix.orgvcunatI'm missing the squash-merge button.20:31:53
12 Dec 2025
@whispers:catgirl.cloudwhispers (it/fae) changed their profile picture.04:51:15
13 Dec 2025
@dramforever:matrix.orgdramforever re: https://github.com/NixOS/nixpkgs/pull/448220 it turns out this did not land in gcc 15. i'm guessing it still makes sense to move this to gcc/patches on staging now? 03:34:22

Show newer messages


Back to Room ListRoom Version: 6