From 051cb3d9ca45ac6ae3dedf41d01f0d43c8200360 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 23 May 2026 14:36:10 +0700 Subject: [PATCH] trurl: fix tests with libcurl 8.20.0 uppercase hex --- pkgs/by-name/tr/trurl/package.nix | 2 + .../tr/trurl/tests-uppercase-hex.patch | 96 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 pkgs/by-name/tr/trurl/tests-uppercase-hex.patch diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index d9f7b7d9442b..345b14b03c74 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { url = "https://github.com/curl/trurl/commit/f22a2c45956f35702e437fb83ac05376f1956ec5.patch"; hash = "sha256-7CkUs5tMk77WKc7SlgE2NslHtU5cViKSGhHj3IBlpWo="; }) + # https://github.com/curl/trurl/pull/441 + ./tests-uppercase-hex.patch ]; postPatch = '' diff --git a/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch b/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch new file mode 100644 index 000000000000..8308b8e2c15f --- /dev/null +++ b/pkgs/by-name/tr/trurl/tests-uppercase-hex.patch @@ -0,0 +1,96 @@ +--- a/tests.json ++++ b/tests.json +@@ -749,6 +749,7 @@ + "query=user=me" + ] + }, ++ "excludes": ["uppercase-hex"], + "expected": { + "stdout": "https://curl.se/hello?user%3dme\n", + "stderr": "", +@@ -761,6 +762,22 @@ + "--url", + "https://curl.se/hello", + "--set", ++ "query=user=me" ++ ] ++ }, ++ "required": ["uppercase-hex"], ++ "expected": { ++ "stdout": "https://curl.se/hello?user%3Dme\n", ++ "stderr": "", ++ "returncode": 0 ++ } ++ }, ++ { ++ "input": { ++ "arguments": [ ++ "--url", ++ "https://curl.se/hello", ++ "--set", + "fragment= hello" + ] + }, +@@ -2132,6 +2149,7 @@ + "query:=a&b&a%26b" + ] + }, ++ "excludes": ["uppercase-hex"], + "expected": { + "stdout": "http://localhost/ABC%5c%5c?a&b&a%26b\n", + "returncode": 0, +@@ -2141,6 +2159,26 @@ + { + "input": { + "arguments": [ ++ "-s", ++ "scheme:=http", ++ "-s", ++ "host:=localhost", ++ "-s", ++ "path:=/ABC%5C%5C", ++ "-s", ++ "query:=a&b&a%26b" ++ ] ++ }, ++ "required": ["uppercase-hex"], ++ "expected": { ++ "stdout": "http://localhost/ABC%5C%5C?a&b&a%26b\n", ++ "returncode": 0, ++ "stderr": "" ++ } ++ }, ++ { ++ "input": { ++ "arguments": [ + "-g", + "{query:b}\\t{query-all:a}\\n{:query:b}\\t{:query-all:a}", + "https://example.org/foo?a=1&b=%23&a=%26#hello" +@@ -2825,11 +2863,27 @@ + "path=%61" + ] + }, ++ "excludes": ["uppercase-hex"], + "expected": { + "stdout": "https://example.com/one/tao/%2fB/%2561\n", + "stderr": "", + "returncode": 0 + } ++ }, ++ { ++ "input": { ++ "arguments": [ ++ "https://example.com/one/t%61o/%2F%42/", ++ "--append", ++ "path=%61" ++ ] ++ }, ++ "required": ["uppercase-hex"], ++ "expected": { ++ "stdout": "https://example.com/one/tao/%2FB/%2561\n", ++ "stderr": "", ++ "returncode": 0 ++ } + }, + { + "input": {