Staging - Public Room Timeline

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

Load older messages

Sender	Message	Time
15 Feb 2026
emily	so you just work on that branch and run the script to produce the form that goes to master as a commit on top	18:20:26
vcunat	I missed the script. See it now.	18:20:38
emily	essentially a merge of staging/-next back into master	18:20:38
emily	it'd suck to touch stuff being staged on `master`, but that's the thing that sucks now and the suck gets externalized to people doing manual merge :)	18:21:16
Lun	nixpkgs, now with federated suck processing technology™	18:22:12
emily	there's a lower-tech variant where you have no conditionals in the code but every staging/-next PR has a HEAD that merges it back into master to undo the changes, and merge queue just validates no conflicts/eval errors across the branches. that makes merging -next into master weird from a Git POV though (it would produce a nop by default because "all the changes are already merged in"). or the reverse is that if you have to do something to resolve conflicts between master and staging/-next you keep your commit based on master but add a merge commit merging it into staging/-next and the master portion of it just gets automatically backported. those avoid any eval time machinery but abandon the property that there's one canonical tree that lets you see when stuff is in flight before you touch it. they would also interact a bit weird with the way GitHub displays merge commits and require CI to have more smarts around them	18:27:30
emily	the latter option does have the perk that it's exactly the same merge structure we have now and just distributes the work of doing the conflicting ones to the authors of the PRs that cause the conflicts	18:29:07
emily	(but it punts on helping with the conditionalization dance except insofar as it makes it easier to land the conditional and the clean-up in the same PR without one getting forgotten)	18:31:01
emily	also with the feature flags variant we could still have the "controbutor didn't realize this needs staging, let's retarget with a couple clicks" convenience by having CI detect PRs targeting a staging branch, automatically push the generated staging commit, and retarget back to master	18:33:34
emily	which also means that if you're doing a simple non-conflicting staging change you don't need to run any script locally at all and can just send a PR to staging as you do now	18:34:02
emily	the script doesn't have to be perfect because it's just a convenience and doesn't have to be in the trusted code base, it can get away with just handling the common cases	18:35:18
16 Feb 2026
	zimward changed their display name from zimward to zim.	13:49:45
	zimward changed their display name from zim to zimward.	13:50:49
	pneumatic changed their profile picture.	15:18:01
vcunat	NixOS tests on `staging-next` still look pretty bad: https://hydra.nixos.org/eval/1822920#tabs-now-fail	20:04:49
hexa	oh, super cool	20:10:16
hexa	machine # building '/nix/store/y84saga4qsmk7xrprd0qv8rgdqjk67g1-bash-5.3.tar.gz.drv'... machine # waiting for lock on '/nix/store/kwm524zjlnnq4yfhhmb5r14f2wxf8a2j-bash-5.3.tar.gz'... machine # waiting for lock on '/nix/store/vclnb6d6yja2m42pjw5jay5zinnh54y3-gcc-15.2.0.tar.xz'... machine # waiting for lock on '/nix/store/0avnvyc7pkcr4pjqws7hwpy87m6wlnjc-make-4.4.1.tar.gz'... machine # waiting for lock on '/nix/store/mdrv8znlgnysqzq1hnv46vi9jmnsc1bc-mpc-1.3.1.tar.gz'... machine # waiting for lock on '/nix/store/92vinq6gfq5afkjc870g6y301mmf1vqq-mpfr-4.2.2.tar.xz'... machine # waiting for lock on '/nix/store/jwcvma555nknfdxvfbbkg489wminmr1w-tar-1.12.tar.gz'... machine # warning: error: unable to download 'https://ftpmirror.gnu.org/bash/bash-5.3.tar.gz': Could not resolve hostname (6) Could not resolve host: ftpmirror.gnu.org; retrying in 310 ms machine # warning: error: unable to download 'https://ftpmirror.gnu.org/bash/bash-5.3.tar.gz': Could not resolve hostname (6) Could not resolve host: ftpmirror.gnu.org; retrying in 543 ms machine # warning: error: unable to download 'https://ftpmirror.gnu.org/bash/bash-5.3.tar.gz': Could not resolve hostname (6) Could not resolve host: ftpmirror.gnu.org; retrying in 1184 ms machine # warning: error: unable to download 'https://ftpmirror.gnu.org/bash/bash-5.3.tar.gz': Could not resolve hostname (6) Could not resolve host: ftpmirror.gnu.org; retrying in 2640 ms machine # error: machine # … writing file '/nix/store/kwm524zjlnnq4yfhhmb5r14f2wxf8a2j-bash-5.3.tar.gz' machine # machine # error: unable to download 'https://ftpmirror.gnu.org/bash/bash-5.3.tar.gz': Could not resolve hostname (6) Could not resolve host: ftpmirror.gnu.org machine # waiting for lock on '/nix/store/slpdqm3wlhwbkzyijjz3xpifa219ac0x-bzip2-1.0.8.tar.gz'... machine # waiting for lock on '/nix/store/4if50hvp9yp7xal62nn5sz9cql8pf6cr-findutils-4.10.0.tar.xz'... machine # waiting for lock on '/nix/store/6zxixmszg0vbhpaa8rxwfr05by9axj68-glibc-2.42.tar.xz'... machine # waiting for lock on '/nix/store/0avnvyc7pkcr4pjqws7hwpy87m6wlnjc-make-4.4.1.tar.gz'... machine # waiting for lock on '/nix/store/a2i83vprqrd9nkr116yy1ksrwz5y1vq9-sed-4.9.tar.xz'... machine # building '/nix/store/k34j4cx3wl05cdr885s84h0pw1wr2fvn-Python-3.13.12.tar.xz.drv'... machine # error: Cannot build '/nix/store/y84saga4qsmk7xrprd0qv8rgdqjk67g1-bash-5.3.tar.gz.drv'. machine # Reason: builder failed with exit code 1. machine # Output paths: machine # /nix/store/kwm524zjlnnq4yfhhmb5r14f2wxf8a2j-bash-5.3.tar.gz	20:10:29
hexa	I always forget what causes these	20:10:50
hexa	especially surprised for bash here	20:11:14
K900	It tries to build something that it doesn't have	20:14:54
K900	And then it just recurses down to building stdenv	20:15:00

There are no newer messages yet.

Back to Room ListRoom Version: 6