| 26 Oct 2023 |
stigo | In reply to @vcunat:matrix.org BTW, next Monday is deadline for merging "breaking changes" to master or staging* (except exceptions), if they should be in 23.11. I feel rather good about the perl-updates branch, but notice that hydra has been seemingly stuck the last couple of days. | 11:58:22 |
stigo | I think it should be merged to staging sooner rather than later, unless I'm missing something. | 11:59:01 |
vcunat | It's been continuously building stuff. Just not very fast, but not much different than usually. | 11:59:14 |
vcunat | I created staging-next a couple hours ago, so if you think it's ready, it can still get merged in there: https://github.com/NixOS/nixpkgs/pull/263535 | 12:00:46 |
stigo | Would you like me to re-target the PR to staging-next? | 12:01:09 |
vcunat | Yes, if you're merging, switch the target in the UI before that. | 12:02:09 |
vcunat | (no git operation should be necessary) | 12:02:19 |
stigo | .. thankfully. I'm happy to remove my "upstreamWRITE" git remote | 12:03:00 |
vcunat | There's a conflict though. | 12:03:38 |
stigo | I'll merge in staging-next first | 12:03:52 |
stigo | * I'll merge in staging-next to perl-updates first and fix any issues | 12:04:03 |
@janne.hess:helsinki-systems.de | I can do a final review (and merge? If you don't want the honor for yourself ;) if you want to | 12:04:32 |
stigo | In reply to @janne.hess:helsinki-systems.de I can do a final review (and merge? If you don't want the honor for yourself ;) if you want to That would be great :) | 12:04:41 |
@janne.hess:helsinki-systems.de | Ping me once you have pushed ;) | 12:06:53 |
stigo | Conflicts resolved, going to do some sanity checks before pinging you Janne Heß | 12:10:33 |