From 8b185aa31bf2c5fc762039ab68c1b6294de567c7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Apr 2019 02:19:26 -0500
Subject: [PATCH 1/2] pepper: 0.5.5 -> 0.7.5

---
 pkgs/tools/admin/salt/pepper/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index 24e59a355532..2b3011e6b4ee 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -1,17 +1,20 @@
 { lib
-, fetchurl
 , python2Packages
+, salt
 }:
 
 python2Packages.buildPythonApplication rec {
-  name = "salt-pepper-${version}";
-  version = "0.5.5";
-  src = fetchurl {
-    url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1wj1k64ly6af6qsmiizlx32jxh23a37smd9wb57l5zl0x8sfqq1n";
+  pname = "salt-pepper";
+  version = "0.7.5";
+  src = python2Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w";
   };
 
-  doCheck = false; # no tests available
+  buildInputs = with python2Packages; [ setuptools setuptools_scm salt ];
+  checkInputs = with python2Packages; [
+    pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado_4
+  ];
 
   meta = with lib; {
     description = "A CLI front-end to a running salt-api system";

From 5f202278555a178339d637732b39896d8dd255e6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 17 Apr 2019 14:09:16 -0500
Subject: [PATCH 2/2] pepper: python2Packages -> pythonPackages (python3 should
 work)

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

diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index 2b3011e6b4ee..4bf24e3092d7 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -1,18 +1,18 @@
 { lib
-, python2Packages
+, pythonPackages
 , salt
 }:
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "salt-pepper";
   version = "0.7.5";
-  src = python2Packages.fetchPypi {
+  src = pythonPackages.fetchPypi {
     inherit pname version;
     sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w";
   };
 
-  buildInputs = with python2Packages; [ setuptools setuptools_scm salt ];
-  checkInputs = with python2Packages; [
+  buildInputs = with pythonPackages; [ setuptools setuptools_scm salt ];
+  checkInputs = with pythonPackages; [
     pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado_4
   ];