diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
new file mode 100644
index 000000000000..edf7f0596c5f
--- /dev/null
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, krb5Full, nose, GitPython, mock, git }:
+
+buildPythonPackage rec {
+  pname = "CCColUtils";
+  version = "1.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1gwcq4xan9as1j3q9k2zqrywxp46qx0ljwxbck9id2fvilds6ck3";
+  };
+  buildInputs = [ krb5Full ];
+  propagatedBuildInputs = [ nose GitPython mock git ];
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python Kerberos 5 Credential Cache Collection Utilities";
+    homepage = https://pagure.io/cccolutils;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ disassembler ];
+  };
+}
diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix
new file mode 100644
index 000000000000..c3aeed0abbeb
--- /dev/null
+++ b/pkgs/development/python-modules/fedpkg/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+
+buildPythonPackage rec {
+  pname = "fedpkg";
+  version = "1.29";
+  name  = "${pname}-${version}";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
+    sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
+  };
+
+  #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
+  propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
+
+  doCheck = false; # requires fedora_cert which isn't used anymore
+
+  meta = with stdenv.lib; {
+    description = "Subclass of the rpkg project for dealing with rpm packaging";
+    homepage = https://pagure.io/fedpkg;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ mornfall ];
+  };
+}
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index 5c14fa05af67..56865b336be8 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, buildPythonPackage, pycurl, isPy3k }:
+{ stdenv, fetchurl, buildPythonPackage, pycurl, six, rpm, dateutil }:
 
 buildPythonPackage rec {
   pname = "koji";
-  version = "1.8";
+  version = "1.13.0";
   name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
-    url = "https://github.com/koji-project/koji/archive/koji-1.8.0.tar.gz";
-    sha256 = "17rkipdxccdccbbb70f9wx91cq9713psmq23j7lgb4mlnwan926h";
+    url = "https://releases.pagure.org/koji/${name}.tar.bz2";
+    sha256 = "18b18rcbdqqw33g7h20hf5bpbci2ixdi05yda1fvpv30c1kkzd8w";
   };
 
-  propagatedBuildInputs = [ pycurl ];
+  propagatedBuildInputs = [ pycurl six rpm dateutil ];
 
   # Judging from SyntaxError
-  disabled = isPy3k;
+  #disabled = isPy3k;
 
   makeFlags = "DESTDIR=$(out)";
 
diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix
new file mode 100644
index 000000000000..9380654f472b
--- /dev/null
+++ b/pkgs/development/python-modules/openidc-client/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "openidc-client";
+  version = "0.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fca4bpnswyji5nivsrbak5vsfphl4njyfrb8rm2034nq6mzb8ah";
+  };
+  propagatedBuildInputs = [ requests ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A CLI python OpenID Connect client with token caching and management";
+    homepage = https://github.com/puiterwijk;
+    license = licenses.mit;
+    maintainers = with maintainers; [ disassembler ];
+  };
+}
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix
new file mode 100644
index 000000000000..7ab698ecd084
--- /dev/null
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver
+, six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }:
+
+buildPythonPackage rec {
+  pname = "python-fedora";
+  version = "0.9.0";
+  name = "python-fedora-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sf468scw52sw9pzxrnmqs54rix9c4fp1mi2r5k5n7mgjrmf6j0x";
+  };
+  propagatedBuildInputs = [ kitchen requests bunch paver lockfile
+    six munch urllib3 beautifulsoup4 openidc-client ];
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python Fedora Module";
+    homepage = https://github.com/fedora-infra/python-fedora;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ mornfall ];
+  };
+}
diff --git a/pkgs/development/python-modules/rpkg-buildfix.diff b/pkgs/development/python-modules/rpkg-buildfix.diff
deleted file mode 100644
index d410f09072f7..000000000000
--- 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 000000000000..06683925d852
--- /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/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix
new file mode 100644
index 000000000000..c6cd2521292a
--- /dev/null
+++ b/pkgs/development/python-modules/rpmfluff/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  pname = "rpmfluff";
+  version = "0.5.3";
+  name  = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://releases.pagure.org/${pname}/${name}.tar.xz";
+    sha256 = "1i45f012ngpxs83m3dpmaj3hs8z7r9sbf05vnvzgs3hpgsbhxa7r";
+  };
+
+  meta = with stdenv.lib; {
+    description = "lightweight way of building RPMs, and sabotaging them";
+    homepage = https://pagure.io/rpmfluff;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ disassembler ];
+  };
+
+}
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
new file mode 100644
index 000000000000..f399f4d426ee
--- /dev/null
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pycurl, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "urlgrabber";
+  version = "3.10.2";
+  name  = "${pname}-${version}";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0w1h7hlsq406bxfy2pn4i9bd003bwl0q9b7p03z3g6yl0d21ddq5";
+  };
+
+  propagatedBuildInputs = [ pycurl ];
+
+  meta = with stdenv.lib; {
+    homepage = "urlgrabber.baseurl.org";
+    license = licenses.lgpl2Plus;
+    description = "Python module for downloading files";
+    maintainers = with maintainers; [ qknight ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c303306f67bd..ccc9e4598437 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2553,6 +2553,8 @@ in {
     };
   };
 
+  cccolutils = callPackage ../development/python-modules/cccolutils/default.nix {};
+
   CDDB = buildPythonPackage rec {
     name = "CDDB-1.4";
 
@@ -3491,6 +3493,8 @@ in {
     pythonPackages = self;
   };
 
+  openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {};
+
   openstackclient = buildPythonPackage rec {
     name = "openstackclient-${version}";
     version = "1.7.1";
@@ -5537,33 +5541,7 @@ in {
     buildInputs = with self; [ fudge_9 nose ];
   };
 
-  fedora_cert = buildPythonPackage rec {
-    name = "fedora-cert-0.5.9.2";
-    meta.maintainers = with maintainers; [ mornfall ];
-    format = "other";
-
-    src = pkgs.fetchurl {
-      url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
-      sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9";
-    };
-
-    propagatedBuildInputs = with self; [ python_fedora pyopenssl ];
-    postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg";
-    doCheck = false;
-  };
-
-  fedpkg = buildPythonPackage (rec {
-    name = "fedpkg-1.14";
-    meta.maintainers = with maintainers; [ mornfall ];
-
-    src = pkgs.fetchurl {
-      url = "https://fedorahosted.org/releases/f/e/fedpkg/${name}.tar.bz2";
-      sha256 = "0rj60525f2sv34g5llafnkmpvbwrfbmfajxjc14ldwzymp8clc02";
-    };
-
-    patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
-    propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ];
-  });
+  fedpkg = callPackage ../development/python-modules/fedpkg { };
 
   flit = callPackage ../development/python-modules/flit { };
 
@@ -17522,24 +17500,7 @@ in {
     };
   };
 
-  python_fedora = buildPythonPackage (rec {
-    version = "0.5.5";
-    name = "python-fedora-${version}";
-    meta.maintainers = with maintainers; [ mornfall ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-fedora/${name}.tar.gz";
-      sha256 = "15m8lvbb5q4rg508i4ah8my872qrq5xjwgcgca4d3kzjv2x6fhim";
-    };
-    propagatedBuildInputs = with self; [ kitchen requests bunch paver six munch urllib3
-      beautifulsoup4 ];
-    doCheck = false;
-
-    # https://github.com/fedora-infra/python-fedora/issues/140
-    preBuild = ''
-      sed -i '4,15d' setup.py
-    '';
-  });
+  python_fedora = callPackage ../development/python-modules/python_fedora/default.nix {};
 
   python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {};
   python_simple_hipchat = self.python-simple-hipchat;
@@ -19213,22 +19174,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}";
@@ -19251,6 +19197,8 @@ in {
 
   rpm = (pkgs.rpm.override{inherit python;});
 
+  rpmfluff = callPackage ../development/python-modules/rpmfluff {};
+
   rpy2 = buildPythonPackage rec {
     name = "rpy2-2.8.2";
     disabled = isPyPy;
@@ -22310,28 +22258,7 @@ in {
     };
   };
 
-  urlgrabber =  buildPythonPackage rec {
-    name = "urlgrabber-3.9.1";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "http://urlgrabber.baseurl.org/download/${name}.tar.gz";
-      sha256 = "4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ pycurl ];
-
-    meta = {
-      homepage = "urlgrabber.baseurl.org";
-      license = licenses.lgpl2Plus;
-      description = "Python module for downloading files";
-      maintainers = with maintainers; [ qknight ];
-    };
-  };
-
+  urlgrabber = callPackage ../development/python-modules/urlgrabber {};
 
   urwid = buildPythonPackage (rec {
     name = "urwid-1.3.1";