Merge staging-next into staging

Author: nixpkgs-ci[bot]

nixos/modules/services/display-managers/gdm.nix

@@ -169,6 +169,16 @@ in
         '';
       };
 
+      extraPackages = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
+        default = [ ];
+        example = lib.literalExpression "[ pkgs.gnome-themes-extra ]";
+        description = ''
+          Additional packages to add to XDG_DATA_DIRS for GDM.
+          The `/share` directory of each package will be added to the data path.
+        '';
+      };
+
     };
 
   };
@@ -221,13 +231,16 @@ in
         enable = true;
         environment = {
           GDM_X_SERVER_EXTRA_ARGS = toString (lib.filter (arg: arg != "-terminate") xdmcfg.xserverArgs);
-          XDG_DATA_DIRS = lib.makeSearchPath "share" [
-            gdm # for gnome-login.session
-            config.services.displayManager.sessionData.desktops
-            pkgs.gnome-control-center # for accessibility icon
-            pkgs.adwaita-icon-theme
-            pkgs.hicolor-icon-theme # empty icon theme as a base
-          ];
+          XDG_DATA_DIRS = lib.makeSearchPath "share" (
+            [
+              gdm # for gnome-login.session
+              config.services.displayManager.sessionData.desktops
+              pkgs.gnome-control-center # for accessibility icon
+              pkgs.adwaita-icon-theme
+              pkgs.hicolor-icon-theme # empty icon theme as a base
+            ]
+            ++ cfg.extraPackages
+          );
         }
         // lib.optionalAttrs (xSessionWrapper != null) {
           # Make GDM use this wrapper before running the session, which runs the

pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix

@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin rec {
   pname = "rainbow-delimiters.nvim";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitLab {
     owner = "HiPhish";
     repo = "rainbow-delimiters.nvim";
     tag = "v${version}";
-    hash = "sha256-zQgnNN8QvboOHWaMcLw1uRt/9AxV1asvTnpCcJ/qVS4=";
+    hash = "sha256-q4cBvF8d5h+BM1LTm5aq02OBVmwSUb9rC1smHlxbRzg=";
   };
 
   nvimSkipModules = [

pkgs/build-support/node/import-npm-lock/default.nix

@@ -53,9 +53,17 @@ let
                 // fetcherOpts
               ))
             else if lib.hasPrefix "git" module.resolved then
+              let
+                url = elemAt mUrl 1;
+                urlParts = lib.splitString "#" url;
+                commit = if builtins.length urlParts == 2 then elemAt urlParts 1 else null;
+              in
               (fetchGit (
                 {
-                  url = module.resolved;
+                  url = "${scheme}://${elemAt urlParts 0}";
+                }
+                // lib.optionalAttrs (commit != null) {
+                  rev = commit;
                 }
                 // fetcherOpts
               ))

pkgs/by-name/al/alfis/package.nix

@@ -5,30 +5,35 @@
   fetchFromGitHub,
   pkg-config,
   makeWrapper,
+  libayatana-appindicator,
   webkitgtk_4_1,
+  xdotool,
   zenity,
   withGui ? true,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alfis";
-  version = "0.8.8";
+  version = "0.8.9";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gRk4kvIV+5cCUFaJvGbTAR44678Twa28iMGZ75lJz2c=";
+    hash = "sha256-r3QIj9/Qv6y7qWltIjh1WCAZyFKMK2aN4vCsAUJB6PQ=";
   };
 
-  cargoHash = "sha256-Ge0+7ClXlJFT6CyluHF7k4stsX+KuYp/riro1pvrcKM=";
+  cargoHash = "sha256-lOSGZIGztZumt/cymMNyBoBl6objrS8F5Nkk1e7T9NE=";
 
   nativeBuildInputs = [
     pkg-config
     makeWrapper
   ];
 
-  buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_1;
+  buildInputs = lib.optionals (withGui && stdenv.hostPlatform.isLinux) [
+    webkitgtk_4_1
+    xdotool
+  ];
 
   buildNoDefaultFeatures = true;
   buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui";
@@ -39,6 +44,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=dns::client::tests::test_udp_client"
   ];
 
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+  '';
+
   postInstall = lib.optionalString (withGui && stdenv.hostPlatform.isLinux) ''
     wrapProgram $out/bin/alfis \
       --prefix PATH : ${lib.makeBinPath [ zenity ]}

pkgs/by-name/cl/clickhouse/package.nix

@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "26.2.4.23-stable";
-  rev = "94012846cb561e16e733935e23aceaea30f4b367";
-  hash = "sha256-Tkt8RcuXCYGy6wAbdlt2rI1eT1zMMtbposBv4T5efb4=";
+  version = "26.2.5.45-stable";
+  rev = "9ca62f3f68fd635f4b56171568d75588b13b6258";
+  hash = "sha256-qzY3nFbLvKVJaIfXgNliAvAmO8dzEWNKf4o8HfZYyZA=";
   lts = false;
 }

pkgs/by-name/cl/clouddrive2/package.nix

@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-Y7KC7gS0YsuyR0Icf6wOSocWMV/BhCOo5A3CivsEcFE=";
-        aarch64-linux = "sha256-sAGrW4x9iFxb65z4FFeNBtI9Fw6HnMG7qtWC/4WBmHI=";
-        x86_64-darwin = "sha256-9VX/zZFNWbr4aRLdg970f0d5aUuSjU0SU2DWIn/25TY=";
-        aarch64-darwin = "sha256-Obff5qaMiUiec53/pVBk+IRci9zaUfRpWPDmP8Oufeo=";
+        x86_64-linux = "sha256-hDhROf+HoDhnfgFteN9DZp9KB8YW8OJtkMLJ32ZGevQ=";
+        aarch64-linux = "sha256-3JCIeJ51prF/Vep3VthBx+ZglR8Rlc2FjATT1bM+p+A=";
+        x86_64-darwin = "sha256-/q3a9RGrG5dwkyJjw4LhT0myIJFV38anzeDk7KIJ3eg=";
+        aarch64-darwin = "sha256-eK/Gnd1/v3Ye5SoXp9gOmu5agNMeUbO/s9cU4VAyAMA=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

pkgs/by-name/co/comaps/package.nix

@@ -4,6 +4,7 @@
   fetchurl,
   fetchFromCodeberg,
   boost,
+  expat,
   gtest,
   glm,
   gflags,
@@ -16,16 +17,16 @@
 }:
 let
   # https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
-  mapRev = 250906;
+  mapRev = 260321;
 
   worldMap = fetchurl {
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
-    hash = "sha256-0LjCDVk3vShmn+yHc/SvfJzrj170pO52CqbdKWqTsI4=";
+    hash = "sha256-pMmzPcWbS9drQzJCfiac2dfSMihiHDfhFyG5ux0pG54=";
   };
 
   worldCoasts = fetchurl {
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
-    hash = "sha256-2BP6ET8DM3v0KMlzYx+lS0l26WSONQpb4fCMri8Aj2o=";
+    hash = "sha256-5LI6itC6LhprVfgGbT/HYy1lzZLZLUe2QoSil0/7kIc=";
   };
 
   pythonEnv = python3.withPackages (
@@ -36,18 +37,17 @@ let
 in
 organicmaps.overrideAttrs (oldAttrs: rec {
   pname = "comaps";
-  version = "2025.11.07-2";
+  version = "2026.03.23-5";
 
   src = fetchFromCodeberg {
     owner = "comaps";
     repo = "comaps";
     tag = "v${version}";
-    hash = "sha256-m1YOA24Avoia6YMXKcsuCdPwzxdn7Qc3kZLXGsWjTbs=";
+    hash = "sha256-1bD0QiEZu6nB7wwBpfpEf+WypqbOd9XuXbq7FDTL7bw=";
     fetchSubmodules = true;
   };
 
   patches = [
-    ./remove-lto.patch
     ./use-vendored-protobuf.patch
 
     # Include missing editor_tests_support.
@@ -59,8 +59,8 @@ organicmaps.overrideAttrs (oldAttrs: rec {
     substituteInPlace configure.sh \
       --replace-fail "git submodule update --init --recursive --depth 1" ""
 
-    patchShebangs tools/unix/generate_categories.sh
-    substituteInPlace tools/python/categories/json_to_txt.py \
+    patchShebangs tools/unix/*
+    substituteInPlace tools/python/{categories/json_to_txt.py,generate_desktop_ui_strings.py} \
       --replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"
   '';
 
@@ -71,6 +71,7 @@ organicmaps.overrideAttrs (oldAttrs: rec {
 
   buildInputs = (oldAttrs.buildInputs or [ ]) ++ [
     boost
+    expat
     gtest
     gflags
     glm

pkgs/by-name/co/comaps/remove-lto.patch

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpp-utilities";
-  version = "5.33.0";
+  version = "5.34.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "cpp-utilities";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Xoy/Q5EQAEeP19R65xyXu46kC9hbS/Vr4ucfpeRlzH0=";
+    sha256 = "sha256-lwrGPWRzCmOP4xeMH4ruLJfVaYXKc//WRFBSmKQ2iw0=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/cp/cpp-utilities/package.nix

@@ -159,7 +159,7 @@ buildDotnetModule (finalAttrs: {
 
   # tests fail with sandboxing under darwin
   __darwinAllowLocalNetworking = true;
-  __noChroot = true;
+  __noChroot = stdenv.hostPlatform.isDarwin;
 
   # Fully qualified name of disabled tests
   disabledTests = [