| 19 Apr 2026 |
Alyssa Ross | It has worked every time I've done it so far | 10:28:11 |
Alyssa Ross | It's great for new contributors too | 10:28:22 |
K900 | Channeling this community's love for checklists into actually productive work is something we're bad at | 10:28:24 |
Alyssa Ross | Yeah I keep saying this | 10:29:30 |
Alyssa Ross | It's fundamentally an asset that needs to be directed. | 10:29:48 |
Alyssa Ross | Few communities are fortunate enough to have access to this sort of labour force! | 10:31:21 |
tfc | oh my god i think i force-pushed to staging-nixos, can someone please check and help me revert if i am right?
| 17:12:24 |
tfc | normally i am cautious where i push (only my fork) but i also thought i could not even forcepush to anything in nixos/nixpkgs? | 17:13:50 |
leona | force push to staging-nixos should not be possible when the ruleset in nixos/org is still correct | 17:14:45 |
tfc | https://github.com/NixOS/nixpkgs/commits/staging-nixos/ this contains my latest commit from 12 minutes ago. this should not be there without going through a PR (which i planned to open) | 17:15:47 |
tfc | i don't want to force-push again what i thing would be correct there without having someone else look and check first to not f*** it up more. | 17:16:15 |
tfc | * i don't want to force-push again what i think would be correct there without having someone else look and check first to not f*** it up more. | 17:16:23 |
leona | just pushing without PR is different than force pushing. I don't see any other PRs merged since them, but also don't have access to the logs afaik | 17:16:44 |
vcunat | I think you just pushed a single commit directly on top. | 17:17:01 |
hexa | I just fetched and it was fast-forward for me | 17:17:24 |
leona | yes, it was a simple push: https://github.com/NixOS/nixpkgs/activity?ref=staging-nixos | 17:17:38 |
tfc | ok that's better than changing the history with a force-push but still not great. thank you for confirming that the damage is limited | 17:18:36 |
ma27 | fwiw everything staging should be catched by https://github.com/NixOS/org/blob/main/rulesets/nixpkgs/no-force-push.json#L17
so same rules as for all the other staging branches I believe?
revert will have to do someone else in here, currently in a train and thus limited in terms of things I can do. | 17:19:54 |
| 20 Apr 2026 |
dramforever | do you still want this reverted? | 02:27:53 |
dramforever | well, i think it's not that bad and you can just revert it as a first commit in your eventual pr | 03:06:05 |
vcunat | Well, if you were able to push that commit, you clearly have sufficient permissions to push a revert, too. | 04:56:15 |
Alyssa Ross | K900 we're getting people coming from that issue fixing unrelated staging-next regressions now too! :D | 05:58:16 |
tfc | unless the changes produce problems on hydra jobs i speak with some other maintainers if they find the changes controversial and revert if they don't like it. but the patch doesnt really contain controversial stuff. | 08:24:11 |
| picnoir changed their display name from Picnoir to picnoir. | 10:07:01 |
Gaétan Lepage | Hello!
Do you have a rough ETA for when staging-next will land?
Any remaining blockers? Something I can help with? | 16:13:00 |
Alyssa Ross | https://github.com/NixOS/nixpkgs/issues/511329 is the main issue at the moment. | 16:35:30 |
Gaétan Lepage | Thanks! I'll keep track of that | 16:38:32 |
ma27 | honestly, I don't think it's reasonable to have accidentally pushed and then just accepted. since I do have one thing I'd like to discuss, I reverted for now (https://github.com/NixOS/nixpkgs/commit/4c907dbb68ff92ec570bedfc53ad58d67862e48b) and re-opened a PR with the re-apply (and tfc's authorship in the commit rather than mine, ofc) : https://github.com/NixOS/nixpkgs/pull/511866 | 20:43:39 |
| sky1e joined the room. | 23:35:20 |
| 21 Apr 2026 |
dramforever | yes tbc i meant "if you still want it reverted" | 00:30:28 |