From 823938b49c68546a2e454918cc275c2c58ecca8b Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 14 May 2025 10:35:33 +0200 Subject: [PATCH 1/2] trurl: 0.16 -> 0.16.1 Changelog: https://github.com/curl/trurl/releases/tag/trurl-0.16.1 Signed-off-by: Christoph Heiss --- pkgs/by-name/tr/trurl/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index b595363e3c83..454a63024667 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -4,21 +4,26 @@ fetchFromGitHub, curl, python3, + perl, trurl, testers, }: stdenv.mkDerivation rec { pname = "trurl"; - version = "0.16"; + version = "0.16.1"; src = fetchFromGitHub { owner = "curl"; repo = "trurl"; rev = "trurl-${version}"; - hash = "sha256-Og7+FVCBWohVd58GVxFN3KChcG0Kts1MokiOQXZ1OTc="; + hash = "sha256-VCMT4WgZ6LG7yiKaRy7KTgTkbACVXb4rw62lWnVAuP0="; }; + postPatch = '' + patchShebangs scripts/* + ''; + outputs = [ "out" "dev" @@ -28,10 +33,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ curl ]; + nativeBuildInputs = [ + curl + perl + ]; buildInputs = [ curl ]; makeFlags = [ "PREFIX=$(out)" ]; + strictDeps = true; + doCheck = true; nativeCheckInputs = [ python3 ]; checkTarget = "test"; From 663bafb7874ee3febd4b0e760588d11323dc9af2 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 14 May 2025 10:36:27 +0200 Subject: [PATCH 2/2] trurl: replace testers.testVersion with versionCheckHook Signed-off-by: Christoph Heiss --- pkgs/by-name/tr/trurl/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index 454a63024667..b38e2ad7bd2c 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -6,7 +6,7 @@ python3, perl, trurl, - testers, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; checkTarget = "test"; - passthru.tests.version = testers.testVersion { - package = trurl; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Command line tool for URL parsing and manipulation";