| 9 Dec 2025 |
 uep | * Ignoring merges from master for simplicity:
- things go into
staging all the time.. and wait there to batch up rebuilds
staging merges into staging-next and rebuilds run, periodicallystaging-next merges into master, via a manual PR at suitable timestaging-next doesn't go away, but has nothing "interesting" / new in it until the next time staging merges into it, it's basically a point in time on master for a while
| 03:03:35 |
| uep | the automated merges go from master to `staging-next | 04:09:17 |
| uep | * the automated merges go from master to staging-next to staging (picking up the fixes in staging-next along the way) to keep both branches up to date with all the leaf-package/small-rebuilds changes | 04:10:05 |
| uep | and so those changes meet the mass-rebuild deep-dependency changes waiting in staging/next, and can sometimes be broken by them there | 04:11:19 |
|  @adam:robins.wtf changed their profile picture. | 17:25:11 |
| @adam:robins.wtf changed their profile picture. | 17:48:31 |
| 10 Dec 2025 |
| @adam:robins.wtf changed their profile picture. | 14:49:53 |
|  @wolfgangwalther:matrix.org left the room. | 20:04:53 |
| 11 Dec 2025 |
|  Gnome! joined the room. | 11:21:11 |
| Gnome! | What is the process for getting staging merged into nixos-unstable-small? I'm waiting on pydantic-core to be bumped and I can see that it is in staging but there is no open PR from staging to go anywhere? | 11:26:17 |
 leona | staging goes via staging-next and needs to be (nearly) fully build by hydra before being merged to master. Currently we're doing staging-next-25.11 and staging-next will probably be next. So expect a few more weeks.
https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#staging gives some explanation | 11:28:50 |
| Gnome! | Ah, so the two PRs cannot run concurrently because of lack of compute resources? | 11:29:48 |
| leona | correct | 11:29:57 |
| Gnome! | Got it, thanks for the explanation. That was bit I was missing while reading the docs. | 11:31:14 |
| Gnome! | * Got it, thanks for the explanation. That was the bit I was missing while reading the docs. | 11:31:23 |
 Grimmauld (any/all) | lack of computation, and lack of maintainers | 11:31:44 |
| Grimmauld (any/all) | running staging needs some degree of babysitting | 11:31:52 |
 Vladimír Čunát | For staging-next-25.11 it's mostly waiting for days. | 11:32:22 |
| Grimmauld (any/all) | well, yes | 11:33:07 |
| Grimmauld (any/all) | but the unstable staging will be fin, there is gcc 15 in there | 11:33:18 |
| Grimmauld (any/all) | * but the unstable staging will be fun, there is gcc 15 in there | 11:33:24 |
 rosssmyth | Staging eval is currently broken
https://github.com/NixOS/nixpkgs/pull/467550#issuecomment-3642557728 | 16:43:14 |
 Marcus | So is staging-next only grub patches or am I reading this wrong? | 19:19:37 |
| Grimmauld (any/all) | staging-next is currently inactive, all the relevant stuff is in staging. If staging-next has things that are not in master right now, that is things that were merged to staging-next after the cycle was merged and is likely a mistake | 19:22:28 |
| Vladimír Čunát | Oh, weird
https://github.com/NixOS/nixpkgs/pull/463308 | 19:24:00 |
| Vladimír Čunát | 🤔 | 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 |
| Vladimír Čunát | Man, merge queue collision. | 19:25:59 |
