summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-04-07 15:36:14 +0200
committerGitHub <noreply@github.com>2022-04-07 15:36:14 +0200
commit9699dc610dc8913c462dd0ff9f89a36f7fa1d42e (patch)
tree9818dbefe198bdf38612e0e396beb3f0e38c2a80 /pkgs
parent1fd8d747b1c20c22805b069652d7bf6c6d705267 (diff)
parent926252ade9085113c8a03b77cd60cce656641ade (diff)
Merge pull request #167624 from dotlambda/yq-improve
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/yq/default.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix
index b5e133f8374df..4792f38d7ce17 100644
--- a/pkgs/development/python-modules/yq/default.nix
+++ b/pkgs/development/python-modules/yq/default.nix
@@ -4,6 +4,7 @@
 , substituteAll
 , argcomplete
 , pyyaml
+, toml
 , xmltodict
 , jq
 , setuptools-scm
@@ -26,11 +27,6 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = ''
-    substituteInPlace test/test.py \
-      --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
-  '';
-
   nativeBuildInputs = [
     setuptools-scm
   ];
@@ -38,6 +34,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     pyyaml
     xmltodict
+    toml
     argcomplete
   ];
 
@@ -49,13 +46,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "yq" ];
 
-  doInstallCheck = true;
-  installCheckPhase = ''
-    echo '{"hello":{"foo":"bar"}}' | $out/bin/yq -y . | grep 'foo: bar'
-  '';
-
   meta = with lib; {
-    description = "Command-line YAML processor - jq wrapper for YAML documents";
+    description = "Command-line YAML/XML/TOML processor - jq wrapper for YAML, XML, TOML documents";
     homepage = "https://github.com/kislyuk/yq";
     license = licenses.asl20;
     maintainers = with maintainers; [ womfoo SuperSandro2000 ];