From 75422624d9686d71129fae4c0d7ae5095ff7cc9a Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 23 Aug 2025 21:48:19 +0200 Subject: [PATCH] metadata: 0.1.9 -> 0.1.10 --- pkgs/by-name/me/metadata/package.nix | 31 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index 66a5eb55e29f..be00516bcb27 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -1,26 +1,26 @@ { lib, fetchFromGitHub, - fetchpatch, pkg-config, ffmpeg, rustPlatform, glib, installShellFiles, asciidoc, + versionCheckHook, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "metadata"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "zmwangx"; repo = "metadata"; - rev = "ec9614cfa64ffc95d74e4b19496ebd9b026e692b"; - hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wZ1wLygPFBFZsSYJGxNzYV+mXtbN68GY3nMYDFHPZHo="; }; - cargoHash = "sha256-CqPRhfhTAEXTXRAJ9T5gQZx5jAQmJXYPbfQmyXkO6Sk="; + cargoHash = "sha256-pWekXsjAhK4wyjf95nZO+Wj9PcH87D8vYsRFAE/w/sw="; nativeBuildInputs = [ pkg-config @@ -29,14 +29,6 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - cargoPatches = [ - (fetchpatch { - name = "update-crate-ffmpeg-next-version.patch"; - url = "https://github.com/myclevorname/metadata/commit/a1bc9f53d9aa0aeb17cbb530a1da1de4fdf85328.diff"; - hash = "sha256-LEwOK1UFUwLZhqLnoUor5CSOwz4DDjNFMnMOGq1S1Sc="; - }) - ]; - postBuild = '' a2x --doctype manpage --format manpage man/metadata.1.adoc ''; @@ -51,6 +43,15 @@ rustPlatform.buildRustPackage { env.FFMPEG_DIR = ffmpeg.dev; + checkFlags = [ + # "AAC (HE-AAC v2)" is reported as "AAC (LC)" in newer ffmpeg + # https://github.com/zmwangx/metadata/issues/13 + "--skip=aac_he_aac" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; maintainers = with lib.maintainers; [ ]; @@ -58,4 +59,4 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/zmwangx/metadata"; mainProgram = "metadata"; }; -} +})