Merge master into staging-next

Author: nixpkgs-ci[bot]

doc/build-helpers/fetchers.chapter.md

@@ -505,8 +505,8 @@ fetchurl {
 
   downloadToTemp = true;
   postFetch = ''
-    ${lib.getExe hello} >> $downloadedFile
-    mv $downloadedFile $out
+    hello >> "$downloadedFile"
+    mv "$downloadedFile" "$out"
   '';
 
   hash = "sha256-ceooQQYmDx5+0nfg40uU3NNI2yKrixP7HZ/xLZUNv+w=";

doc/release-notes/rl-2511.section.md

@@ -157,8 +157,6 @@
 
 - Zig 0.12 has been removed.
 
-- `services.forgejo.dump.age` now defaults to `4w`, which deletes dumps older than 4 weeks. This new behaviour could result in older backups being deleted.
-
 - `ansible-later` has been removed because it was discontinued by the author.
 
 - `k3s` airgap images passthru attributes have changed:

maintainers/scripts/update-channel-branches.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-: ${NIXOS_CHANNELS:=https://nixos.org/channels/}
+: ${NIXOS_CHANNELS:=https://channels.nixos.org/}
 : ${CHANNELS_NAMESPACE:=refs/heads/channels/}
 
 # List all channels which are currently in the repository which we would

nixos/doc/manual/development/replace-modules.section.md

@@ -37,7 +37,7 @@ nixos-unstable unless explicitly configured to do so.
 
   imports = [
     # Use postgresql service from nixos-unstable channel.
-    # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
+    # sudo nix-channel --add https://channels.nixos.org/nixos-unstable nixos-unstable
     <nixos-unstable/nixos/modules/services/databases/postgresql.nix>
   ];
 

nixos/doc/manual/installation/installing-from-other-distro.section.md

@@ -35,14 +35,14 @@ The first steps to all these are the same:
 
     ```ShellSession
     $ nix-channel --list
-    nixpkgs https://nixos.org/channels/nixpkgs-unstable
+    nixpkgs https://channels.nixos.org/nixpkgs-unstable
     ```
 
     As that channel gets released without running the NixOS tests, it
     will be safer to use the `nixos-*` channels instead:
 
     ```ShellSession
-    $ nix-channel --add https://nixos.org/channels/nixos-<version> nixpkgs
+    $ nix-channel --add https://channels.nixos.org/nixos-<version> nixpkgs
     ```
 
     Where `<version>` corresponds to the latest version available on [channels.nixos.org](https://channels.nixos.org/).

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

@@ -39,7 +39,7 @@ Notable changes and additions for 18.09 include:
   For example
 
   ```ShellSession
-  $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable
+  $ nix-channel --add https://channels.nixos.org/nixpkgs-unstable nixpkgsunstable
   $ nix-channel --update
   $ nix-build '<nixpkgsunstable>' -A gitFull
   $ nix run -f '<nixpkgsunstable>' gitFull

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

@@ -242,6 +242,8 @@
 - The non-LTS Forgejo package (`forgejo`) has been updated to 12.0.0. This release contains breaking changes, see the [release blog post](https://forgejo.org/2025-07-release-v12-0/)
   for all the details and how to ensure smooth upgrades.
 
+- `services.forgejo.dump.age` now defaults to `4w`, which deletes dumps older than 4 weeks. This new behaviour could result in older backups being deleted.
+
 - `sing-box` has been updated to 1.12.3, which includes a number of breaking changes, old configurations may need updating or they will cause the tool to fail to run.
   See the [change log](https://sing-box.sagernet.org/changelog/#1123) for details and [migration](https://sing-box.sagernet.org/migration/#1120) for how to update old configurations.
 

nixos/modules/services/continuous-integration/gitlab-runner.nix

@@ -318,7 +318,7 @@ in
 
               ''${pkgs.nix}/bin/nix-env -i ''${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
 
-              ''${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+              ''${pkgs.nix}/bin/nix-channel --add https://channels.nixos.org/nixpkgs-unstable
               ''${pkgs.nix}/bin/nix-channel --update nixpkgs
             ''';
             environmentVariables = {

nixos/modules/services/web-apps/code-server.nix

@@ -232,6 +232,9 @@ in
         + lib.optionalString (cfg.socket != null) ''
           --socket=${cfg.socket} \
         ''
+        + lib.optionalString (cfg.socketMode != null) ''
+          --socket-mode=${cfg.socketMode} \
+        ''
         + lib.optionalString (cfg.userDataDir != null) ''
           --user-data-dir=${cfg.userDataDir} \
         ''

nixos/modules/services/x11/display-managers/lightdm.nix

@@ -156,7 +156,7 @@ in
       };
 
       background = mkOption {
-        type = types.either types.path (types.strMatching "^#[0-9]{6}$");
+        type = types.either types.path (types.strMatching "^#[0-9A-Fa-f]{6}$");
         # Manual cannot depend on packages, we are actually setting the default in config below.
         defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath";
         description = ''