| 5 Oct 2021 |
lukegb (he/him) | I'm going to try to get my cacerts changes in before we open the next cycle too | 14:25:45 |
Vladimír Čunát | There could be a 21.05 cycle, too. | 14:28:26 |
Vladimír Čunát | * There could be a 21.05 cycle, too? | 14:28:30 |
lukegb (he/him) | I haven't been opening the 21.05 cycles, but we probably should do one if there are outstanding changes | 14:29:19 |
lukegb (he/him) | (oops) | 14:29:29 |
sterni | Vladimír Čunát: the Haskell changes I mentioned probably won't happen anymore for 21.05, so no need to wait for that | 14:30:27 |
sterni | I thought I could get them done and do a cycle, but there are some blocking concerns, so sadly didn't pan out | 14:31:03 |
hexa | In reply to @lukegb:zxcvbnm.ninja I haven't been opening the 21.05 cycles, but we probably should do one if there are outstanding changes will do | 14:49:20 |
hexa | ❯ git merge origin/staging-21.05
Updating 4c04a989b34..c031c9869f3
Fast-forward
pkgs/development/libraries/ffmpeg/4.nix | 10 ++++++++++
pkgs/development/libraries/qt-5/modules/qtbase.nix | 2 ++
2 files changed, 12 insertions(+)
| 14:50:03 |
hexa | smol staging run 🙂 | 14:50:21 |
hexa | Redacted or Malformed Event | 14:52:47 |
sterni | you mean https://github.com/NixOS/nixpkgs/pull/140623, right? | 15:16:19 |
lukegb (he/him) | hrm | 15:19:48 |
lukegb (he/him) | the size of the build is a bit pointless | 15:19:54 |
lukegb (he/him) | but never mind | 15:19:56 |
lukegb (he/him) | there's two PRs, basically, and one of them just enables parallel building on qt5.qtbase | 15:20:58 |
lukegb (he/him) | the ffmpeg one is more interesting | 15:21:07 |
hexa | pretty sure they cause quite some rebuilds | 15:58:51 |
hexa | so all is well | 15:59:14 |
lukegb (he/him) | Yeah, I was mostly commenting that doing a large rebuild to enable parallel builds of qt5.qtbase is a bit pointless in terms of backporting it :p | 16:16:28 |
Alyssa Ross | should we maybe make the merge action less frequent for stable staging/release branches? almost all of the commits in staging-next-21.05 are automatic merge commits. | 17:47:48 |
sterni | there's one that merges daily, moving it to that workflow should be fairly straightforward | 17:48:53 |
Alyssa Ross | even daily feels like it might be a bit much for stable's volume -- weekly? | 17:49:29 |
Vladimír Čunát | Daily for the staging - - master triple sounds nice to me. | 18:15:19 |
Sandro | I think reducing the merge PRs for release-staging is a good idea but not for normal staging. It will probably cause more merge conflicts. | 18:27:24 |
hexa | working on it | 18:51:15 |
hexa | https://github.com/NixOS/nixpkgs/pull/140663 | 18:55:49 |
trofi | Cross-posting from "Nix* documentation" here as well as it directly touches staging: https://github.com/NixOS/nixpkgs/pull/138052 . WDYT? Does it match your understanding? | 20:23:50 |
| 6 Oct 2021 |
| Rosario Pulella changed their display name from rosariopulella to Rosuavio. | 10:38:31 |
| Rosario Pulella changed their display name from Rosuavio to Rosario Pulella. | 10:44:57 |