summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Pykhalov <go.wigust@gmail.com>2020-05-31 11:08:03 +0300
committerOleg Pykhalov <go.wigust@gmail.com>2020-05-31 11:08:03 +0300
commite0b2cddb0608ce1d583f9132dfcac0ab6a19ec05 (patch)
tree8e96cbd2ba4e506ab8d18246201a441700069627
parentMerge pull request #88882 from Kiwi/mlv-app-init (diff)
downloadnixpkgs-yq.tar.gz
yq: 2.8.1 -> 2.10.1local/yqfork/yqyq
-rw-r--r--pkgs/development/tools/yq/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index c15fad015990..57f933186e6d 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -1,17 +1,17 @@
-{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
+{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq, argcomplete }:
buildPythonApplication rec {
pname = "yq";
- version = "2.8.1";
+ version = "2.10.1";
- propagatedBuildInputs = [ pyyaml xmltodict jq ];
+ propagatedBuildInputs = [ pyyaml xmltodict jq argcomplete ];
# ValueError: underlying buffer has been detached
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "042p3s011635rbjax9wvwjdrb1kyzw38a6qn59b0j0k7krz6rlr4";
+ sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn";
};
meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f6c5dfea4f8..77f2a6a7ba6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11165,7 +11165,8 @@ in
yodl = callPackage ../development/tools/misc/yodl { };
yq = callPackage ../development/tools/yq {
- inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict;
+ inherit (python3Packages) buildPythonApplication fetchPypi pyyaml
+ xmltodict argcomplete;
};
yq-go = callPackage ../development/tools/yq-go { };