Merge branch 'master' into staging

pkgs/development/python-modules/awesome-slugify/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi, unidecode, regex, python }:
+
+buildPythonPackage rec {
+  pname = "awesome-slugify";
+  version = "1.6.5";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv";
+  };
+
+  patches = [
+    ./slugify_filename_test.patch # fixes broken test by new unidecode
+  ];
+
+  propagatedBuildInputs = [ unidecode regex ];
+
+  checkPhase = ''
+      ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/dimka665/awesome-slugify";
+    description = "Python flexible slugify function";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/python-modules/awesome-slugify/slugify_filename_test.patch

@@ -0,0 +1,13 @@
+diff --git i/slugify/tests.py w/slugify/tests.py
+index 4c9fa1c..3e14328 100644
+--- i/slugify/tests.py
++++ w/slugify/tests.py
+@@ -57,7 +57,7 @@ class PredefinedSlugifyTestCase(unittest.TestCase):
+         self.assertEqual(slugify_url('The Über article'), 'uber-article')
+ 
+     def test_slugify_filename(self):
+-        self.assertEqual(slugify_filename(u'Дrаft №2.txt'), u'Draft_2.txt')
++        self.assertEqual(slugify_filename(u'Дrаft №2.txt'), u'Draft_No._2.txt')
+ 
+ 
+ class ToLowerTestCase(unittest.TestCase):

pkgs/development/python-modules/backports_csv/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, future }:
+
+buildPythonPackage rec {
+
+  pname = "backports.csv";
+  version = "1.0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc";
+  };
+
+  propogatedBuildInputs = [ future ];
+
+  meta = with stdenv.lib; {
+    description = "Backport of Python 3 csv module";
+    homepage = https://github.com/ryanhiebert;
+    license = licenses.psfl;
+  };
+}

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 ];
+  };
+}

pkgs/development/python-modules/discogs_client/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests, oauthlib }:
+
+buildPythonPackage rec {
+  pname = "discogs-client";
+  version = "2.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kjm4zyxlkv8cjyd4zl0yslbkmfz4ga9nm3d2glpw3nmvmvajn40";
+  };
+
+  propagatedBuildInputs = [ requests oauthlib ];
+
+  meta = with stdenv.lib; {
+    description = "Official Python API client for Discogs";
+    license = licenses.bsd2;
+    homepage = "https://github.com/discogs/discogs_client";
+  };
+}

pkgs/development/python-modules/dyn/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock, pytestpep8
+, pytest_xdist, covCore, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "dyn";
+  version = "1.6.3";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xq90fliix5nbv934s3wf2pahmx6m2b9y0kqwn192c76qh7xlzib";
+  };
+
+  buildInputs = [ glibcLocales ];
+
+  checkInputs = [
+    pytest
+    pytestcov
+    mock
+    pytestpep8
+    pytest_xdist
+    covCore
+  ];
+  # Disable checks because they are not stateless and require internet access.
+  doCheck = false;
+
+  LC_ALL="en_US.UTF-8";
+
+  meta = with stdenv.lib; {
+    description = "Dynect dns lib";
+    homepage = "http://dyn.readthedocs.org/en/latest/intro.html";
+    license = licenses.bsd3;
+  };
+}

pkgs/development/python-modules/eve/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchPypi, flask, jinja2, itsdangerous, events
+, markupsafe, pymongo, flask-pymongo, werkzeug, simplejson, cerberus }:
+
+buildPythonPackage rec {
+  pname = "Eve";
+  version = "0.7.4";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb";
+  };
+
+  patches = [
+    ./setup.patch
+  ];
+
+  propagatedBuildInputs = [
+    cerberus
+    events
+    flask-pymongo
+    flask
+    itsdangerous
+    jinja2
+    markupsafe
+    pymongo
+    simplejson
+    werkzeug
+  ];
+
+  # tests call a running mongodb instance
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "http://python-eve.org/";
+    description = "Open source Python REST API framework designed for human beings";
+    license = licenses.bsd3;
+  };
+}

pkgs/development/python-modules/eve/setup.patch

@@ -0,0 +1,21 @@
+diff --git i/setup.py w/setup.py
+index 0176467..2b74988 100755
+--- i/setup.py
++++ w/setup.py
+@@ -9,11 +9,11 @@ install_requires = [
+     'cerberus>=0.9.2,<0.10',
+     'events>=0.2.1,<0.3',
+     'simplejson>=3.3.0,<4.0',
+-    'werkzeug>=0.9.4,<=0.11.15',
+-    'markupsafe>=0.23,<1.0',
+-    'jinja2>=2.8,<3.0',
+-    'itsdangerous>=0.24,<1.0',
+-    'flask>=0.10.1,<=0.12',
++    'werkzeug>=0.9.4',
++    'markupsafe>=0.23',
++    'jinja2>=2.8',
++    'itsdangerous>=0.24',
++    'flask>=0.10.1',
+     'pymongo>=3.4',
+     'flask-pymongo>=0.4',
+ ]

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 ];
+  };
+}

pkgs/development/python-modules/internetarchive/default.nix

@@ -0,0 +1,48 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, six, clint, pyyaml, docopt
+, requests, jsonpatch, args, schema, responses, backports_csv }:
+
+buildPythonPackage rec {
+
+  pname = "internetarchive";
+  version = "1.7.2";
+  name = "${pname}-${version}";
+
+  # Can't use pypi, data files for tests missing
+  src = fetchFromGitHub {
+    owner = "jjjake";
+    repo = "internetarchive";
+    rev = "v${version}";
+    sha256 = "1cijagy22qi8ydrvizqmi1whnc3qr94yk0910lwgpxjywcygggir";
+  };
+    # It is hardcoded to specific versions, I don't know why.
+    preConfigure = ''
+        sed "s/schema>=.*/schema>=0.4.0',/" -i setup.py
+        sed "/backports.csv/d" -i setup.py
+    '';
+
+    #phases = [ "unpackPhase" "configurePhase" "installPhase" "fixupPhase" "installCheckPhase" ];
+    buildInputs = [ pytest responses ];
+    propagatedBuildInputs = [
+      six
+      clint
+      pyyaml
+      docopt
+      requests
+      jsonpatch
+      args
+      schema
+      backports_csv
+    ];
+
+    # Tests disabled because ia binary doesn't exist when tests run
+    doCheck = false;
+
+    checkPhase = "pytest tests";
+
+
+  meta = with stdenv.lib; {
+      description = "A python wrapper for the various Internet Archive APIs";
+    homepage = https://github.com/jjjake/internetarchive;
+    license = licenses.agpl3;
+  };
+}

pkgs/development/python-modules/interruptingcow/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "interruptingcow";
+  version = "0.7";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0j6d0rbh8xjfw7bf8vcjld6q45i7vr9xsw5b9q6j87nhf4qhzx53";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A watchdog that interrupts long running code";
+    homepage = https://bitbucket.org/evzijst/interruptingcow;
+    license = licenses.mit;
+    maintainers = with maintainers; [ benley ];
+  };
+}

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)";
 

pkgs/development/python-modules/logilab/common.nix

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, unittest2, six }:
+
+buildPythonPackage rec {
+  pname = "logilab-common";
+  version = "1.4.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02in5555iak50gzn35bnnha9s85idmh0wwxaxz13v81z5krn077d";
+  };
+
+  propagatedBuildInputs = [ unittest2 six ];
+
+  # package supports 3.x but tests require egenix-mx-base which is python 2.x only
+  # and is not currently in nixos
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python packages and modules used by Logilab ";
+    homepage = https://www.logilab.org/project/logilab-common;
+    license = licenses.lgpl21;
+  };
+}

pkgs/development/python-modules/logilab/constraint.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, logilab_common, six }:
+
+buildPythonPackage rec {
+  pname = "logilab-constraint";
+  version = "0.6.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg";
+  };
+
+  propagatedBuildInputs = [
+    logilab_common six
+  ];
+
+
+  meta = with stdenv.lib; {
+    description = "logilab-database provides some classes to make unified access to different";
+    homepage = "http://www.logilab.org/project/logilab-database";
+  };
+}
+

pkgs/development/python-modules/marionette-harness/default.nix

@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 , mozprofile
 , mozversion
 , moztest
@@ -15,6 +16,7 @@ buildPythonPackage rec {
   pname = "marionette-harness";
   version = "4.1.0";
   name = "${pname}-${version}";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;

pkgs/development/python-modules/marionette-harness/marionette_driver.nix

@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 , mozversion
 , mozrunner
 }:
@@ -10,6 +11,7 @@ buildPythonPackage rec {
   pname = "marionette_driver";
   version = "2.3.0";
   name = "${pname}-${version}";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;

pkgs/development/python-modules/mpi4py/default.nix

@@ -1,26 +1,32 @@
-{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
+{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
 
 buildPythonPackage rec {
   pname = "mpi4py";
   version = "2.0.0";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
-    sha256 = "6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10fb01595rg17ycz08a23v24akm25d13srsy2rnixam7a5ca0hv5";
   };
 
   passthru = {
     inherit mpi;
   };
 
+  # Rename libm.so -> libm.so.6 in test
+  # See: https://bitbucket.org/mpi4py/mpi4py/issues/28/test_dltestdl-test-failure
+  patches = [
+    ./tests.patch
+  ];
+
   # The tests in the `test_spawn` module fail in the chroot build environment.
   # However, they do pass in a pure, or non-pure nix-shell. Hence, we
   # deactivate these particular tests.
   # Unfortunately, the command-line arguments to `./setup.py test` are not
   # correctly passed to the test-runner. Hence, these arguments are patched
   # directly into `setup.py`.
-  patchPhase = ''
+  prePatch = ''
     sed 's/err = main(cmd.args or \[\])/err = main(cmd.args or ["-v", "-e", "test_spawn"])/' -i setup.py
   '';
 
@@ -49,6 +55,9 @@ buildPythonPackage rec {
 
   disabled = isPy3k || isPyPy;
 
+  # Timing out communicating between processes when sandboxing enabled.
+  doCheck = false;
+
   meta = {
     description =
       "Python bindings for the Message Passing Interface standard";

pkgs/development/python-modules/mpi4py/tests.patch

@@ -0,0 +1,13 @@
+diff --git i/test/test_dl.py w/test/test_dl.py
+index a3211a3..9d25569 100644
+--- i/test/test_dl.py
++++ w/test/test_dl.py
+@@ -12,7 +12,7 @@ class TestDL(unittest.TestCase):
+         if sys.platform == 'darwin':
+             libm = 'libm.dylib'
+         else:
+-            libm = 'libm.so'
++            libm = 'libm.so.6'
+ 
+         handle = dl.dlopen(libm, dl.RTLD_LOCAL|dl.RTLD_LAZY)
+         self.assertTrue(handle != 0)

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 ];
+  };
+}

pkgs/development/python-modules/pomegranate/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }:
+
+buildPythonPackage rec {
+  pname = "pomegranate";
+  version = "0.7.7";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b5b7a6256778fc4097ee77caec28ec845ec1fee3d701f3f26f83860b2d45c453";
+  };
+
+  propagatedBuildInputs = [ numpy scipy cython networkx joblib ];
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = "Probabilistic and graphical models for Python, implemented in cython for speed";
+    homepage = https://github.com/jmschrei/pomegranate;
+    license = licenses.mit;
+    maintainers = with maintainers; [ rybern ];
+  };
+}

pkgs/development/python-modules/pydub/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, scipy, ffmpeg-full }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pydub";
+  version = "0.20.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hqsvvph6ks4kxj0m2q1xvl5bllqmpk78rlqpqhh79schl344xkv";
+  };
+
+  patches = [
+    ./pyaudioop-python3.patch
+  ];
+
+  checkInputs = [ scipy ffmpeg-full ];
+
+  meta = with stdenv.lib; {
+    description = "Manipulate audio with a simple and easy high level interface.";
+    homepage    = "http://pydub.com/";
+    license     = licenses.mit;
+    platforms   = platforms.all;
+  };
+}

pkgs/development/python-modules/pydub/pyaudioop-python3.patch

@@ -0,0 +1,46 @@
+diff --git i/pydub/pyaudioop.py w/pydub/pyaudioop.py
+index 8f8f017..aa6bb8c 100644
+--- i/pydub/pyaudioop.py
++++ w/pydub/pyaudioop.py
+@@ -1,4 +1,4 @@
+-import __builtin__
++import builtins
+ import math
+ import struct
+ from fractions import gcd
+@@ -79,7 +79,7 @@ def _get_minval(size, signed=True):
+ def _get_clipfn(size, signed=True):
+     maxval = _get_maxval(size, signed)
+     minval = _get_minval(size, signed)
+-    return lambda val: __builtin__.max(min(val, maxval), minval)
++    return lambda val: builtins.max(min(val, maxval), minval)
+ 
+ 
+ def _overflow(val, size, signed=True):
+@@ -109,7 +109,7 @@ def max(cp, size):
+     if len(cp) == 0:
+         return 0
+ 
+-    return __builtin__.max(abs(sample) for sample in _get_samples(cp, size))
++    return builtins.max(abs(sample) for sample in _get_samples(cp, size))
+ 
+ 
+ def minmax(cp, size):
+@@ -117,8 +117,8 @@ def minmax(cp, size):
+ 
+     max_sample, min_sample = 0, 0
+     for sample in _get_samples(cp, size):
+-        max_sample = __builtin__.max(sample, max_sample)
+-        min_sample = __builtin__.min(sample, min_sample)
++        max_sample = builtins.max(sample, max_sample)
++        min_sample = builtins.min(sample, min_sample)
+ 
+     return min_sample, max_sample
+ 
+@@ -542,4 +542,4 @@ def lin2adpcm(cp, size, state):
+ 
+ 
+ def adpcm2lin(cp, size, state):
+-    raise NotImplementedError()
+\ No newline at end of file
++    raise NotImplementedError()

pkgs/development/python-modules/pymongo/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "pymongo";
+  version = "3.5.1";
+  name  = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0939bl3brrklvccicck62gs3zd7i9aysz13c8pxc3gpk2hsdj878";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "http://github.com/mongodb/mongo-python-driver";
+    license = licenses.asl20;
+    description = "Python driver for MongoDB ";
+  };
+}

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 ];
+  };
+}

pkgs/development/python-modules/rpkg-buildfix.diff

@@ -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'])],
- )

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 ];
+  };
+
+}

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 ];
+  };
+
+}

pkgs/development/python-modules/schema/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+
+  pname = "schema";
+  version = "0.6.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lw28j9w9vxyigg7vkfkvi6ic9lgjkdnfvnxdr7pklslqvzmk2vm";
+  };
+
+  checkInputs = [ pytest ];
+
+  meta = with stdenv.lib; {
+    description = "Library for validating Python data structures";
+    homepage = https://github.com/keleshev/schema;
+    license = licenses.mit;
+  };
+}

pkgs/development/python-modules/trollius/default.nix

@@ -0,0 +1,49 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPy26, isPyPy, mock, futures  }:
+buildPythonPackage rec {
+  pname = "trollius";
+  version = "1.0.4";
+  name  = "${pname}-${version}";
+
+  disabled = isPy26;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148";
+  };
+
+  buildInputs = [ mock ];
+
+  propagatedBuildInputs = lib.optional (isPy27 || isPyPy) [ futures ];
+
+  patches = [
+    ./tests.patch
+  ];
+
+  # Some of the tests fail on darwin with `error: AF_UNIX path too long'
+  # because of the *long* path names for sockets
+  patchPhase = lib.optionalString stdenv.isDarwin ''
+      sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py
+      sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py
+      sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py
+      sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py
+      sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py
+      sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py
+      sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py
+      sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py
+      sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
+    homepage = "https://bitbucket.org/enovance/trollius";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ garbas ];
+  };
+}

pkgs/development/python-modules/trollius/tests.patch

@@ -0,0 +1,13 @@
+diff --git i/tests/test_asyncio.py w/tests/test_asyncio.py
+index 39d9e1a..05b7e6f 100644
+--- i/tests/test_asyncio.py
++++ w/tests/test_asyncio.py
+@@ -69,7 +69,7 @@ class AsyncioTests(test_utils.TestCase):
+             def step_future():
+                 future = asyncio.Future()
+                 self.loop.call_soon(future.set_result, "asyncio.Future")
+-                return (yield from future)
++                return (yield From(future))
+ 
+             # test in release mode
+             trollius.coroutines._DEBUG = False

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 ];
+  };
+}
+