From ba74cf4d5ceb3aa516af2a10d2ee86b79ff75ac1 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 09:58:15 +0100 Subject: pythonPackages.django_pipeline: move expression --- pkgs/top-level/python-packages.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8acec15fd71..b5e3f96d849 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6883,23 +6883,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 = callPackage ../development/python-modules/django-pipeline { }; django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec { name = "django-pipeline-1.3.27"; -- cgit 1.4.1 From 127045d8e0a9481084649567c1520468582e3f33 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 10:31:35 +0100 Subject: pythonPackages.slimit: init at 0.8.1 --- pkgs/development/python-modules/slimit/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/slimit/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix new file mode 100644 index 00000000000..ff4c63891e5 --- /dev/null +++ b/pkgs/development/python-modules/slimit/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }: + +buildPythonPackage rec { + pname = "slimit"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b"; + }; + + # Some patches from https://github.com/rspivak/slimit/pull/65 + patches = lib.optionals isPy3k [ + (fetchpatch { + url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch; + sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; + }) + (fetchpatch { + url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch; + sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; + }) + ]; + + propagatedBuildInputs = [ ply ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s src/slimit + ''; + + meta = with lib; { + description = "JavaScript minifier"; + homepage = http://slimit.readthedocs.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5e3f96d849..96d3cd2f75e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15021,6 +15021,8 @@ in { }; }; + slimit = callPackage ../development/python-modules/slimit { }; + slob = buildPythonPackage rec { name = "slob-unstable-2016-11-03"; -- cgit 1.4.1 From fbff08f2f213c8cb09f845f8c4d8bfd40eff2699 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 11:20:13 +0100 Subject: pythonPackages.{reviewboard,djblets}: uninit Djblets is unmaintained: has not been updated since 2015, but had many releases. Dependency django_pipeline_1_3 is broken and should anyway be removed from pythonPackages because we want to have a consistent package set. Because the reviewboard package also hasn't been updated since 2015 and depends on djblets, it is removed as well. --- pkgs/top-level/python-packages.nix | 50 -------------------------------------- 1 file changed, 50 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96d3cd2f75e..5a5012f10d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6885,35 +6885,6 @@ in { django_pipeline = callPackage ../development/python-modules/django-pipeline { }; - 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; - }; - }; - dj-database-url = callPackage ../development/python-modules/dj-database-url { }; djmail = callPackage ../development/python-modules/djmail { }; @@ -14404,27 +14375,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 { -- cgit 1.4.1 From 061e79806e35b6477d67a9c9ba6b3ed997b4572b Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 11:38:02 +0100 Subject: pythonPackages.stem: move expression --- pkgs/development/python-modules/stem/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/stem/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix new file mode 100644 index 00000000000..68ad178bd4b --- /dev/null +++ b/pkgs/development/python-modules/stem/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "stem"; + version = "1.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; + }; + + meta = with lib; { + description = "Controller library that allows applications to interact with Tor"; + homepage = https://stem.torproject.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ phreedom ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a5012f10d1..431ae02c9fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6324,23 +6324,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 = buildPythonPackage rec { name = "svg.path-${version}"; -- cgit 1.4.1 From a1b9cc79386a0c41789e4bbb6af8ee9ac1472bd4 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 12:38:29 +0100 Subject: pythonPackages.deform: move expression --- pkgs/development/python-modules/deform/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------------ 2 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/deform/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix new file mode 100644 index 00000000000..60b8c0814c8 --- /dev/null +++ b/pkgs/development/python-modules/deform/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, beautifulsoup4, peppercorn, colander, translationstring +, chameleon, zope_deprecation, coverage, nose }: + +buildPythonPackage rec { + pname = "deform"; + version = "2.0a2"; + + src = fetchPypi { + inherit pname version; + sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + peppercorn + colander + translationstring + chameleon + zope_deprecation + coverage + nose + ]; + + meta = with lib; { + description = "Form library with advanced features like nested forms"; + homepage = https://docs.pylonsproject.org/projects/deform/en/latest/; + license = licenses.free; # http://www.repoze.org/LICENSE.txt + maintainers = with maintainers; [ garbas domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 431ae02c9fd..81740f34e52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3651,32 +3651,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 { }; -- cgit 1.4.1 From 86e007bd31391c4bddf6c1610aa3fb2538896861 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 12:55:22 +0100 Subject: pythonPackages.klein: move expression --- pkgs/development/python-modules/klein/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 ++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/klein/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix new file mode 100644 index 00000000000..f4748a93277 --- /dev/null +++ b/pkgs/development/python-modules/klein/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, werkzeug, twisted }: + +buildPythonPackage rec { + pname = "klein"; + version = "15.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = [ werkzeug twisted ]; + + meta = with lib; { + description = "Klein Web Micro-Framework"; + homepage = "https://github.com/twisted/klein"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81740f34e52..246f92e8e73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8835,24 +8835,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 { -- cgit 1.4.1 From 9f54b031fdbda6ebf71fb92222537786039abc75 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 20 Mar 2018 15:40:43 +0100 Subject: pythonPackages.WSME: move expression --- pkgs/development/python-modules/WSME/default.nix | 40 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +---------------- 2 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/WSME/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix new file mode 100644 index 00000000000..fc2b066ce1e --- /dev/null +++ b/pkgs/development/python-modules/WSME/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pbr, six, simplegeneric, netaddr, pytz, webob +, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx }: + +buildPythonPackage rec { + pname = "WSME"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + 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/ + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + six simplegeneric netaddr pytz webob + ]; + + checkInputs = [ + cornice nose webtest pecan transaction cherrypy sphinx + ]; + + meta = with lib; { + description = "Simplify the writing of REST APIs, and extend them with additional protocols"; + homepage = http://git.openstack.org/cgit/openstack/wsme; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 246f92e8e73..54ec6192016 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11165,34 +11165,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}"; -- cgit 1.4.1 From 7a0027804cf04b6907a1a0cc9186649c2a24011a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 20 Mar 2018 22:25:02 +0100 Subject: josepy: init at 1.0.1 --- pkgs/development/python-modules/josepy/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/josepy/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix new file mode 100644 index 00000000000..541455642ef --- /dev/null +++ b/pkgs/development/python-modules/josepy/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchPypi, buildPythonPackage +# buildInputs +, six +, setuptools +, pyopenssl +, cryptography +}: + +buildPythonPackage rec { + pname = "josepy"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z"; + }; + + propagatedBuildInputs = [ + pyopenssl + cryptography + six + setuptools + ]; + + # too many unpackaged check requirements + doCheck = false; + + meta = with lib; { + description = "JOSE protocol implementation in Python"; + homepage = https://github.com/jezdez/josepy; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b513288da69..1d3aa948877 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5219,6 +5219,8 @@ in { JPype1 = callPackage ../development/python-modules/JPype1 {}; + josepy = callPackage ../development/python-modules/josepy {}; + jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = callPackage ../development/python-modules/jug {}; -- cgit 1.4.1