Merge pull request #37439 from dotlambda/python-fixes

Python fixes, cc #36453
This commit is contained in:
Robert Schütz
2018-03-20 18:10:05 +01:00
committed by GitHub
10 changed files with 245 additions and 169 deletions
+8 -156
View File
@@ -3657,32 +3657,7 @@ in {
decorator = callPackage ../development/python-modules/decorator { };
deform = buildPythonPackage rec {
name = "deform-2.0a2";
src = pkgs.fetchurl {
url = "mirror://pypi/d/deform/${name}.tar.gz";
sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
};
buildInputs = with self; [] ++ optional isPy26 unittest2;
propagatedBuildInputs =
[ self.beautifulsoup4
self.peppercorn
self.colander
self.translationstring
self.chameleon
self.zope_deprecation
self.coverage
self.nose
];
meta = {
maintainers = with maintainers; [ garbas domenkozar ];
platforms = platforms.all;
};
};
deform = callPackage ../development/python-modules/deform { };
demjson = callPackage ../development/python-modules/demjson { };
@@ -6330,23 +6305,7 @@ in {
schema = callPackage ../development/python-modules/schema {};
stem = buildPythonPackage rec {
name = "stem-${version}";
version = "1.6.0";
src = pkgs.fetchurl {
url = "mirror://pypi/s/stem/${name}.tar.gz";
sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
};
meta = {
description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/";
homepage = https://stem.torproject.org/;
license = licenses.gpl3;
maintainers = with maintainers; [ phreedom ];
};
};
stem = callPackage ../development/python-modules/stem { };
svg-path = callPackage ../development/python-modules/svg-path { };
@@ -6874,52 +6833,7 @@ in {
};
};
django_pipeline = buildPythonPackage rec {
name = "django-pipeline-${version}";
version = "1.5.1";
src = pkgs.fetchurl {
url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
};
propagatedBuildInputs = with self; [ django futures ];
meta = with stdenv.lib; {
description = "Pipeline is an asset packaging library for Django";
homepage = https://github.com/cyberdelia/django-pipeline;
license = stdenv.lib.licenses.mit;
};
};
django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
name = "django-pipeline-1.3.27";
src = pkgs.fetchurl {
url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k";
};
});
djblets = if (versionOlder self.django.version "1.6.11") ||
(versionAtLeast self.django.version "1.9")
then throw "djblets only suported for Django<1.8.999,>=1.6.11"
else buildPythonPackage rec {
name = "Djblets-0.9";
src = pkgs.fetchurl {
url = "http://downloads.reviewboard.org/releases/Djblets/0.9/${name}.tar.gz";
sha256 = "1rr5vjwiiw3kih4k9nawislf701l838dbk5xgizadvwp6lpbpdpl";
};
propagatedBuildInputs = with self; [
django feedparser django_pipeline_1_3 pillowfight pytz ];
meta = {
description = "A collection of useful extensions for Django";
homepage = https://github.com/djblets/djblets;
};
};
django_pipeline = callPackage ../development/python-modules/django-pipeline { };
dj-database-url = callPackage ../development/python-modules/dj-database-url { };
@@ -8895,24 +8809,8 @@ in {
keyutils = callPackage ../development/python-modules/keyutils { };
klein = buildPythonPackage rec {
name = "klein-15.3.1";
src = pkgs.fetchurl {
url = "mirror://pypi/k/klein/${name}.tar.gz";
sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
};
disabled = isPy3k;
propagatedBuildInputs = with self; [ werkzeug twisted ];
meta = {
description = "Klein Web Micro-Framework";
homepage = "https://github.com/twisted/klein";
license = licenses.mit;
};
};
klein = callPackage ../development/python-modules/klein { };
koji = callPackage ../development/python-modules/koji { };
kombu = buildPythonPackage rec {
@@ -11245,34 +11143,7 @@ in {
};
};
WSME = buildPythonPackage rec {
name = "WSME-${version}";
version = "0.8.0";
src = pkgs.fetchurl {
url = "mirror://pypi/W/WSME/${name}.tar.gz";
sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
};
checkPhase = ''
# remove turbogears tests as we don't have it packaged
rm tests/test_tg*
# remove flask since we don't have flask-restful
rm tests/test_flask*
# https://bugs.launchpad.net/wsme/+bug/1510823
${if isPy3k then "rm tests/test_cornice.py" else ""}
nosetests tests/
'';
propagatedBuildInputs = with self; [
pbr six simplegeneric netaddr pytz webob
];
buildInputs = with self; [
cornice nose webtest pecan transaction cherrypy sphinx
];
};
WSME = callPackage ../development/python-modules/WSME { };
zake = buildPythonPackage rec {
name = "zake-${version}";
@@ -14402,27 +14273,6 @@ in {
django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
reviewboard = buildPythonPackage rec {
name = "ReviewBoard-2.5.1.1";
src = pkgs.fetchurl {
url = "http://downloads.reviewboard.org/releases/ReviewBoard/2.5/${name}.tar.gz";
sha256 = "14m8yy2aqxnnzi822b797wc9nmkfkp2fqmq24asdnm66bxhyzjwn";
};
patchPhase = ''
sed -i 's/mimeparse/python-mimeparse/' setup.py
sed -i 's/markdown>=2.4.0,<2.4.999/markdown/' setup.py
'';
propagatedBuildInputs = with self;
[ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup
pygments djblets django_evolution pycrypto pysvn pillow
psycopg2 django-haystack python_mimeparse markdown django-multiselectfield
];
};
rdflib = callPackage ../development/python-modules/rdflib { };
isodate = buildPythonPackage rec {
@@ -15019,6 +14869,8 @@ in {
};
};
slimit = callPackage ../development/python-modules/slimit { };
slob = buildPythonPackage rec {
name = "slob-unstable-2016-11-03";