Merge master into staging-next

ci/request-reviews/request-reviews.sh

@@ -60,10 +60,8 @@ git -C "$tmp/nixpkgs.git" remote add fork https://github.com/"$prRepo".git
 git -C "$tmp/nixpkgs.git" config remote.fork.partialclonefilter tree:0
 git -C "$tmp/nixpkgs.git" config remote.fork.promisor true
 
-# This should not conflict with any refs in Nixpkgs
-headRef=refs/remotes/fork/pr
-# Only fetch into a remote ref, because the local ref namespace is used by Nixpkgs, don't want any conflicts
-git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch":"$headRef"
+git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
+headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
 
 log "Checking correctness of the base branch"
 if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRepo" "$baseBranch" "$prRepo" "$prBranch" | tee "$tmp/invalid-base-error" >&2; then

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -643,6 +643,8 @@
   The derivation now installs "impl" headers selectively instead of by a wildcard.
   Use `imgui.src` if you just want to access the unpacked sources.
 
+- The new `boot.loader.systemd-boot.windows` option makes setting up dual-booting with Windows on a different drive easier
+
 - Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11
 
 - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an

nixos/modules/programs/gamemode.nix

@@ -2,7 +2,7 @@
 
 let
   cfg = config.programs.gamemode;
-  settingsFormat = pkgs.formats.ini { };
+  settingsFormat = pkgs.formats.ini { listsAsDuplicateKeys = true; };
   configFile = settingsFormat.generate "gamemode.ini" cfg.settings;
 in
 {

nixos/modules/services/web-apps/wakapi.nix

@@ -112,6 +112,7 @@ in
         RestrictNamespaces = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
+        StateDirectory = "wakapi";
         StateDirectoryMode = "0700";
         Restart = "always";
       };