| 21 Nov 2023 |
 Ilan Joselevich (Kranzes) | * You're right. (Animals are just so much more interesting than this weird "computers" thing) | 19:45:03 |
 raitobezarius | Yep, we agreed to merge it anyway and we forgot about it | 19:45:31 |
 Vladimír Čunát | In reply to @lily:lily.flowers
is backport label not ready yet? * I don't want 300 cherry-picked commits. | 19:45:36 |
| raitobezarius | So please proceed with the first PR towards that | 19:45:37 |
 Lily Foster | In reply to @vcunat:matrix.org
I don't want 300 cherry-picked commits. ah, i misunderstood your earlier statement then i suppose | 19:46:02 |
| Ilan Joselevich (Kranzes) | https://github.com/NixOS/nixpkgs/commit/87cc06983c14876bb56a6a84935d1a3968f35999
🎉 | 19:46:09 |
 Artturin | riot | 19:48:38 |
 lennart | the demos has spoken | 19:50:10 |
 adamcstephens | the naming of next release seems like an activity that could be done in advance :) | 19:50:36 |
| Vladimír Čunát | GNOME 45 merged to both branches ✅ | 19:50:47 |
 Philip Taron (UTC-8) | In reply to @vcunat:matrix.org
GNOME 45 merged to both branches ✅ Thank you so much for all the work done to make that work. | 19:51:15 |
| Philip Taron (UTC-8) | In reply to @vcunat:matrix.org
GNOME 45 merged to both branches ✅ * Thank you so much for all the work done to make that possible. | 19:51:23 |
| Ilan Joselevich (Kranzes) | I lobbied us into picking Tapir and now Uakari 😅 | 19:51:33 |
| Vladimír Čunát | In reply to @philiptaron:matrix.org
Thank you so much for all the work done to make that possible. It was others working on that branch really. I've done almost nothing there. | 19:51:57 |
| Philip Taron (UTC-8) | * Thank you all so much for all the work done to make that possible. | 20:07:43 |
| 22 Nov 2023 |
 hexa | staging-next-23.11 is still on the wrong base | 00:19:06 |
| hexa | I get mails for the backport action failing | 00:19:36 |
 figsoda | yeah we didnt have the permission | 00:19:39 |
| hexa |
diff --cc nixos/release.nix
index 0d23d42f7827,a1b4508ca40b..000000000000
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@@ -12,7 -12,7 +12,13 @@@ le
version = fileContents ../.version;
versionSuffix =
++<<<<<<< HEAD
+ (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount - 551050}.${nixpkgs.shortRev}";
++||||||| cdfc4c54b233
++ (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
++=======
+ (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 551362)}.${nixpkgs.shortRev}";
++>>>>>>> origin/release-23.11
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
| 00:19:44 |
| hexa | * diff --cc nixos/release.nix
index 0d23d42f7827,a1b4508ca40b..000000000000
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@@ -12,7 -12,7 +12,13 @@@ le
version = fileContents ../.version;
versionSuffix =
++<<<<<<< HEAD
+ (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount - 551050}.${nixpkgs.shortRev}";
++||||||| cdfc4c54b233
++ (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
++=======
+ (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 551362)}.${nixpkgs.shortRev}";
++>>>>>>> origin/release-23.11
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
| 00:19:54 |
| figsoda | should I cherry pick the commit into a pull request to avoid the force push? | 00:21:58 |
| hexa | The merge I could do myself as well | 00:22:27 |
| hexa | the question was whether you plan to kill the branch and push the new base | 00:22:47 |
| hexa | * the question is whether you plan to kill the branch and push the new base | 00:23:58 |
| figsoda | tbh its probably fine to just merge into the existing branch | 00:24:30 |
| figsoda | https://github.com/NixOS/nixpkgs/pull/269090 | 00:32:33 |
| figsoda | ooh looks like the check-by-name | 00:35:28 |
| figsoda | * https://github.com/NixOS/nixpkgs/pull/269091 | 00:35:35 |
| figsoda | ooh looks like the check-by-name action doesn't work until the channels are ready | 00:35:56 |
 infinisil | Ahh good point | 00:36:10 |
