From a7e8873173553c07b5c1d569872d3572e3874c36 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 7 Jul 2025 18:53:13 +0200 Subject: [PATCH 1/2] tuxedo-rs: use versionCheckHook --- pkgs/by-name/tu/tuxedo-rs/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index 1d3d8be7b08a..33d151e363c6 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -2,8 +2,7 @@ lib, fetchFromGitHub, rustPlatform, - testers, - tuxedo-rs, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "tuxedo-rs"; @@ -24,11 +23,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-EkTLL7thZ/bBpY7TwfEsPOjJxzQ3vpxDi+sYPNAK6og="; - passthru.tests.version = testers.testVersion { - package = tuxedo-rs; - command = "${meta.mainProgram} --version"; - version = version; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = "--version"; postInstall = '' install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d From b87fa77b80b46619546d26cc39412a14b9fabbcf Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 7 Jul 2025 18:53:13 +0200 Subject: [PATCH 2/2] tuxedo-rs: use finalAttrs pattern --- pkgs/by-name/tu/tuxedo-rs/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index 33d151e363c6..66253c812726 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -4,7 +4,7 @@ rustPlatform, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuxedo-rs"; version = "0.3.1"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "AaronErhardt"; repo = "tuxedo-rs"; - rev = "tailor-v${version}"; + rev = "tailor-v${finalAttrs.version}"; hash = "sha256-+NzwUs8TZsA0us9hI1UmEKdiOo9IqTRmTOHs4xmC7MY="; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; versionCheckProgramArg = "--version"; postInstall = '' @@ -51,4 +51,4 @@ rustPlatform.buildRustPackage rec { platforms = platforms.linux; mainProgram = "tailor"; }; -} +})