| 28 Dec 2025 |
K900 | There's a merge conflict in cppnix expressions on master and staging-nixos | 19:49:49 |
K900 | And I'm pretty sure this means a PR was merged to master that should have gone to staging-nixos | 19:49:59 |
eveeifyeve | Do you know what pr exactly caused this issue? | 20:10:29 |
eveeifyeve | * Do you know what pr exactly caused this issue?
Because I am thinking it might be https://github.com/NixOS/nix/pull/14646 | 20:10:50 |
eveeifyeve | * Do you know what pr exactly caused this issue?
Because I am thinking it might be https://github.com/NixOS/nix/pull/14646 | 20:11:20 |
Sergei Zimmerman (xokdvium) | Just the 2.29 drop on master and mdbook added a patch, but 2.29 is not used by anything so that's ok straight to master | 20:13:37 |
Sergei Zimmerman (xokdvium) | Eh, this is about nixpkgs, not nix repo | 20:14:12 |
eveeifyeve | Oh then why is it here? | 20:14:32 |
Sergei Zimmerman (xokdvium) | Anything I can help with? Just dropping 2.29 on staging-nixos is fine | 20:15:10 |