nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-14 00:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

python310Packages.yq: Refresh patch to substitute jq path

Browse Source
This commit is contained in:
Martin Weinelt 2023-03-12 19:54:44 +01:00
parent ad157e04b8
commit e80b27d089
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/python-modules/yq/jq-path.patch
View File

@ -1,26 +1,26 @@
diff --git a/test/test.py b/test/test.py
index f25dced..cd308c8 100755
index db674a4..b6c797e 100755
--- a/test/test.py
+++ b/test/test.py
@@ -105,7 +105,7 @@ class TestYq(unittest.TestCase):
@@ -130,7 +130,7 @@ class TestYq(unittest.TestCase):
tf2.seek(0)
self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n')
self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), "1\n...\n")
- @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
+ @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
def test_jq16_arg_passthrough(self):
self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]),
"a:\n- a\n- b\n")
self.assertEqual(
self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]), "a:\n- a\n- b\n"
diff --git a/yq/__init__.py b/yq/__init__.py
index 91212d0..ee5a799 100755
index 0ccb8e8..8342ff0 100644
--- a/yq/__init__.py
+++ b/yq/__init__.py
@@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma
try:
@@ -206,7 +206,7 @@ def yq(
# Notes: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us;
# close_fds must be false for command substitution to work (yq . t.yml --slurpfile t <(yq . t.yml))
- jq = subprocess.Popen(["jq"] + list(jq_args),
+ jq = subprocess.Popen(["@jq@"] + list(jq_args),
stdin=subprocess.PIPE,
stdout=subprocess.PIPE if converting_output else None,
close_fds=False,
jq = subprocess.Popen(
- ["jq"] + list(jq_args),
+ ["@jq@"] + list(jq_args),
stdin=subprocess.PIPE,
stdout=subprocess.PIPE if converting_output else None,
close_fds=False,