From 7c10ed4cafdbea7ef393affbf6bb8696201f89b5 Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Tue, 28 Oct 2025 18:53:48 +0300 Subject: [PATCH] gst_all_1.gst-plugins-rs: 0.14.1 -> 0.14.2 --- .../libraries/gstreamer/rs/default.nix | 39 ++----------------- .../libraries/gstreamer/rs/ignore-tests.patch | 20 ---------- 2 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/rs/ignore-tests.patch diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 258644febdbe..46ecec7c2901 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, rustPlatform, meson, ninja, @@ -33,7 +32,6 @@ # Checks meson.is_cross_build(), so even canExecute isn't enough. enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null, hotdoc, - mopidy, apple-sdk_gstreamer, }: @@ -137,7 +135,7 @@ assert lib.assertMsg (invalidPlugins == [ ]) stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-rs"; - version = "0.14.1"; + version = "0.14.2"; outputs = [ "out" @@ -149,44 +147,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = finalAttrs.version; - 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' - \[\[package\]\] - name = "color-name" - version = "\([^"\n]*\)" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "[^"\n]*" - EOF - )" - sedReplace="$(cat <<\EOF | sed -ze 's/\n/\\n/g' - [[package]] - name = "color-name" - version = "\1" - source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a" - EOF - )" - sed -i -ze "s|$sedSearch|$sedReplace|g" $out/Cargo.lock - ''; + hash = "sha256-mIq8Fo6KoxAo1cL2NQHnSMPgzUWl1eNJUujdaerGjFA="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src patches; + inherit (finalAttrs) src; name = "gst-plugins-rs-${finalAttrs.version}"; - hash = "sha256-sX3P5qrG0M/vJkvzvJGzv4fcMn6FvrLPOUh++vKJ/gY="; + hash = "sha256-Z1mqpVL2SES1v0flykOwoDX2/apZHxg7eI5If4BsP4o="; }; - patches = [ - # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723 - ./ignore-tests.patch - (fetchpatch { - name = "x264enc-test-fix.patch"; - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/c0c9888d66e107f9e0b6d96cd3a85961c7e97d9a.diff"; - hash = "sha256-/ILdPDjI20k5l9Qf/klglSuhawmFUs9mR+VhBnQqsWw="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch deleted file mode 100644 index 52b231816ce8..000000000000 --- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs -index 3489eaa8..569635d6 100644 ---- a/utils/uriplaylistbin/tests/uriplaylistbin.rs -+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs -@@ -388,6 +388,7 @@ fn multi_audio() { - assert_eq!(current_uri_index, 2); - } - -+#[ignore = "Unknown failure"] - #[test] - fn multi_audio_video() { - let (_events, current_iteration, current_uri_index, eos) = test( -@@ -403,6 +404,7 @@ fn multi_audio_video() { - assert_eq!(current_uri_index, 1); - } - -+#[ignore = "Unknown failure"] - #[test] - fn iterations() { - let (_events, current_iteration, current_uri_index, eos) = test(