Merge staging-next into staging

Author: nixpkgs-ci[bot]

ci/eval/compare/maintainers.nix

@@ -96,6 +96,8 @@ let
     (lib.filter (path: lib.length path > 3))
     (map (path: lib.elemAt path 3))
     (map lib.singleton)
+    # Filter out new packages
+    (lib.filter (attrPath: lib.hasAttrByPath attrPath pkgs))
   ];
 
   # An attribute can appear in affected *and* touched

ci/eval/compare/test.nix

@@ -138,6 +138,21 @@ let
         ];
       };
     };
+    testByNameNonExistentChanged = {
+      expr = fun {
+        pkgs = mockPkgs {
+          packages = [ ];
+        };
+        # Happens when a new package was added to pkgs/by-name
+        changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
+        affectedAttrPaths = [ ];
+      };
+      expected = {
+        packages = [ ];
+        teams = { };
+        users = { };
+      };
+    };
     testByNameReadmeChanged = {
       expr = fun {
         pkgs = mockPkgs {

maintainers/maintainer-list.nix

@@ -2021,6 +2021,12 @@
     name = "Austin Lund";
     keys = [ { fingerprint = "7083 E268 4BFD 845F 2B84  9E74 B695 8918 ED23 32CE"; } ];
   };
+  aporro = {
+    email = "git@aporro.dev";
+    github = "aporro1";
+    githubId = 124402746;
+    name = "Apollon Tsikas";
+  };
   appleboblin = {
     email = "github@appleboblin.com";
     github = "appleboblin";

nixos/doc/manual/redirects.json

@@ -718,12 +718,6 @@
   "module-services-suwayomi-server-extra-config": [
     "index.html#module-services-suwayomi-server-extra-config"
   ],
-  "module-services-immich": [
-    "index.html#module-services-immich"
-  ],
-  "module-services-immich-vectorchord-migration": [
-    "index.html#module-services-immich-vectorchord-migration"
-  ],
   "module-services-paisa": [
     "index.html#module-services-paisa"
   ],

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

@@ -382,7 +382,7 @@
 
 - `linux_libre` & `linux_latest_libre` have been removed due to a lack of maintenance.
 
-- Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](#module-services-immich-vectorchord-migration).
+- Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/web-apps/immich.md#migrating-from-pgvecto-rs-to-vectorchord-pre-2511-installations-module-services-immich-vectorchord-migration).
 
 - It is now possible to configure the default source address using the new options [networking.defaultGateway.source](#opt-networking.defaultGateway.source),
   [networking.defaultGateway6.source](#opt-networking.defaultGateway6.source).

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

@@ -78,6 +78,8 @@
 
 - [Drasl](https://github.com/unmojang/drasl), an alternative authentication server for Minecraft. Available as [services.drasl](#opt-services.drasl.enable).
 
+- [tabbyAPI](https://github.com/theroyallab/tabbyAPI), the official OpenAI compatible API server for Exllama. Available as [services.tabbyapi](#opt-services.tabbyapi.enable).
+
 ## Backward Incompatibilities {#sec-release-26.05-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -136,6 +138,10 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 
 - Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
 
+- `services.immich` no longer supports pgvecto.rs since the package has been removed from nixpkgs.
+  As a result, options `services.immich.database.enableVectors` and `services.immich.database.enableVectorchord` have been removed, and VectorChord is now always used.
+  If you have not completed the migration yet, ensure you completely remove the extension from your database before upgrading by following the [migration guide](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/web-apps/immich.md#migrating-from-pgvecto-rs-to-vectorchord-pre-2511-installations-module-services-immich-vectorchord-migration).
+
 - `services.cgit` before always had the git-http-backend and its "export all" setting enabled, which sidestepped any access control configured in cgit's settings. Now you have to make a decision and either enable or disable `services.cgit.gitHttpBackend.checkExportOkFiles` (or disable the git-http-backend).
 
 - `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated.

nixos/modules/module-list.nix

@@ -365,6 +365,8 @@
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
   ./programs/xppen.nix
+  ./programs/xscreensaver/sonar.nix
+  ./programs/xscreensaver/xscreensaver.nix
   ./programs/xss-lock.nix
   ./programs/xwayland.nix
   ./programs/yazi.nix
@@ -1771,6 +1773,7 @@
   ./services/web-apps/strfry.nix
   ./services/web-apps/suwayomi-server.nix
   ./services/web-apps/szurubooru.nix
+  ./services/web-apps/tabbyapi.nix
   ./services/web-apps/trilium.nix
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/tuliprox.nix

nixos/modules/programs/foot/default.nix

@@ -75,13 +75,16 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment = {
-      systemPackages = [ cfg.package ];
-      etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
-
-      etc."xdg/autostart/foot-server.desktop".source =
-        lib.mkIf cfg.xdg.serverAutostart "${cfg.package}/share/applications/foot-server.desktop";
-    };
+    environment = lib.mkMerge [
+      {
+        systemPackages = [ cfg.package ];
+        etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
+      }
+      (lib.mkIf cfg.xdg.serverAutostart {
+        etc."xdg/autostart/foot-server.desktop".source =
+          "${cfg.package}/share/applications/foot-server.desktop";
+      })
+    ];
 
     programs = {
       foot.settings.main.include = lib.optionals (cfg.theme != null) [

nixos/modules/programs/xscreensaver/sonar.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.programs.xscreensaver.sonar;
+  globalCfg = config.programs.xscreensaver;
+in
+{
+  options.programs.xscreensaver.sonar = {
+    enable = lib.mkEnableOption "xscreensaver";
+  };
+  config = lib.mkIf cfg.enable {
+    security.wrappers.sonar = {
+      capabilities = "cap_net_raw+ep";
+      owner = "root";
+      group = "root";
+      source = pkgs.writeShellScript "sonar-fakeroot" ''
+        exec ${lib.getExe pkgs.fakeroot} ${globalCfg.package}/libexec/xscreensaver/sonar "$@"
+      '';
+    };
+  };
+}

nixos/modules/programs/xscreensaver/xscreensaver.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.programs.xscreensaver;
+in
+{
+  options.programs.xscreensaver = {
+    enable = lib.mkEnableOption "all of the xscreensaver programs";
+    package = lib.mkPackageOption pkgs "xscreensaver" { };
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    programs.xscreensaver.sonar.enable = true;
+  };
+}