From c97c6676103a90245c0bed5969d6c9e9f2cc19dc Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 11 Mar 2016 12:33:08 +0100
Subject: lib.maintainers: add markus1189

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1d3544b1077b..80b40730fc94 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -208,6 +208,7 @@
   malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  markus1189 = "Markus Hauck <markus1189@gmail.com>";
   markWot = "Markus Wotringer <markus@wotringer.de>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
-- 
cgit 1.4.1


From 7b09191563dceeac7627e1a93b9f500bbd1baa1f Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 11 Mar 2016 12:37:23 +0100
Subject: jo: init at 1.0

---
 pkgs/development/tools/jo/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/jo/default.nix

diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix
new file mode 100644
index 000000000000..09b5edeeecdf
--- /dev/null
+++ b/pkgs/development/tools/jo/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchFromGitHub, autoreconfHook}:
+
+stdenv.mkDerivation rec {
+  name = "jo-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "jpmens";
+    repo = "jo";
+
+    rev = "v${version}";
+    sha256="0vyi0aaxsp6x3cvym7mlcfdsxjhj5h0b00mqc42mg8kc95cyp2c1";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "A small utility to create JSON objects";
+    homepage = https://github.com/jpmens/jo;
+    license = licenses.gpl2Plus;
+    maintainers = [maintainers.markus1189];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db1418be33a2..8817719aa17f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2138,7 +2138,9 @@ let
 
   jpegoptim = callPackage ../applications/graphics/jpegoptim { };
 
-  jq = callPackage ../development/tools/jq {};
+  jq = callPackage ../development/tools/jq { };
+
+  jo = callPackage ../development/tools/jo { };
 
   jscoverage = callPackage ../development/tools/misc/jscoverage { };
 
-- 
cgit 1.4.1