From ee4e630648e31ef998403be990fae3f453363537 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Wed, 8 Mar 2017 15:45:48 +0100
Subject: [PATCH 1/3] salt-pepper: init at 0.5.0

---
 pkgs/tools/admin/salt/pepper/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/admin/salt/pepper/default.nix

diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
new file mode 100644
index 00000000000..781e94059ad
--- /dev/null
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -0,0 +1,19 @@
+{ lib
+, fetchurl
+, python2Packages
+}:
+
+python2Packages.buildPythonApplication rec {
+  name = "salt-pepper-${version}";
+  version = "0.5.0";
+  src = fetchurl {
+    url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
+  };
+
+  meta = {
+    description = "A CLI front-end to a running salt-api system";
+    homepage = https://github.com/saltstack/pepper;
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12504c5099e..47edfd44698 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3314,6 +3314,8 @@ with pkgs;
 
   pell = callPackage ../applications/misc/pell { };
 
+  pepper = callPackage ../tools/admin/salt/pepper { };
+
   pick = callPackage ../tools/misc/pick { };
 
   pitivi = callPackage ../applications/video/pitivi {

From 83fa5738d5249466a8c14fc206563bcde5cd4fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Thu, 9 Mar 2017 08:05:13 +0100
Subject: [PATCH 2/3] pepper: disable tests

---
 pkgs/tools/admin/salt/pepper/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index 781e94059ad..3959946b322 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -10,6 +10,8 @@ python2Packages.buildPythonApplication rec {
     url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
     sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
   };
+  
+  doCheck = false; # no tests available
 
   meta = {
     description = "A CLI front-end to a running salt-api system";

From de363e8706e989dd05afe3ee77633e4d7314d507 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Thu, 9 Mar 2017 10:44:39 +0100
Subject: [PATCH 3/3] pepper: add 'pierrer' as a maintainer

---
 lib/maintainers.nix                      | 1 +
 pkgs/tools/admin/salt/pepper/default.nix | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ef64a9b53c6..d8056063edd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -383,6 +383,7 @@
   Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
+  pierrer = "Pierre Radermecker <pierrer@pi3r.be>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   pjbarnoy = "Perry Barnoy <pjbarnoy@gmail.com>";
diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index 3959946b322..ff9590c79a5 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -10,12 +10,13 @@ python2Packages.buildPythonApplication rec {
     url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
     sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
   };
-  
+
   doCheck = false; # no tests available
 
-  meta = {
+  meta = with lib; {
     description = "A CLI front-end to a running salt-api system";
     homepage = https://github.com/saltstack/pepper;
-    license = lib.licenses.asl20;
+    maintainers = [ maintainers.pierrer ];
+    license = licenses.asl20;
   };
 }