Merge remote-tracking branch 'origin/staging-next' into staging

maintainers/maintainer-list.nix

@@ -7010,7 +7010,10 @@
     github = "ethancedwards8";
     githubId = 60861925;
     name = "Ethan Carter Edwards";
-    keys = [ { fingerprint = "0E69 0F46 3457 D812 3387  C978 F93D DAFA 26EF 2458"; } ];
+    keys = [
+      { fingerprint = "0E69 0F46 3457 D812 3387  C978 F93D DAFA 26EF 2458"; }
+      { fingerprint = "2E51 F618 39D1 FA94 7A73  00C2 34C0 4305 D581 DBFE"; }
+    ];
   };
   ethercrow = {
     email = "[email protected]";
@@ -25192,8 +25195,8 @@
   yuka = {
     email = "[email protected]";
     matrix = "@yuka:yuka.dev";
-    github = "yu-re-ka";
-    githubId = 86169957;
+    github = "yuyuyureka";
+    githubId = 193895068;
     name = "Yureka";
   };
   Yumasi = {

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

@@ -936,15 +936,16 @@ The `sound` options have been largely removed, as they are unnecessary for most
 
 If you set `sound.enable` in your configuration:
   - If you are using Pulseaudio or PipeWire, simply remove that option
-  - If you are not using an external sound server, and want volumes to be persisted across shutdowns, set `hardware.alsa.enablePersistence = true` instead
+  - If you are using ALSA as your only sound system (no sound server), set `hardware.alsa.enable = true` instead
 
 If you set `sound.enableOSSEmulation` in your configuration:
   - Make sure it is still necessary, as very few applications actually use OSS
-  - If necessary, set `boot.kernelModules = [ "snd_pcm_oss" ]`
+  - If necessary, set `hardware.alsa.enableOSSEmulation = true`
 
 If you set `sound.extraConfig` in your configuration:
-  - If you are using another sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that
-  - If you are not using an external sound server, set `environment.etc."asound.conf".text = yourExtraConfig` instead
+  - If you are using a sound server, like Pulseaudio, JACK or PipeWire, migrate your configuration to that
+  - If you are using ALSA as your only sound system, check if you can use the new structured ALSA options `hardware.alsa.defaultDevice`, `hardware.alsa.cardAliases`, `hardware.alsa.controls`, etc.
+  - Otherwise, move your configuration directly into `hardware.alsa.config`
 
 If you set `sound.mediaKeys` in your configuration:
   - Preferably switch to handling media keys in your desktop environment/compositor

nixos/modules/i18n/input-method/fcitx5.nix

@@ -117,9 +117,11 @@ in
     i18n.inputMethod.fcitx5.addons =
       lib.optionals (cfg.quickPhrase != { }) [
         (pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb" (
-          lib.mapAttrsToList (
-            name: value: "${name} ${builtins.replaceStrings [ "\\" "\n" ] [ "\\\\" "\\n" ] value}"
-          ) cfg.quickPhrase
+          lib.concatStringsSep "\n" (
+            lib.mapAttrsToList (
+              name: value: "${name} ${builtins.replaceStrings [ "\\" "\n" ] [ "\\\\" "\\n" ] value}"
+            ) cfg.quickPhrase
+          )
         ))
       ]
       ++ lib.optionals (cfg.quickPhraseFiles != { }) [