From c29a721350add1addf2a8b77d0c591312f817a5a Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sat, 16 Sep 2017 00:03:03 -0400
Subject: [PATCH] rpkg: 1.14 -> 1.50

---
 .../python-modules/rpkg-buildfix.diff         | 11 --------
 .../python-modules/rpkg/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------
 3 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/rpkg-buildfix.diff
 create mode 100644 pkgs/development/python-modules/rpkg/default.nix

diff --git a/pkgs/development/python-modules/rpkg-buildfix.diff b/pkgs/development/python-modules/rpkg-buildfix.diff
deleted file mode 100644
index d410f09072f..00000000000
--- a/pkgs/development/python-modules/rpkg-buildfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py	2012-03-12 23:26:16.000000000 +0100
-+++ b/setup.py	2014-02-04 14:52:02.335856975 +0100
-@@ -14,6 +14,6 @@
-     package_dir = {'': 'src'},
-     packages = ['pyrpkg'],
-     scripts = ['src/rpkg'],
--    data_files = [('/etc/bash_completion.d', ['src/rpkg.bash']),
--                  ('/etc/rpkg', ['src/rpkg.conf'])],
-+    data_files = [('etc/bash_completion.d', ['src/rpkg.bash']),
-+                  ('etc/rpkg', ['src/rpkg.conf'])],
- )
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix
new file mode 100644
index 00000000000..06683925d85
--- /dev/null
+++ b/pkgs/development/python-modules/rpkg/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchurl, six, pycurl, cccolutils
+, koji, rpmfluff }:
+
+buildPythonPackage rec {
+  pname = "rpkg";
+  version = "1.50";
+  name  = "${pname}-${version}";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://releases.pagure.org/rpkg/${name}.tar.gz";
+    sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv";
+  };
+
+
+  propagatedBuildInputs = [ pycurl koji cccolutils six rpmfluff ];
+
+  doCheck = false; # needs /var/lib/rpm database to run tests
+
+  meta = with stdenv.lib; {
+    description = "Python library for dealing with rpm packaging";
+    homepage = https://pagure.io/fedpkg;
+    license = licenses.gpl2plus;
+    maintainers = with maintainers; [ mornfall ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 825f496e4cb..492d5e5ab83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19381,22 +19381,7 @@ in {
     };
   };
 
-  rpkg = buildPythonPackage (rec {
-    name = "rpkg-1.14";
-    disabled = !isPy27; # error: invalid command 'bdist_wheel'
-    meta.maintainers = with maintainers; [ mornfall ];
-
-    src = pkgs.fetchurl {
-      url = "https://fedorahosted.org/releases/r/p/rpkg/rpkg-1.14.tar.gz";
-      sha256 = "0d053hdjz87aym1sfm6c4cxmzmy5g0gkrmrczly86skj957r77a7";
-    };
-
-    patches = [ ../development/python-modules/rpkg-buildfix.diff ];
-
-    propagatedBuildInputs = with self; [ pycurl koji GitPython pkgs.git
-      rpm pyopenssl ];
-
-  });
+  rpkg = callPackage ../development/python-modules/rpkg/default.nix {};
 
   rply = buildPythonPackage rec {
     name = "rply-${version}";