diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
new file mode 100644
index 000000000000..6ddea86f1a7c
--- /dev/null
+++ b/pkgs/development/tools/yq/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, jq }:
+
+buildPythonApplication rec {
+
+  name = "${pname}-${version}";
+  pname = "yq";
+  version = "2.3.3";
+
+  propagatedBuildInputs = [ pyyaml jq ];
+
+  # ValueError: underlying buffer has been detached
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14ywdi464z68qclsqzb8r50rzmypknaz74zmpppkahjigfcfppm3";
+  };
+
+  meta = with lib; {
+    description = "Command-line YAML processor - jq wrapper for YAML documents.";
+    homepage = https://pypi.python.org/pypi/yq;
+    license = [ licenses.asl20 ];
+    maintainers = [ maintainers.womfoo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57a3b10ed06c..25118406515c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7779,6 +7779,10 @@ with pkgs;
 
   yodl = callPackage ../development/tools/misc/yodl { };
 
+  yq = callPackage ../development/tools/yq {
+    inherit (python3Packages) buildPythonApplication fetchPypi pyyaml;
+  };
+
   winpdb = callPackage ../development/tools/winpdb { };
 
   grabserial = callPackage ../development/tools/grabserial { };