From 018fe5d71b603fd95ebc9930ec4596651bab3e78 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 26 Apr 2023 16:30:32 +0200 Subject: [PATCH 1/2] trurl: 0.4 -> 0.6 - upstream switched from using perl to python3 for running tests. - the build process now relies on `curl-config` being present - man pages now land in a separate output Signed-off-by: Christoph Heiss --- pkgs/tools/networking/trurl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index 0449a57c878d..1d8ac07d9feb 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -1,25 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, curl, perl }: +{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages }: stdenv.mkDerivation rec { pname = "trurl"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { owner = "curl"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-f9z0gPtHcn3iWFA6MT6ngok0nXBcd6zJ8Tjnb5Lzf6c="; + hash = "sha256-/Gf7T67LPzVPhjAqTvbLiJOqfKeWvwH/WHelJZTH4ZI="; }; + outputs = [ "out" "dev" "man" ]; separateDebugInfo = stdenv.isLinux; enableParallelBuilding = true; + nativeBuildInputs = [ curl ]; buildInputs = [ curl ]; makeFlags = [ "PREFIX=$(out)" ]; doCheck = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ python3 python3Packages.packaging ]; checkTarget = "test"; meta = with lib; { From 215801b5f4f857454c4f245410501aba00ea7035 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 26 Apr 2023 16:33:46 +0200 Subject: [PATCH 2/2] trurl: add passthru.tests.version Signed-off-by: Christoph Heiss --- pkgs/tools/networking/trurl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index 1d8ac07d9feb..9d1b24a71cd3 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages }: +{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages, trurl, testers }: stdenv.mkDerivation rec { pname = "trurl"; @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 python3Packages.packaging ]; checkTarget = "test"; + passthru.tests.version = testers.testVersion { + package = trurl; + }; + meta = with lib; { description = "A command line tool for URL parsing and manipulation"; homepage = "https://curl.se/trurl";