Merge staging-next into staging

pkgs/applications/misc/googleearth-pro/default.nix

···
   fontconfig,
   dpkg,
   libproxy,
-  libxml2,
+  libxml2_13,
   gst_all_1,
   dbus,
   makeWrapper,
···
       "amd64"
     else
       throw "Unsupported system ${stdenv.hostPlatform.system} ";
-
-  libxml2' = libxml2.overrideAttrs rec {
-    version = "2.13.8";
-    src = fetchurl {
-      url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-      hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-    };
-  };
 in
 mkDerivation rec {
   pname = "googleearth-pro";
···
     libXrender
     libproxy
     libxcb
-    libxml2'
+    libxml2_13
     sqlite
     zlib
     alsa-lib

pkgs/by-name/un/unityhub/package.nix

···
         xorg.libXcursor
         glib
         gdk-pixbuf
-        (libxml2.overrideAttrs (oldAttrs: rec {
-          version = "2.13.8";
-          src = fetchurl {
-            url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-            hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
-          };
-          meta = oldAttrs.meta // {
-            knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [
-              "CVE-2025-6021"
-            ];
-          };
-        }))
+        libxml2_13
         zlib
         clang
         git # for git-based packages in unity package manager

pkgs/development/libraries/gstreamer/rs/default.nix

···
     patches = (oldAttrs.patches or [ ]) ++ [
       (fetchpatch {
         name = "cargo-c-test-rlib-fix.patch";
-        url = "https://github.com/lu-zero/cargo-c/commit/8421f2da07cd066d2ae8afbb027760f76dc9ee6c.diff";
-        hash = "sha256-eZSR4DKSbS5HPpb9Kw8mM2ZWg7Y92gZQcaXUEu1WNj0=";
-        revert = true;
+        url = "https://github.com/lu-zero/cargo-c/commit/dd02009d965cbd664785149a90d702251de747b3.diff";
+        hash = "sha256-Az0WFF9fc5+igcV8C/QFhq5GE4PAyGEO84D9ECxx3v0=";
       })
     ];
   });
···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-rs";
-  version = "0.13.5";
+  version = "0.14.1";
 
   outputs = [
     "out"
···
     owner = "gstreamer";
     repo = "gst-plugins-rs";
     rev = finalAttrs.version;
-    hash = "sha256-5jR/YLCBeFnB0+O2OOCLBEKwikiQ5e+SbOeQCijnd8Q=";
+    hash = "sha256-gCT/ZcXR9VePXYtEENXxgBNvA84KT1OYUR8kSyLBzrI=";
     # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
     postFetch = ''
       sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
···
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
     name = "gst-plugins-rs-${finalAttrs.version}";
-    hash = "sha256-ErQ5Um0e7bWhzDErEN9vmSsKTpTAm4MA5PZ7lworVKU=";
+    hash = "sha256-sX3P5qrG0M/vJkvzvJGzv4fcMn6FvrLPOUh++vKJ/gY=";
   };
 
   patches = [
···
     # TODO: Remove in 0.14, it has been replaced by a different fix:
     # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140
     ./ignore-network-tests.patch
-
-    # Fix reqwest tests failing due to broken TLS lookup in native-tls dependency.
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/675
-    # Cannot be upstreamed due to MSRV bump in native-tls:
-    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2142
-    ./reqwest-init-tls.patch
   ];
 
   strictDeps = true;

pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch

···
-The reqwest tests fail due to reqwest Client initialization.
-Bisected the issue to https://github.com/sfackler/rust-native-tls/compare/v0.2.12...v0.2.13 bump
-in https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/6d5d9753f4a28be350dc657c08a9ecc7f13b922a
-the upcoming version of native-tls fixes that so let’s bump to that.
-https://github.com/sfackler/rust-native-tls/compare/v0.2.13...v0.2.14
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 244256cd..24f0c607 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1700,7 +1700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
- dependencies = [
-  "libc",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -2149,7 +2149,7 @@ dependencies = [
-  "gobject-sys",
-  "libc",
-  "system-deps 7.0.3",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -4407,7 +4407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
- dependencies = [
-  "cfg-if",
-- "windows-targets 0.52.6",
-+ "windows-targets 0.48.5",
- ]
- 
- [[package]]
-@@ -4791,9 +4791,9 @@ dependencies = [
- 
- [[package]]
- name = "native-tls"
--version = "0.2.13"
-+version = "0.2.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
-+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
- dependencies = [
-  "libc",
-  "log",
-@@ -5572,7 +5572,7 @@ dependencies = [
-  "once_cell",
-  "socket2",
-  "tracing",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -6017,7 +6017,7 @@ dependencies = [
-  "errno",
-  "libc",
-  "linux-raw-sys",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -6702,7 +6702,7 @@ dependencies = [
-  "getrandom 0.3.1",
-  "once_cell",
-  "rustix",
-- "windows-sys 0.59.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -7523,7 +7523,7 @@ version = "0.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
- dependencies = [
-- "windows-sys 0.59.0",
-+ "windows-sys 0.48.0",
- ]
- 
- [[package]]