gst_all_1.gst-plugins-rs: 0.13.3 → 0.13.5

- Update https://gstreamer.freedesktop.org/releases/1.26/
- Format expression
- Do not take `pname` from `finalAttrs`

Jan Tojnar e2edab35 c5854a87

+123 -9
+26 -9
pkgs/development/libraries/gstreamer/rs/default.nix
··· 157 157 158 158 stdenv.mkDerivation (finalAttrs: { 159 159 pname = "gst-plugins-rs"; 160 - version = "0.13.3"; 160 + version = "0.13.5"; 161 161 162 162 outputs = [ 163 163 "out" ··· 169 169 owner = "gstreamer"; 170 170 repo = "gst-plugins-rs"; 171 171 rev = finalAttrs.version; 172 - hash = "sha256-G6JdZXBNiZfbu6EBTOsJ4Id+BvPhIToZmHHi7zuapnE="; 172 + hash = "sha256-5jR/YLCBeFnB0+O2OOCLBEKwikiQ5e+SbOeQCijnd8Q="; 173 173 # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2 174 174 postFetch = '' 175 175 sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' ··· 191 191 ''; 192 192 }; 193 193 194 - cargoDeps = 195 - with finalAttrs; 196 - rustPlatform.fetchCargoVendor { 197 - inherit src; 198 - name = "${pname}-${version}"; 199 - hash = "sha256-NFB9kNmCF3SnOgpSd7SSihma+Ooqwxtrym9Il4A+uQY="; 200 - }; 194 + cargoDeps = rustPlatform.fetchCargoVendor { 195 + inherit (finalAttrs) src patches; 196 + name = "gst-plugins-rs-${finalAttrs.version}"; 197 + hash = "sha256-ErQ5Um0e7bWhzDErEN9vmSsKTpTAm4MA5PZ7lworVKU="; 198 + }; 199 + 200 + patches = [ 201 + # Disable uriplaylistbin test that requires network access. 202 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/676 203 + # TODO: Remove in 0.14, it has been replaced by a different fix: 204 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140 205 + ./ignore-network-tests.patch 206 + 207 + # Fix reqwest tests failing due to broken TLS lookup in native-tls dependency. 208 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/675 209 + # Cannot be upstreamed due to MSRV bump in native-tls: 210 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2142 211 + ./reqwest-init-tls.patch 212 + ]; 201 213 202 214 strictDeps = true; 203 215 ··· 256 268 ''; 257 269 258 270 mesonCheckFlags = [ "--verbose" ]; 271 + 272 + preCheck = '' 273 + # Fontconfig error: No writable cache directories 274 + export XDG_CACHE_HOME=$(mktemp -d) 275 + ''; 259 276 260 277 doInstallCheck = 261 278 (lib.elem "webp" selectedPlugins) && !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf;
+12
pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch
··· 1 + diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs 2 + index dfd1c9ce..8ed24949 100644 3 + --- a/utils/uriplaylistbin/tests/uriplaylistbin.rs 4 + +++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs 5 + @@ -534,6 +534,7 @@ fn infinite_to_finite() { 6 + assert_eq!(current_uri_index, 0); 7 + } 8 + 9 + +#[ignore = "Requires network access"] 10 + #[test] 11 + /// cache HTTP playlist items 12 + fn cache() {
+85
pkgs/development/libraries/gstreamer/rs/reqwest-init-tls.patch
··· 1 + The reqwest tests fail due to reqwest Client initialization. 2 + Bisected the issue to https://github.com/sfackler/rust-native-tls/compare/v0.2.12...v0.2.13 bump 3 + in https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/6d5d9753f4a28be350dc657c08a9ecc7f13b922a 4 + the upcoming version of native-tls fixes that so let’s bump to that. 5 + https://github.com/sfackler/rust-native-tls/compare/v0.2.13...v0.2.14 6 + 7 + diff --git a/Cargo.lock b/Cargo.lock 8 + index 244256cd..24f0c607 100644 9 + --- a/Cargo.lock 10 + +++ b/Cargo.lock 11 + @@ -1700,7 +1700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 12 + checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" 13 + dependencies = [ 14 + "libc", 15 + - "windows-sys 0.59.0", 16 + + "windows-sys 0.52.0", 17 + ] 18 + 19 + [[package]] 20 + @@ -2149,7 +2149,7 @@ dependencies = [ 21 + "gobject-sys", 22 + "libc", 23 + "system-deps 7.0.3", 24 + - "windows-sys 0.59.0", 25 + + "windows-sys 0.52.0", 26 + ] 27 + 28 + [[package]] 29 + @@ -4407,7 +4407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 30 + checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" 31 + dependencies = [ 32 + "cfg-if", 33 + - "windows-targets 0.52.6", 34 + + "windows-targets 0.48.5", 35 + ] 36 + 37 + [[package]] 38 + @@ -4791,9 +4791,9 @@ dependencies = [ 39 + 40 + [[package]] 41 + name = "native-tls" 42 + -version = "0.2.13" 43 + +version = "0.2.14" 44 + source = "registry+https://github.com/rust-lang/crates.io-index" 45 + -checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" 46 + +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" 47 + dependencies = [ 48 + "libc", 49 + "log", 50 + @@ -5572,7 +5572,7 @@ dependencies = [ 51 + "once_cell", 52 + "socket2", 53 + "tracing", 54 + - "windows-sys 0.59.0", 55 + + "windows-sys 0.52.0", 56 + ] 57 + 58 + [[package]] 59 + @@ -6017,7 +6017,7 @@ dependencies = [ 60 + "errno", 61 + "libc", 62 + "linux-raw-sys", 63 + - "windows-sys 0.59.0", 64 + + "windows-sys 0.52.0", 65 + ] 66 + 67 + [[package]] 68 + @@ -6702,7 +6702,7 @@ dependencies = [ 69 + "getrandom 0.3.1", 70 + "once_cell", 71 + "rustix", 72 + - "windows-sys 0.59.0", 73 + + "windows-sys 0.52.0", 74 + ] 75 + 76 + [[package]] 77 + @@ -7523,7 +7523,7 @@ version = "0.1.9" 78 + source = "registry+https://github.com/rust-lang/crates.io-index" 79 + checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" 80 + dependencies = [ 81 + - "windows-sys 0.59.0", 82 + + "windows-sys 0.48.0", 83 + ] 84 + 85 + [[package]]