| 24 Nov 2025 |
Vladimír Čunát | Current staging won't reach 25.11, though. | 09:29:00 |
ghpzin | gcc15 by default won't either, right | 09:32:06 |
ghpzin | * gcc15 by default won't either, right ? | 09:32:12 |
Vladimír Čunát | Correct. It was purposefully delayed past the branching point. | 09:34:54 |
Vladimír Čunát | (so that disruptive changes don't land closely before stable release) | 09:35:14 |
Vladimír Čunát | New staging-next-25.05 I guess then: https://github.com/NixOS/nixpkgs/pull/464512 | 09:44:40 |
K900 | Started a new eval on unstable-small to pick up the kernel updates | 11:43:30 |
Alyssa Ross | New GTK release with more Vulkan fixes: https://gitlab.gnome.org/GNOME/gtk/-/compare/4.21.2...4.21.3?from_project_id=665 | 17:11:25 |
Alyssa Ross | Not sure if important. | 17:11:52 |
Vladimír Čunát | We don't have 4.21 | 17:13:00 |
K900 | 4.21 is a development branch | 17:12:13 |
Alyssa Ross | ah okay | 17:13:09 |
Vladimír Čunát | They're still using the even-odd scheme. | 17:13:08 |
Vladimír Čunát | Probably the same changes, just merged into the testing branch. | 17:13:23 |
| André Lima set a profile picture. | 21:10:21 |
| 26 Nov 2025 |
| Mindavi joined the room. | 09:57:14 |
Marcus | When is the next merge to master planned? | 16:55:59 |
leona | staging-next-25.05 should probably merge in 5-7 days | 16:58:03 |
Marcus | no, I'm talking about unstable | 16:58:16 |
leona | probably more like 4-5 weeks (when 25.11 is next) | 16:58:37 |
leona | * probably more like 5-6 weeks (when 25.11 is next) | 16:59:06 |
leona | and it can be even longer when the staging-next cycle is difficult (and that is likely because it will have multiple complicated things) | 16:59:58 |
leona | * and it can be even longer when the staging-next cycle is difficult (and that is likely because it will (probably) have multiple complicated things) | 17:00:09 |
Marcus | I guess I'm confused about how this works. I assumed that when 25.11 was forked off from master, master would start getting the changes from staging that won't be present in the release again. | 17:03:53 |
K900 | Yes, but staging is done on one branch at a time | 17:04:30 |
K900 | So right now it's building staging-25.05 | 17:04:34 |
K900 | Next will be staging-25.11 | 17:04:37 |
K900 | And then staging-next (for master) | 17:04:41 |
leona | no, staging is for large (and sometimes even world rebuilding) packages, it's just that staging is earlier unrestricted for breaking changes | 17:05:02 |
leona | at some point there will be a merge staging (via staging-next) -> master, but this depends on hydra building everything | 17:05:25 |