From e063c490b42b96604e84375593af50fd81cf67ca Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:16:17 -0400 Subject: [PATCH 001/190] pythonPackages.tilestache: refactor move to python-modules --- .../python-modules/tilestache/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 2 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/tilestache/default.nix diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix new file mode 100644 index 00000000000..0b919cb9c6d --- /dev/null +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, modestmaps +, pillow +, pycairo +, python-mapnik +, simplejson +, werkzeug +, isPy27 +}: + +buildPythonPackage rec { + pname = "tilestache"; + version = "1.50.1"; + disabled = !isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj"; + }; + + propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; + + meta = with stdenv.lib; { + description = "A tile server for rendered geographic data"; + homepage = http://tilestache.org; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b11cbfd59c8..cb9142bb3c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3784,26 +3784,7 @@ in { tidylib = callPackage ../development/python-modules/pytidylib { }; - tilestache = self.buildPythonPackage rec { - name = "tilestache-${version}"; - version = "1.50.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/T/TileStache/TileStache-${version}.tar.gz"; - sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj"; - }; - - disabled = !isPy27; - - propagatedBuildInputs = with self; - [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; - - meta = { - description = "A tile server for rendered geographic data"; - homepage = http://tilestache.org; - license = licenses.bsd3; - }; - }; + tilestache = callPackage ../development/python-modules/tilestache { }; timelib = buildPythonPackage rec { name = "timelib-0.2.4"; From 50ec0b1724bc65caa9eae8874bfa09f90444d692 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:17:53 -0400 Subject: [PATCH 002/190] pythonPackages.timelib: refactor move to python-modules --- .../python-modules/timelib/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/timelib/default.nix diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix new file mode 100644 index 00000000000..39ff4b6de15 --- /dev/null +++ b/pkgs/development/python-modules/timelib/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "timelib"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb"; + }; + + meta = with stdenv.lib; { + description = "Parse english textual date descriptions"; + homepage = "https://github.com/pediapress/timelib/"; + license = licenses.zlib; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb9142bb3c0..0f7b0ebd83f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3786,22 +3786,7 @@ in { tilestache = callPackage ../development/python-modules/tilestache { }; - timelib = buildPythonPackage rec { - name = "timelib-0.2.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/timelib/${name}.zip"; - sha256 = "49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb"; - }; - - buildInputs = with self; [ ]; - - meta = { - description = "Parse english textual date descriptions"; - homepage = "https://github.com/pediapress/timelib/"; - license = licenses.zlib; - }; - }; + timelib = callPackage ../development/python-modules/timelib { }; timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; From 8a27bc48b27d7c49ac37d0b634da086cae93e5df Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:19:31 -0400 Subject: [PATCH 003/190] pythonPackages.pid: refactor move to python-modules --- .../python-modules/pid/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pid/default.nix diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix new file mode 100644 index 00000000000..64f4ee882ab --- /dev/null +++ b/pkgs/development/python-modules/pid/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "pid"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05"; + }; + + buildInputs = [ nose ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Pidfile featuring stale detection and file-locking"; + homepage = https://github.com/trbs/pid/; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f7b0ebd83f..2af1b7c1f3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3790,26 +3790,7 @@ in { timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - pid = buildPythonPackage rec { - name = "pid-${version}"; - version = "2.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pid/${name}.tar.gz"; - sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05"; - }; - - buildInputs = with self; [ nose ]; - - # No tests included - doCheck = false; - - meta = { - description = "Pidfile featuring stale detection and file-locking"; - homepage = https://github.com/trbs/pid/; - license = licenses.asl20; - }; - }; + pid = callPackage ../development/python-modules/pid { }; pip2nix = buildPythonPackage rec { name = "pip2nix-${version}"; From 761c33f3474a2cb8174a74a4ff1b41d94d9e85df Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:28:06 -0400 Subject: [PATCH 004/190] pythonPackages.pip2nix: 0.3.0 -> 0.7.0 fix broken --- .../python-modules/pip2nix/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------- 2 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/pip2nix/default.nix diff --git a/pkgs/development/python-modules/pip2nix/default.nix b/pkgs/development/python-modules/pip2nix/default.nix new file mode 100644 index 00000000000..0e648f1ca18 --- /dev/null +++ b/pkgs/development/python-modules/pip2nix/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, click +, configobj +, contexter +, jinja2 +, pytest +}: + +buildPythonPackage rec { + pname = "pip2nix"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec9a71e09ac7f43cc7b6c9d386384eb7b5c331bf6ea0e72ca559d87979397a95"; + }; + + propagatedBuildInputs = [ click configobj contexter jinja2 pytest ]; + + postPatch = '' + sed -i "s/'pip>=8,<10'/'pip'/" setup.py + sed -i "s/pip<10,>=8/pip/" ${pname}.egg-info/requires.txt + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate Nix expressions for Python packages"; + homepage = https://github.com/johbo/pip2nix; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2af1b7c1f3e..03793fb646f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3792,19 +3792,7 @@ in { pid = callPackage ../development/python-modules/pid { }; - pip2nix = buildPythonPackage rec { - name = "pip2nix-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pip2nix/${name}.tar.gz"; - sha256 = "1s76i8r4khq8y5r6g4218jg2c6qldmw5xhzymxad51ii8hafpwq6"; - }; - - propagatedBuildInputs = with self; [ click configobj contexter jinja2 pytest ]; - - meta.broken = true; - }; + pip2nix = callPackage ../development/python-modules/pip2nix { }; pychef = buildPythonPackage rec { name = "PyChef-${version}"; From 3707ee9b5f46cd0ad9c02bc9aa0f21cbb3114220 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:30:54 -0400 Subject: [PATCH 005/190] pythonPackages.PyChef: refactor move to python-modules --- .../python-modules/pychef/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +--------- 2 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/pychef/default.nix diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix new file mode 100644 index 00000000000..f3c4109dd93 --- /dev/null +++ b/pkgs/development/python-modules/pychef/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, requests +, mock +, unittest2 +}: + +buildPythonPackage rec { + pname = "PyChef"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; + }; + + propagatedBuildInputs = [ six requests mock unittest2 ]; + + # FIXME + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/coderanger/pychef; + description = "Python implementation of a Chef API client"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03793fb646f..f15f6c5d25c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3794,20 +3794,7 @@ in { pip2nix = callPackage ../development/python-modules/pip2nix { }; - pychef = buildPythonPackage rec { - name = "PyChef-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/f9/31/17cde137e3b8ada4d7c80fd4504264f2abed329a9a8100c3622a044c485e/PyChef-0.3.0.tar.gz"; - sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; - }; - - propagatedBuildInputs = with self; [ six requests mock unittest2 ]; - - # FIXME - doCheck = false; - }; + pychef = callPackage ../development/python-modules/pychef { }; pydns = let From 17da4404ca0055a266c92168379cbe2c22d7083b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:35:09 -0400 Subject: [PATCH 006/190] pythonPackages.py3dns: refactor move to python-modules --- .../python-modules/py3dns/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/py3dns/default.nix diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix new file mode 100644 index 00000000000..1e5b84aa262 --- /dev/null +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "py3dns"; + version = "3.1.1a"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz"; + }; + + preConfigure = '' + sed -i \ + -e '/import DNS/d' \ + -e 's/DNS.__version__/"${version}"/g' \ + setup.py + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python 3 DNS library"; + homepage = https://launchpad.net/py3dns; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f15f6c5d25c..f8df0bd01af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3798,25 +3798,7 @@ in { pydns = let - py3 = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "py3dns"; - version = "3.1.1a"; - - src = fetchPypi { - inherit pname version; - sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz"; - }; - - preConfigure = '' - sed -i \ - -e '/import DNS/d' \ - -e 's/DNS.__version__/"${version}"/g' \ - setup.py - ''; - - doCheck = false; - }; + py3 = callPackage ../development/python-modules/py3dns { }; py2 = buildPythonPackage rec { name = "${pname}-${version}"; From ac2e2a3d382b4d7a28303c048e62bc9a5b6818d0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:38:59 -0400 Subject: [PATCH 007/190] pythonPackages.pydns: refactor move to python-modules --- .../python-modules/pydns/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +---------- 2 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pydns/default.nix diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix new file mode 100644 index 00000000000..48bc3c3fa00 --- /dev/null +++ b/pkgs/development/python-modules/pydns/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pydns"; + version = "2.3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python DNS library"; + homepage = http://pydns.sourceforge.net/; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8df0bd01af..33168a0b93d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3800,18 +3800,7 @@ in { let py3 = callPackage ../development/python-modules/py3dns { }; - py2 = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pydns"; - version = "2.3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; - }; - - doCheck = false; - }; + py2 = callPackage ../development/python-modules/pydns { }; in if isPy3k then py3 else py2; pythondaemon = callPackage ../development/python-modules/python-daemon { }; From 60222bc31b116f07ce69b5b7ed5c2d2676b0bb5d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:41:37 -0400 Subject: [PATCH 008/190] pythonPackges.pilkit: refactor move to python-modules --- .../python-modules/pilkit/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------- 2 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/pilkit/default.nix diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix new file mode 100644 index 00000000000..eab44b3724a --- /dev/null +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pillow +, nose_progressive +, nose +, mock +, blessings +}: + +buildPythonPackage rec { + pname = "pilkit"; + version = "1.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "e00585f5466654ea2cdbf7decef9862cb00e16fd363017fa7ef6623a16b0d2c7"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' + ''; + + # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 + doCheck = false; + + buildInputs = [ pillow nose_progressive nose mock blessings ]; + + meta = with stdenv.lib; { + homepage = http://github.com/matthewwithanm/pilkit/; + description = "A collection of utilities and processors for the Python Imaging Libary"; + license = licenses.bsd0; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33168a0b93d..8efc89298af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3807,27 +3807,7 @@ in { sympy = callPackage ../development/python-modules/sympy { }; - pilkit = buildPythonPackage rec { - name = "pilkit-1.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pilkit/${name}.tar.gz"; - sha256 = "e00585f5466654ea2cdbf7decef9862cb00e16fd363017fa7ef6623a16b0d2c7"; - }; - - preConfigure = '' - substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' - ''; - - # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 - doCheck = false; - - buildInputs = with self; [ pillow nose_progressive nose mock blessings ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + pilkit = callPackage ../development/python-modules/pilkit { }; clint = buildPythonPackage rec { name = "clint-0.5.1"; From 28d2a28d954c5811ba5ce023c91bb2b4dd856730 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:44:41 -0400 Subject: [PATCH 009/190] pythonPackages.clint: refactor move to python-modules --- .../python-modules/clint/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +---------- 2 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/clint/default.nix diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix new file mode 100644 index 00000000000..602ab00b084 --- /dev/null +++ b/pkgs/development/python-modules/clint/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, mock +, blessings +, nose +, nose_progressive +, pillow +, args +, pkgs +}: + +buildPythonPackage rec { + pname = "clint"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5"; + }; + + LC_ALL="en_US.UTF-8"; + + checkPhase = '' + ${python.interpreter} test_clint.py + ''; + + buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; + propagatedBuildInputs = [ pillow blessings args ]; + + meta = with stdenv.lib; { + homepage = https://github.com/kennethreitz/clint; + description = "Python Command Line Interface Tools"; + license = licenses.isc; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8efc89298af..20e41b37102 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3809,28 +3809,7 @@ in { pilkit = callPackage ../development/python-modules/pilkit { }; - clint = buildPythonPackage rec { - name = "clint-0.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/clint/${name}.tar.gz"; - sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5"; - }; - - - LC_ALL="en_US.UTF-8"; - - checkPhase = '' - ${python.interpreter} test_clint.py - ''; - - buildInputs = with self; [ mock blessings nose nose_progressive pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ pillow blessings args ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + clint = callPackage ../development/python-modules/clint { }; argh = buildPythonPackage rec { name = "argh-0.26.1"; From 27648d41f0df77a2d4b2e97e62b9c907380ebe52 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:47:07 -0400 Subject: [PATCH 010/190] pythonPackages.argh: refactor move to python-modules --- .../python-modules/argh/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------- 2 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/argh/default.nix diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix new file mode 100644 index 00000000000..04508b3cc1e --- /dev/null +++ b/pkgs/development/python-modules/argh/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, py +, mock +, pkgs +}: + +buildPythonPackage rec { + pname = "argh"; + version = "0.26.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6"; + }; + + buildInputs = [ pytest py mock pkgs.glibcLocales ]; + + checkPhase = '' + export LANG="en_US.UTF-8" + py.test + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/neithere/argh/; + description = "An unobtrusive argparse wrapper with natural syntax"; + license = licenses.lgpl2; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20e41b37102..5bea3b04787 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3811,25 +3811,7 @@ in { clint = callPackage ../development/python-modules/clint { }; - argh = buildPythonPackage rec { - name = "argh-0.26.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/argh/${name}.tar.gz"; - sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6"; - }; - - checkPhase = '' - export LANG="en_US.UTF-8" - py.test - ''; - - buildInputs = with self; [ pytest py mock pkgs.glibcLocales ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + argh = callPackage ../development/python-modules/argh { }; nose_progressive = buildPythonPackage rec { name = "nose-progressive-1.5.1"; From f0be1e20bc7bc0ca9234eaf95724a23028f8841d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:49:37 -0400 Subject: [PATCH 011/190] pythonPackages.nose_progressive: refactor move to python-modules --- .../nose_progressive/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------- 2 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/nose_progressive/default.nix diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix new file mode 100644 index 00000000000..98e34212cb8 --- /dev/null +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, pillow +, blessings +, isPy3k +}: + +buildPythonPackage rec { + pname = "nose-progressive"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ pillow blessings ]; + + # fails with obscure error + doCheck = !isPy3k; + + meta = with stdenv.lib; { + homepage = https://github.com/erikrose/nose-progressive; + description = "A testrunner with a progress bar and smarter tracebacks"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bea3b04787..f203fb1ffe5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3813,24 +3813,7 @@ in { argh = callPackage ../development/python-modules/argh { }; - nose_progressive = buildPythonPackage rec { - name = "nose-progressive-1.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-progressive/${name}.tar.gz"; - sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pillow blessings ]; - - # fails with obscure error - doCheck = !isPy3k; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + nose_progressive = callPackage ../development/python-modules/nose_progressive { }; blessings = buildPythonPackage rec { name = "blessings-1.6"; From 85e217500edc6ca69643958f6deef6eb9cd7f63e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:52:42 -0400 Subject: [PATCH 012/190] pythonPackages.blessings: refactor move to python-modules --- .../python-modules/blessings/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/blessings/default.nix diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix new file mode 100644 index 00000000000..d1785169654 --- /dev/null +++ b/pkgs/development/python-modules/blessings/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "blessings"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd"; + }; + + # 4 failing tests, 2to3 + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/erikrose/blessings; + description = "A thin, practical wrapper around terminal coloring, styling, and positioning"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f203fb1ffe5..d12855a2304 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3815,23 +3815,7 @@ in { nose_progressive = callPackage ../development/python-modules/nose_progressive { }; - blessings = buildPythonPackage rec { - name = "blessings-1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/blessings/${name}.tar.gz"; - sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd"; - }; - - # 4 failing tests, 2to3 - doCheck = false; - - propagatedBuildInputs = with self; [ ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + blessings = callPackage ../development/python-modules/blessings { }; secretstorage = callPackage ../development/python-modules/secretstorage { }; From 77df3ef7a730bd4727e938665c4bedb42108be2e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:54:35 -0400 Subject: [PATCH 013/190] pythonPackages.semantic: refactor move to python-modules --- .../python-modules/semantic/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/semantic/default.nix diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix new file mode 100644 index 00000000000..b5855fbb143 --- /dev/null +++ b/pkgs/development/python-modules/semantic/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, quantities +, numpy +}: + +buildPythonPackage rec { + pname = "semantic"; + version = "1.0.3"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "bbc47dad03dddb1ba5895612fdfa1e43cfb3c497534976cebacd4f3684b505b4"; + }; + + propagatedBuildInputs = [ quantities numpy ]; + + # strange setuptools error (can not import semantic.test) + doCheck = false; + + meta = with stdenv.lib; { + description = "Common Natural Language Processing Tasks for Python"; + homepage = https://github.com/crm416/semantic; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d12855a2304..796ed9a4cb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3819,27 +3819,7 @@ in { secretstorage = callPackage ../development/python-modules/secretstorage { }; - semantic = buildPythonPackage rec { - name = "semantic-1.0.3"; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [ quantities numpy ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/semantic/semantic-1.0.3.tar.gz"; - sha256 = "bbc47dad03dddb1ba5895612fdfa1e43cfb3c497534976cebacd4f3684b505b4"; - }; - - # strange setuptools error (can not import semantic.test) - doCheck = false; - - meta = with pkgs.stdenv.lib; { - description = "Common Natural Language Processing Tasks for Python"; - homepage = https://github.com/crm416/semantic; - license = licenses.mit; - }; - }; + semantic = callPackage ../development/python-modules/semantic { }; sandboxlib = buildPythonPackage rec { name = "sandboxlib-${version}"; From f6944a991a409ee3411ef6e18dedc6d729524f4d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:56:20 -0400 Subject: [PATCH 014/190] pythonPackages.sandboxlib: refactor move to python-modules --- .../python-modules/sandboxlib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/sandboxlib/default.nix diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix new file mode 100644 index 00000000000..1a3511dab97 --- /dev/null +++ b/pkgs/development/python-modules/sandboxlib/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pbr +, isPy3k +}: + +buildPythonPackage rec { + pname = "sandboxlib"; + version = "0.31"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0csj8hbpylqdkxcpqkcfs73dfvdqkyj23axi8m9drqdi4dhxb41h"; + }; + + buildInputs = [ pbr ]; + + meta = with stdenv.lib; { + description = "Sandboxing Library for Python"; + homepage = https://pypi.python.org/pypi/sandboxlib/0.3.1; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 796ed9a4cb1..bc433c99697 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3821,25 +3821,7 @@ in { semantic = callPackage ../development/python-modules/semantic { }; - sandboxlib = buildPythonPackage rec { - name = "sandboxlib-${version}"; - version = "0.31"; - - disabled = isPy3k; - - buildInputs = [ self.pbr ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sandboxlib/sandboxlib-0.3.1.tar.gz"; - sha256 = "0csj8hbpylqdkxcpqkcfs73dfvdqkyj23axi8m9drqdi4dhxb41h"; - }; - - meta = { - description = "Sandboxing Library for Python"; - homepage = https://pypi.python.org/pypi/sandboxlib/0.3.1; - license = licenses.gpl2; - }; - }; + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; scales = buildPythonPackage rec { name = "scales-${version}"; From af9b13436beb6ee9eeea4c34b5ef020a0c36adca Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:58:34 -0400 Subject: [PATCH 015/190] pythonPackages.scales: refactor move to python-modules --- .../python-modules/scales/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/scales/default.nix diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix new file mode 100644 index 00000000000..4fb169b1558 --- /dev/null +++ b/pkgs/development/python-modules/scales/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, six +}: + +buildPythonPackage rec { + pname = "scales"; + version = "1.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Stats for Python processes"; + homepage = https://www.github.com/Cue/scales; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc433c99697..10f397b047d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3823,27 +3823,7 @@ in { sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - scales = buildPythonPackage rec { - name = "scales-${version}"; - version = "1.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scales/${name}.tar.gz"; - sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; - }; - - buildInputs = with self; optionals doCheck [ nose ]; - # No tests included - doCheck = false; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Stats for Python processes"; - homepage = https://www.github.com/Cue/scales; - license = licenses.asl20; - }; - }; + scales = callPackage ../development/python-modules/scales { }; secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; From 97c89d95d7a979a7f687fe9984ed1892538eca14 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:00:59 -0400 Subject: [PATCH 016/190] pythonPackages.sexpdata: refactor move to python-modules --- .../python-modules/sexpdata/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/sexpdata/default.nix diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix new file mode 100644 index 00000000000..97bb5b35b19 --- /dev/null +++ b/pkgs/development/python-modules/sexpdata/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sexpdata"; + version = "0.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb696bc66b35def5fb356de09481447dff4e9a3ed926823134e1d0f35eade428"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "S-expression parser for Python"; + homepage = "https://github.com/tkf/sexpdata"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10f397b047d..30ebd93b25f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3831,21 +3831,7 @@ in { semantic-version = callPackage ../development/python-modules/semantic-version { }; - sexpdata = buildPythonPackage rec { - name = "sexpdata-0.0.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/sexpdata/${name}.tar.gz"; - sha256 = "eb696bc66b35def5fb356de09481447dff4e9a3ed926823134e1d0f35eade428"; - }; - - doCheck = false; - - meta = { - description = "S-expression parser for Python"; - homepage = "https://github.com/tkf/sexpdata"; - }; - }; - + sexpdata = callPackage ../development/python-modules/sexpdata { }; sh = buildPythonPackage rec { name = "sh-1.11"; From 43584c316130f85572480c72fdbc26856d00a68c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:02:48 -0400 Subject: [PATCH 017/190] pythonPackages.sh: refactor move to python-modules --- .../development/python-modules/sh/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/sh/default.nix diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix new file mode 100644 index 00000000000..f2997b01607 --- /dev/null +++ b/pkgs/development/python-modules/sh/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sh"; + version = "1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python subprocess interface"; + homepage = https://pypi.python.org/pypi/sh/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30ebd93b25f..66f4724daa1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3833,22 +3833,7 @@ in { sexpdata = callPackage ../development/python-modules/sexpdata { }; - sh = buildPythonPackage rec { - name = "sh-1.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sh/${name}.tar.gz"; - sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4"; - }; - - doCheck = false; - - meta = { - description = "Python subprocess interface"; - homepage = https://pypi.python.org/pypi/sh/; - }; - }; - + sh = callPackage ../development/python-modules/sh { }; sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; From ab08ef1f4d00239ee1c556d1d13708b336835a4e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:09:59 -0400 Subject: [PATCH 018/190] pythonPackages.sipsimple: refactor move to python-modules --- .../python-modules/sipsimple/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------ 2 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/sipsimple/default.nix diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix new file mode 100644 index 00000000000..1df36dcf5d0 --- /dev/null +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchdarcs +, isPy3k +, pkgs +, cython +, dnspython +, dateutil +, xcaplib +, msrplib +, lxml +, python-otr +}: + +buildPythonPackage rec { + pname = "sipsimple"; + version = "3.1.1"; + disabled = isPy3k; + + src = fetchdarcs { + url = http://devel.ag-projects.com/repositories/python-sipsimple; + rev = "release-${version}"; + sha256 = "0jdilm11f5aahxrzrkxrfx9sgjgkbla1r0wayc5dzd2wmjrdjyrg"; + }; + + preConfigure = '' + chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure + ''; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; + propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + + meta = with stdenv.lib; { + description = "SIP SIMPLE implementation for Python"; + homepage = http://sipsimpleclient.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66f4724daa1..8a428be33be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3835,33 +3835,7 @@ in { sh = callPackage ../development/python-modules/sh { }; - sipsimple = buildPythonPackage rec { - name = "sipsimple-${version}"; - version = "3.1.1"; - disabled = isPy3k; - - src = pkgs.fetchdarcs { - url = http://devel.ag-projects.com/repositories/python-sipsimple; - rev = "release-${version}"; - sha256 = "0jdilm11f5aahxrzrkxrfx9sgjgkbla1r0wayc5dzd2wmjrdjyrg"; - }; - - preConfigure = '' - chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure - ''; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; - propagatedBuildInputs = with self; [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; - - meta = { - description = "SIP SIMPLE implementation for Python"; - homepage = http://sipsimpleclient.org/; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; - }; - }; - + sipsimple = callPackage ../development/python-modules/sipsimple { }; six = callPackage ../development/python-modules/six { }; From 65758006d29c871a215eb58ce5d0e3cd19727849 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:11:44 -0400 Subject: [PATCH 019/190] pythonPackages.smartdc: refactor move to python-modules --- .../python-modules/smartdc/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/smartdc/default.nix diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix new file mode 100644 index 00000000000..e22c99651e6 --- /dev/null +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, http_signature +}: + +buildPythonPackage rec { + pname = "smartdc"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "36206f4fddecae080c66faf756712537e650936b879abb23a8c428731d2415fe"; + }; + + propagatedBuildInputs = [ requests http_signature ]; + + meta = with stdenv.lib; { + description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; + homepage = https://github.com/atl/py-smartdc; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a428be33be..727ad97ed96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3839,22 +3839,7 @@ in { six = callPackage ../development/python-modules/six { }; - smartdc = buildPythonPackage rec { - name = "smartdc-0.1.12"; - - src = pkgs.fetchurl { - url = mirror://pypi/s/smartdc/smartdc-0.1.12.tar.gz; - sha256 = "36206f4fddecae080c66faf756712537e650936b879abb23a8c428731d2415fe"; - }; - - propagatedBuildInputs = with self; [ requests http_signature ]; - - meta = { - description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; - homepage = https://github.com/atl/py-smartdc; - license = licenses.mit; - }; - }; + smartdc = callPackage ../development/python-modules/smartdc { }; socksipy-branch = buildPythonPackage rec { name = "SocksiPy-branch-1.01"; From 3ed37c1d93589f4d31fc47f81b01ac4cdcb937dc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:13:53 -0400 Subject: [PATCH 020/190] pythonPackages.socksipy-branch: refactor move to python-modules --- .../socksipy-branch/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +----------- 2 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/socksipy-branch/default.nix diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix new file mode 100644 index 00000000000..37961f898f5 --- /dev/null +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "SocksiPy-branch"; + version = "1.01"; + + src = fetchPypi { + inherit pname version; + sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p"; + }; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/socksipy-branch/; + description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 727ad97ed96..51e41287d59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3841,18 +3841,7 @@ in { smartdc = callPackage ../development/python-modules/smartdc { }; - socksipy-branch = buildPythonPackage rec { - name = "SocksiPy-branch-1.01"; - src = pkgs.fetchurl { - url = mirror://pypi/S/SocksiPy-branch/SocksiPy-branch-1.01.tar.gz; - sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p"; - }; - meta = { - homepage = http://code.google.com/p/socksipy-branch/; - description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; - license = licenses.bsd3; - }; - }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; From b8ba7b8cdda7d53a2d21be3a0d232cba7b2e881b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:17:16 -0400 Subject: [PATCH 021/190] pythonPackages.sorl_thumbnail: refactor move to python-modules --- .../python-modules/sorl_thumbnail/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/sorl_thumbnail/default.nix diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix new file mode 100644 index 00000000000..a580f80f281 --- /dev/null +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sorl-thumbnail"; + version = "11.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4"; + }; + + # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://sorl-thumbnail.readthedocs.org/en/latest/; + description = "Thumbnails for Django"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51e41287d59..929cff3e987 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3845,23 +3845,7 @@ in { sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; - sorl_thumbnail = buildPythonPackage rec { - name = "sorl-thumbnail-11.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sorl-thumbnail/${name}.tar.gz"; - sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4"; - }; - - # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. - doCheck = false; - - meta = { - homepage = http://sorl-thumbnail.readthedocs.org/en/latest/; - description = "Thumbnails for Django"; - license = licenses.bsd3; - }; - }; + sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; supervisor = callPackage ../development/python-modules/supervisor {}; From 43f44c87a820ef7011a4349f79a5cca0fecd7b35 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:19:59 -0400 Subject: [PATCH 022/190] pythonPackages.sphinx_rtd_theme: refactor move to python-modules --- .../sphinx_rtd_theme/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/sphinx_rtd_theme/default.nix diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix new file mode 100644 index 00000000000..69845d10c35 --- /dev/null +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinx_rtd_theme"; + version = "0.2.5b2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0grf16fi4g0p3dfh11b1624ic34iqkjhf5i1g6hvsh4nlm0ll00q"; + }; + + meta = with stdenv.lib; { + description = "ReadTheDocs.org theme for Sphinx"; + homepage = https://github.com/snide/sphinx_rtd_theme/; + license = licenses.bsd3; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 929cff3e987..85b8f3993f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3870,21 +3870,7 @@ in { hieroglyph = callPackage ../development/python-modules/hieroglyph { }; - sphinx_rtd_theme = buildPythonPackage (rec { - name = "sphinx_rtd_theme-0.2.5b2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinx_rtd_theme/${name}.tar.gz"; - sha256 = "0grf16fi4g0p3dfh11b1624ic34iqkjhf5i1g6hvsh4nlm0ll00q"; - }; - - meta = { - description = "ReadTheDocs.org theme for Sphinx"; - homepage = https://github.com/snide/sphinx_rtd_theme/; - license = licenses.bsd3; - platforms = platforms.unix; - }; - }); + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; From 6a8ee9b084ca8c35f1fc7523783aca34c2df0cb9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:22:02 -0400 Subject: [PATCH 023/190] pythonPackages.sphinxcontrib-blockdiag: refactor move to python-modules --- .../sphinxcontrib-blockdiag/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix new file mode 100644 index 00000000000..1eeb40ddbc2 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, mock +, sphinx-testing +, sphinx +, blockdiag +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-blockdiag"; + version = "1.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w7q2hhpzk159wd35hlbwkh80hnglqa475blcd9vjwpkv1kgkpvw"; + }; + + buildInputs = [ mock sphinx-testing ]; + propagatedBuildInputs = [ sphinx blockdiag ]; + + # Seems to look for files in the wrong dir + doCheck = false; + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with stdenv.lib; { + description = "Sphinx blockdiag extension"; + homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; + maintainers = with maintainers; [ nand0p ]; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85b8f3993f9..b546ddd7ead 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3878,31 +3878,7 @@ in { sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {}; - sphinxcontrib-blockdiag = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "sphinxcontrib-blockdiag"; - version = "1.5.5"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "1w7q2hhpzk159wd35hlbwkh80hnglqa475blcd9vjwpkv1kgkpvw"; - }; - - buildInputs = with self; [ mock sphinx-testing ]; - propagatedBuildInputs = with self; [ sphinx blockdiag ]; - - # Seems to look for files in the wrong dir - doCheck = false; - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; - - meta = { - description = "Sphinx blockdiag extension"; - homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; - maintainers = with maintainers; [ nand0p ]; - license = licenses.bsd2; - }; - }); + sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; sphinxcontrib-openapi = buildPythonPackage (rec { name = "sphinxcontrib-openapi-0.3.0"; From f2a6838ff1c76405a3b6b9754d7b997665a61205 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:25:04 -0400 Subject: [PATCH 024/190] pythonPackages.sphinxcontrib-openapi: refactor move to python-modules --- .../sphinxcontrib-openapi/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +-------- 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib-openapi/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix new file mode 100644 index 00000000000..a800694ad94 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pyyaml +, jsonschema +, sphinxcontrib_httpdomain +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-openapi"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fyniq37nnmhrk4j7mzvg6vfcpb624hb9x70g6mccyw4xrnhadv6"; + }; + + propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ikalnytskyi/sphinxcontrib-openapi; + description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b546ddd7ead..602955278df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3880,18 +3880,7 @@ in { sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; - sphinxcontrib-openapi = buildPythonPackage (rec { - name = "sphinxcontrib-openapi-0.3.0"; - - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinxcontrib-openapi/${name}.tar.gz"; - sha256 = "0fyniq37nnmhrk4j7mzvg6vfcpb624hb9x70g6mccyw4xrnhadv6"; - }; - - propagatedBuildInputs = with self; [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; - }); + sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; sphinxcontrib_httpdomain = buildPythonPackage (rec { name = "sphinxcontrib-httpdomain-1.5.0"; From 56dfe057d24532d757450bb69843c6bc9d80bfff Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 10:27:21 -0400 Subject: [PATCH 025/190] pythonPackages.sphinxcontrib_httpdomain: refactor move to python-modules --- .../sphinxcontrib_httpdomain/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix new file mode 100644 index 00000000000..8416e9b3d8d --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-httpdomain"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a"; + }; + + propagatedBuildInputs = [ sphinx ]; + + # Check is disabled due to this issue: + # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype + doCheck = false; + + meta = with stdenv.lib; { + description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; + homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 602955278df..2baf62af4fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3882,28 +3882,7 @@ in { sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; - sphinxcontrib_httpdomain = buildPythonPackage (rec { - name = "sphinxcontrib-httpdomain-1.5.0"; - - # Check is disabled due to this issue: - # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinxcontrib-httpdomain/${name}.tar.gz"; - sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a"; - }; - - propagatedBuildInputs = with self; [sphinx]; - - meta = { - description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; - - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; - - license = "BSD"; - }; - }); + sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; From b92275305346ea38f8253a1f71ffb30054a8864a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:28:45 -0400 Subject: [PATCH 026/190] pythonPackages.sphinxcontrib_newsfeed: refactor move to ypthon-modules --- .../sphinxcontrib_newsfeed/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix new file mode 100644 index 00000000000..2dfaf7dbc14 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-newsfeed"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; + }; + + propagatedBuildInputs = [ sphinx ]; + + meta = with stdenv.lib; { + description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; + homepage = https://bitbucket.org/prometheus/sphinxcontrib-newsfeed; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2baf62af4fe..19999b9fb82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3886,22 +3886,7 @@ in { sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; - sphinxcontrib_newsfeed = buildPythonPackage (rec { - name = "sphinxcontrib-newsfeed-${version}"; - version = "0.1.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinxcontrib-newsfeed/${name}.tar.gz"; - sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; - }; - - propagatedBuildInputs = with self; [sphinx]; - - meta = { - description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = https://bitbucket.org/prometheus/sphinxcontrib-newsfeed; - license = licenses.bsd2; - }; - }); + sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; sphinxcontrib_plantuml = buildPythonPackage (rec { name = "sphinxcontrib-plantuml-0.7"; From 44713571fc1cf57973dcbb248fe395441c87c321 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:30:54 -0400 Subject: [PATCH 027/190] pythonPackages.sphinxcontrib_plantuml: refactor move to python-modules --- .../sphinxcontrib_plantuml/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix new file mode 100644 index 00000000000..3b9119d6651 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +, plantuml +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-plantuml"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv"; + }; + + # No tests included. + doCheck = false; + + propagatedBuildInputs = [ sphinx plantuml ]; + + meta = with stdenv.lib; { + description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; + homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + license = with licenses; [ bsd2 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19999b9fb82..4f006f0f556 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3888,25 +3888,7 @@ in { sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = buildPythonPackage (rec { - name = "sphinxcontrib-plantuml-0.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinxcontrib-plantuml/${name}.tar.gz"; - sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv"; - }; - - # No tests included. - doCheck = false; - - propagatedBuildInputs = with self; [sphinx plantuml]; - - meta = { - description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; - license = with licenses; [ bsd2 ]; - }; - }); + sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { }; sphinxcontrib-spelling = buildPythonPackage (rec { name = "${pname}-${version}"; From 2caa59c9574a2c45963c7adb0dc852a9f6b7321c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:32:44 -0400 Subject: [PATCH 028/190] pythonPackages.sphinxcontrib-spelling: refactor move to python-modules --- .../sphinxcontrib-spelling/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------- 2 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib-spelling/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix new file mode 100644 index 00000000000..4d9a4b2ba94 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, sphinx +, pyenchant +, pbr +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-spelling"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f0fymrk4kvhqs0vj9gay4lhacxkfrlrpj4gvg0p4wjdczplxd3z"; + }; + + propagatedBuildInputs = [ sphinx pyenchant pbr ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Sphinx spelling extension"; + homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; + maintainers = with maintainers; [ nand0p ]; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f006f0f556..d3acc17aaed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3890,24 +3890,7 @@ in { sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { }; - sphinxcontrib-spelling = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "sphinxcontrib-spelling"; - version = "2.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "1f0fymrk4kvhqs0vj9gay4lhacxkfrlrpj4gvg0p4wjdczplxd3z"; - }; - propagatedBuildInputs = with self; [ sphinx pyenchant pbr ]; - # No tests included - doCheck = false; - meta = { - description = "Sphinx spelling extension"; - homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; - maintainers = with maintainers; [ nand0p ]; - license = licenses.bsd2; - }; - }); + sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; From c878599aab1ee38230ae12ce387891ee17f873cc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:34:40 -0400 Subject: [PATCH 029/190] pythonPackages.sphinx_pypi_upload: refactor move to python-modules --- .../sphinx_pypi_upload/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/sphinx_pypi_upload/default.nix diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix new file mode 100644 index 00000000000..52590817c71 --- /dev/null +++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "Sphinx-PyPI-upload"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159"; + }; + + meta = with stdenv.lib; { + description = "Setuptools command for uploading Sphinx documentation to PyPI"; + homepage = https://bitbucket.org/jezdez/sphinx-pypi-upload/; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3acc17aaed..024290d0434 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3894,22 +3894,7 @@ in { sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; - sphinx_pypi_upload = buildPythonPackage (rec { - name = "Sphinx-PyPI-upload-0.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/Sphinx-PyPI-upload/${name}.tar.gz"; - sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159"; - }; - - meta = { - description = "Setuptools command for uploading Sphinx documentation to PyPI"; - - homepage = https://bitbucket.org/jezdez/sphinx-pypi-upload/; - - license = "BSD"; - }; - }); + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; splinter = callPackage ../development/python-modules/splinter { }; From e186e5a5edd5d3d6ae1249e1e4ac5332e229a0ae Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:36:55 -0400 Subject: [PATCH 030/190] pythonPackages.Pweave: refactor move to python-modules --- .../python-modules/pweave/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pweave/default.nix diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix new file mode 100644 index 00000000000..980a1df6d05 --- /dev/null +++ b/pkgs/development/python-modules/pweave/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +, matplotlib +, pkgs +}: + +buildPythonPackage rec { + pname = "Pweave"; + version = "0.25"; + + src = fetchPypi { + inherit pname version; + sha256 = "1isqjz66c7vxdaqfwpkspki9p4054dsfx7pznwz28ik634hnj3qw"; + }; + + buildInputs = [ mock pkgs.glibcLocales ]; + propagatedBuildInputs = [ matplotlib ]; + + # fails due to trying to run CSS as test + doCheck = false; + + meta = with stdenv.lib; { + description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; + homepage = http://mpastell.com/pweave/ ; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 024290d0434..d5de9b31551 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3900,29 +3900,7 @@ in { spotipy = callPackage ../development/python-modules/spotipy { }; - Pweave = buildPythonPackage (rec { - name = "Pweave-0.25"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/f6/2f/e9735b04747ae5ef29d64e0b215fb0e11f1c89826097ac17342efebbbb84/Pweave-0.25.tar.gz"; - sha256 = "1isqjz66c7vxdaqfwpkspki9p4054dsfx7pznwz28ik634hnj3qw"; - }; - - buildInputs = with self; [ mock pkgs.glibcLocales ]; - - propagatedBuildInputs = with self; [ - matplotlib - ]; - - # fails due to trying to run CSS as test - doCheck = false; - - meta = { - description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; - homepage = http://mpastell.com/pweave/ ; - license = licenses.bsd3; - }; - }); + Pweave = callPackage ../development/python-modules/pweave { }; sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; From 0f2194508c909d740af4ff61f7dbed572f4720ca Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:44:08 -0400 Subject: [PATCH 031/190] pythonPackages.sqlalchemy-imageattach: refactor move to python-modules --- .../sqlalchemy-imageattach/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +------------- 2 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/sqlalchemy-imageattach/default.nix diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix new file mode 100644 index 00000000000..53eb223b25a --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pytest +, Wand +, webob +, sqlalchemy +, isPyPy +, pkgs +}: + +buildPythonPackage rec { + pname = "SQLAlchemy-ImageAttach"; + version = "1.0.0"; + + src = pkgs.fetchFromGitHub { + repo = "sqlalchemy-imageattach"; + owner = "dahlia"; + rev = "${version}"; + sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig"; + }; + + checkInputs = [ pytest Wand.imagemagick webob ]; + propagatedBuildInputs = [ sqlalchemy Wand ]; + + checkPhase = '' + cd tests + export MAGICK_HOME="${pkgs.imagemagick.dev}" + export PYTHONPATH=$PYTHONPATH:../ + py.test + cd .. + ''; + + doCheck = !isPyPy; # failures due to sqla version mismatch + + meta = with stdenv.lib; { + homepage = https://github.com/dahlia/sqlalchemy-imageattach; + description = "SQLAlchemy extension for attaching images to entity objects"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5de9b31551..e2c9090ce4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3904,36 +3904,7 @@ in { sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; - SQLAlchemy-ImageAttach = buildPythonPackage rec { - pname = "SQLAlchemy-ImageAttach"; - version = "1.0.0"; - name = "${pname}-${version}"; - - src = pkgs.fetchFromGitHub { - repo = "sqlalchemy-imageattach"; - owner = "dahlia"; - rev = "${version}"; - sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig"; - }; - - checkInputs = with self; [ pytest Wand.imagemagick webob ]; - propagatedBuildInputs = with self; [ sqlalchemy Wand ]; - - checkPhase = '' - cd tests - export MAGICK_HOME="${pkgs.imagemagick.dev}" - export PYTHONPATH=$PYTHONPATH:../ - py.test - cd .. - ''; - doCheck = !isPyPy; # failures due to sqla version mismatch - - meta = { - homepage = https://github.com/dahlia/sqlalchemy-imageattach; - description = "SQLAlchemy extension for attaching images to entity objects"; - license = licenses.mit; - }; - }; + SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; From d921831bec5428e9640a707a00ee705141184f5d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:45:54 -0400 Subject: [PATCH 032/190] pythonPackages.sqlparse: refactor move to python-modules --- .../python-modules/sqlparse/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------- 2 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/sqlparse/default.nix diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix new file mode 100644 index 00000000000..934bf79de5d --- /dev/null +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, isPy3k +}: + +buildPythonPackage rec { + pname = "sqlparse"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "08dszglfhf1c4rwqinkbp4x55v0b90rgm1fxc1l4dy965imjjinl"; + }; + + buildInputs = [ pytest ]; + checkPhase = '' + py.test + ''; + + # Package supports 3.x, but tests are clearly 2.x only. + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "Non-validating SQL parser for Python"; + longDescription = '' + Provides support for parsing, splitting and formatting SQL statements. + ''; + homepage = https://github.com/andialbrecht/sqlparse; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2c9090ce4f..a38f60d2826 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3908,32 +3908,7 @@ in { sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; - sqlparse = buildPythonPackage rec { - name = "sqlparse-${version}"; - version = "0.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sqlparse/${name}.tar.gz"; - sha256 = "08dszglfhf1c4rwqinkbp4x55v0b90rgm1fxc1l4dy965imjjinl"; - }; - - buildInputs = with self; [ pytest ]; - checkPhase = '' - py.test - ''; - - # Package supports 3.x, but tests are clearly 2.x only. - doCheck = !isPy3k; - - meta = { - description = "Non-validating SQL parser for Python"; - longDescription = '' - Provides support for parsing, splitting and formatting SQL statements. - ''; - homepage = https://github.com/andialbrecht/sqlparse; - license = licenses.bsd3; - }; - }; + sqlparse = callPackage ../development/python-modules/sqlparse { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; From 265b0c85ac5472698d6c26560623ee768cb9cbbf Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:47:35 -0400 Subject: [PATCH 033/190] pythonPackages.python-statsd: refactor move to python-modules --- .../python-modules/python_statsd/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/python_statsd/default.nix diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix new file mode 100644 index 00000000000..744894212c7 --- /dev/null +++ b/pkgs/development/python-modules/python_statsd/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, mock +, nose +, coverage +}: + +buildPythonPackage rec { + pname = "python-statsd"; + version = "1.6.0"; + disabled = isPy3k; # next release will be py3k compatible + + src = fetchPypi { + inherit pname version; + sha256 = "3d2fc153e0d894aa9983531ef47d20d75bd4ee9fd0e46a9d82f452dde58a0a71"; + }; + + buildInputs = [ mock nose coverage ]; + + meta = with stdenv.lib; { + description = "A client for Etsy's node-js statsd server"; + homepage = https://github.com/WoLpH/python-statsd; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a38f60d2826..62da7064f44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3912,25 +3912,7 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; - python_statsd = buildPythonPackage rec { - name = "python-statsd-${version}"; - version = "1.6.0"; - disabled = isPy3k; # next release will be py3k compatible - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-statsd/${name}.tar.gz"; - sha256 = "3d2fc153e0d894aa9983531ef47d20d75bd4ee9fd0e46a9d82f452dde58a0a71"; - }; - - buildInputs = with self; [ mock nose coverage ]; - - meta = { - description = "A client for Etsy's node-js statsd server"; - homepage = https://github.com/WoLpH/python-statsd; - license = licenses.bsd3; - }; - }; - + python_statsd = callPackage ../development/python-modules/python_statsd { }; stompclient = buildPythonPackage (rec { name = "stompclient-0.3.2"; From 21226f859c5a1191871e094aa824e28affa37e08 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:49:27 -0400 Subject: [PATCH 034/190] pythonPackages.stompclient: refactor move to python-modules --- .../python-modules/stompclient/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/stompclient/default.nix diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix new file mode 100644 index 00000000000..1efcd6a6500 --- /dev/null +++ b/pkgs/development/python-modules/stompclient/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, mock +, nose +}: + +buildPythonPackage rec { + pname = "stompclient"; + version = "0.3.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "95a4e98dd0bba348714439ea11a25ee8a74acb8953f95a683924b5bf2a527e4e"; + }; + + buildInputs = [ mock nose ]; + + # XXX: Ran 0 tests in 0.217s + + meta = with stdenv.lib; { + description = "Lightweight and extensible STOMP messaging client"; + homepage = https://bitbucket.org/hozn/stompclient; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62da7064f44..20b0d1ddaf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3914,25 +3914,7 @@ in { python_statsd = callPackage ../development/python-modules/python_statsd { }; - stompclient = buildPythonPackage (rec { - name = "stompclient-0.3.2"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/stompclient/${name}.tar.gz"; - sha256 = "95a4e98dd0bba348714439ea11a25ee8a74acb8953f95a683924b5bf2a527e4e"; - }; - - buildInputs = with self; [ mock nose ]; - - # XXX: Ran 0 tests in 0.217s - - meta = { - description = "Lightweight and extensible STOMP messaging client"; - homepage = https://bitbucket.org/hozn/stompclient; - license = licenses.asl20; - }; - }); + stompclient = callPackage ../development/python-modules/stompclient { }; subdownloader = buildPythonPackage rec { version = "2.0.18"; From ea4065f06a03aff60b537910f77c00f9a96847c7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:51:30 -0400 Subject: [PATCH 035/190] pythonPackages.subdownloader: refactor move to python-modules --- .../python-modules/subdownloader/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 60 +---------------- 2 files changed, 67 insertions(+), 59 deletions(-) create mode 100644 pkgs/development/python-modules/subdownloader/default.nix diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix new file mode 100644 index 00000000000..24b082123b8 --- /dev/null +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, mmpython +, pyqt4 +}: + +buildPythonPackage rec { + version = "2.0.18"; + pname = "subdownloader"; + + src = fetchurl { + url = "https://launchpad.net/subdownloader/trunk/2.0.18/+download/subdownloader_2.0.18.orig.tar.gz"; + sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig"; + }; + + propagatedBuildInputs = [ mmpython pyqt4 ]; + + setup = '' + import os + import sys + + try: + if os.environ.get("NO_SETUPTOOLS"): + raise ImportError() + from setuptools import setup, Extension + SETUPTOOLS = True + except ImportError: + SETUPTOOLS = False + # Use distutils.core as a fallback. + # We won t be able to build the Wheel file on Windows. + from distutils.core import setup, Extension + + with open("README") as fp: + long_description = fp.read() + + requirements = [ ] + + install_options = { + "name": "subdownloader", + "version": "2.0.18", + "description": "Tool for automatic download/upload subtitles for videofiles using fast hashing", + "long_description": long_description, + "url": "http://www.subdownloader.net", + + "scripts": ["run.py"], + "packages": ["cli", "FileManagement", "gui", "languages", "modules"], + + } + if SETUPTOOLS: + install_options["install_requires"] = requirements + + setup(**install_options) + ''; + + postUnpack = '' + echo '${setup}' > $sourceRoot/setup.py + ''; + + meta = with stdenv.lib; { + description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; + homepage = http://www.subdownloader.net; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20b0d1ddaf0..f6fc2a23b1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3916,65 +3916,7 @@ in { stompclient = callPackage ../development/python-modules/stompclient { }; - subdownloader = buildPythonPackage rec { - version = "2.0.18"; - name = "subdownloader-${version}"; - - src = pkgs.fetchurl { - url = "https://launchpad.net/subdownloader/trunk/2.0.18/+download/subdownloader_2.0.18.orig.tar.gz"; - sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig"; - }; - - propagatedBuildInputs = with self; [ mmpython pyqt4 ]; - - setup = '' - import os - import sys - - try: - if os.environ.get("NO_SETUPTOOLS"): - raise ImportError() - from setuptools import setup, Extension - SETUPTOOLS = True - except ImportError: - SETUPTOOLS = False - # Use distutils.core as a fallback. - # We won t be able to build the Wheel file on Windows. - from distutils.core import setup, Extension - - with open("README") as fp: - long_description = fp.read() - - requirements = [ ] - - install_options = { - "name": "subdownloader", - "version": "2.0.18", - "description": "Tool for automatic download/upload subtitles for videofiles using fast hashing", - "long_description": long_description, - "url": "http://www.subdownloader.net", - - "scripts": ["run.py"], - "packages": ["cli", "FileManagement", "gui", "languages", "modules"], - - } - if SETUPTOOLS: - install_options["install_requires"] = requirements - - setup(**install_options) - ''; - - postUnpack = '' - echo '${setup}' > $sourceRoot/setup.py - ''; - - meta = { - description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = http://www.subdownloader.net; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - }; - }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; subunit = buildPythonPackage rec { name = pkgs.subunit.name; From e9207374e17ae12c793aebf7bc02dac83ac5a19a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:52:57 -0400 Subject: [PATCH 036/190] pythonPackages.subunit: refactor move to python-modules --- .../python-modules/subunit/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/subunit/default.nix diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix new file mode 100644 index 00000000000..ac21ea41555 --- /dev/null +++ b/pkgs/development/python-modules/subunit/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, pkgs +, testtools +, testscenarios +}: + +buildPythonPackage rec { + name = pkgs.subunit.name; + src = pkgs.subunit.src; + + propagatedBuildInputs = [ testtools testscenarios ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.check pkgs.cppunit ]; + + patchPhase = '' + sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py + ''; + + meta = pkgs.subunit.meta; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6fc2a23b1d..2e4bee579b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3918,20 +3918,7 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = buildPythonPackage rec { - name = pkgs.subunit.name; - src = pkgs.subunit.src; - - propagatedBuildInputs = with self; [ testtools testscenarios ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.check pkgs.cppunit ]; - - patchPhase = '' - sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py - ''; - - meta = pkgs.subunit.meta; - }; + subunit = callPackage ../development/python-modules/subunit { }; sure = buildPythonPackage rec { name = "sure-${version}"; From e502cd4b3b623550443bd0b8447d484f5059f191 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 17:54:42 -0400 Subject: [PATCH 037/190] pythonPackages.sure: refactor move to python-modules --- .../python-modules/sure/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/sure/default.nix diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix new file mode 100644 index 00000000000..31ec9c12b00 --- /dev/null +++ b/pkgs/development/python-modules/sure/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, six +, mock +, pkgs +, isPyPy +}: + +buildPythonPackage rec { + pname = "sure"; + version = "1.2.24"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1lyjq0rvkbv585dppjdq90lbkm6gyvag3wgrggjzyh7cpyh5c12w"; + }; + + LC_ALL="en_US.UTF-8"; + + buildInputs = [ nose pkgs.glibcLocales ]; + propagatedBuildInputs = [ six mock ]; + + meta = with stdenv.lib; { + description = "Utility belt for automated testing"; + homepage = https://falcao.it/sure/; + license = licenses.gpl3Plus; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e4bee579b5..313aa0d50ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3920,29 +3920,7 @@ in { subunit = callPackage ../development/python-modules/subunit { }; - sure = buildPythonPackage rec { - name = "sure-${version}"; - version = "1.2.24"; - - LC_ALL="en_US.UTF-8"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sure/${name}.tar.gz"; - sha256 = "1lyjq0rvkbv585dppjdq90lbkm6gyvag3wgrggjzyh7cpyh5c12w"; - }; - - buildInputs = with self; [ nose pkgs.glibcLocales ]; - - propagatedBuildInputs = with self; [ six mock ]; - - meta = { - description = "Utility belt for automated testing"; - homepage = https://falcao.it/sure/; - license = licenses.gpl3Plus; - }; - }; + sure = callPackage ../development/python-modules/sure { }; structlog = callPackage ../development/python-modules/structlog { }; From a7dac03113c05214ef40c0a0bbcb587edb0f1be6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 18:03:13 -0400 Subject: [PATCH 038/190] pythonPackages.svgwrite: refactor move to python-modules --- .../python-modules/svgwrite/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/svgwrite/default.nix diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix new file mode 100644 index 00000000000..79e03acd359 --- /dev/null +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, pyparsing +}: + +buildPythonPackage rec { + pname = "svgwrite"; + version = "1.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + description = "A Python library to create SVG drawings"; + homepage = https://bitbucket.org/mozman/svgwrite; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 313aa0d50ad..054e7343eb5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3924,24 +3924,7 @@ in { structlog = callPackage ../development/python-modules/structlog { }; - svgwrite = buildPythonPackage rec { - name = "svgwrite-${version}"; - version = "1.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/svgwrite/${name}.tar.gz"; - sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8"; - }; - - buildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with self; [ pyparsing ]; - - meta = { - description = "A Python library to create SVG drawings"; - homepage = https://bitbucket.org/mozman/svgwrite; - license = licenses.mit; - }; - }; + svgwrite = callPackage ../development/python-modules/svgwrite { }; freezegun = buildPythonPackage rec { name = "freezegun-${version}"; From f80a8fe3ecf782ce1a45d1c915714fe05c3cc9dc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:12:03 -0400 Subject: [PATCH 039/190] pythonPackages.freezegun: refactor move to python-modules --- .../python-modules/freezegun/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/freezegun/default.nix diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix new file mode 100644 index 00000000000..3be87da2f82 --- /dev/null +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, dateutil +, six +, mock +, nose +}: + +buildPythonPackage rec { + pname = "freezegun"; + version = "0.3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sf38d3ibv1jhhvr52x7dhrsiyqk1hm165dfv8w8wh0fhmgxg151"; + }; + + propagatedBuildInputs = [ dateutil six ]; + buildInputs = [ mock nose ]; + + meta = with stdenv.lib; { + description = "FreezeGun: Let your Python tests travel through time"; + homepage = "https://github.com/spulec/freezegun"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 054e7343eb5..f46891f1999 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3926,26 +3926,7 @@ in { svgwrite = callPackage ../development/python-modules/svgwrite { }; - freezegun = buildPythonPackage rec { - name = "freezegun-${version}"; - version = "0.3.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/freezegun/freezegun-${version}.tar.gz"; - sha256 = "1sf38d3ibv1jhhvr52x7dhrsiyqk1hm165dfv8w8wh0fhmgxg151"; - }; - - propagatedBuildInputs = with self; [ - dateutil six - ]; - buildInputs = [ self.mock self.nose ]; - - meta = with stdenv.lib; { - description = "FreezeGun: Let your Python tests travel through time"; - homepage = "https://github.com/spulec/freezegun"; - license = licenses.asl20; - }; - }; + freezegun = callPackage ../development/python-modules/freezegun { }; sybil = callPackage ../development/python-modules/sybil { }; From d3d1bbe3d56ce493312fc7be29ae0c0dd7fe80da Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:17:55 -0400 Subject: [PATCH 040/190] pythonPackges.taskw: refactor move to python-modules --- .../python-modules/taskw/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +------------- 2 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/taskw/default.nix diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix new file mode 100644 index 00000000000..b2cc48b3079 --- /dev/null +++ b/pkgs/development/python-modules/taskw/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, tox +, six +, dateutil +, pytz +, pkgs +}: + +buildPythonPackage rec { + version = "1.0.3"; + pname = "taskw"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n"; + }; + + patches = [ ./use-template-for-taskwarrior-install-path.patch ]; + postPatch = '' + substituteInPlace taskw/warrior.py \ + --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' + ''; + + # https://github.com/ralphbean/taskw/issues/98 + doCheck = false; + + buildInputs = [ nose pkgs.taskwarrior tox ]; + propagatedBuildInputs = [ six dateutil pytz ]; + + meta = with stdenv.lib; { + homepage = https://github.com/ralphbean/taskw; + description = "Python bindings for your taskwarrior database"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pierron ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f46891f1999..c7eec91c11e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3939,35 +3939,7 @@ in { tabulate = callPackage ../development/python-modules/tabulate { }; - taskw = buildPythonPackage rec { - version = "1.0.3"; - name = "taskw-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/taskw/${name}.tar.gz"; - sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n"; - }; - - patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ]; - postPatch = '' - substituteInPlace taskw/warrior.py \ - --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' - ''; - - # https://github.com/ralphbean/taskw/issues/98 - doCheck = false; - - buildInputs = with self; [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = with self; [ six dateutil pytz ]; - - meta = { - homepage = https://github.com/ralphbean/taskw; - description = "Python bindings for your taskwarrior database"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; - }; + taskw = callPackage ../development/python-modules/taskw { }; tempita = callPackage ../development/python-modules/tempita { }; From 9ed9014ab59a907adcf337da7e0d3d6c1335d09b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:19:45 -0400 Subject: [PATCH 041/190] pythonPackages.terminaltables: refactor move to python-modules --- .../python-modules/terminaltables/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/terminaltables/default.nix diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix new file mode 100644 index 00000000000..bb6961f77ec --- /dev/null +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "terminaltables"; + version = "3.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81"; + }; + + meta = with stdenv.lib; { + description = "Display simple tables in terminals"; + homepage = "https://github.com/Robpol86/terminaltables"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7eec91c11e..8f18de8d29a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3945,21 +3945,7 @@ in { terminado = callPackage ../development/python-modules/terminado { }; - terminaltables = buildPythonPackage rec { - name = "terminaltables-${version}"; - version = "3.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/terminaltables/${name}.tar.gz"; - sha256 = "f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81"; - }; - - meta = { - description = "Display simple tables in terminals"; - homepage = "https://github.com/Robpol86/terminaltables"; - license = licenses.mit; - }; - }; + terminaltables = callPackage ../development/python-modules/terminaltables { }; testscenarios = buildPythonPackage rec { name = "testscenarios-${version}"; From 8a9d7350d8bfc0c89816ba76b7473c473ec119f0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:22:32 -0400 Subject: [PATCH 042/190] pythonPackages.testscenarios: refactor move to python-modules --- .../python-modules/testscenarios/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/testscenarios/default.nix diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix new file mode 100644 index 00000000000..61e2ce5a81e --- /dev/null +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, testtools +}: + +buildPythonPackage rec { + pname = "testscenarios"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg"; + }; + + propagatedBuildInputs = [ testtools ]; + + meta = with stdenv.lib; { + description = "A pyunit extension for dependency injection"; + homepage = https://pypi.python.org/pypi/testscenarios; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f18de8d29a..75d37d4eef1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3947,23 +3947,7 @@ in { terminaltables = callPackage ../development/python-modules/terminaltables { }; - testscenarios = buildPythonPackage rec { - name = "testscenarios-${version}"; - version = "0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testscenarios/${name}.tar.gz"; - sha256 = "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg"; - }; - - propagatedBuildInputs = with self; [ testtools ]; - - meta = { - description = "A pyunit extension for dependency injection"; - homepage = https://pypi.python.org/pypi/testscenarios; - license = licenses.asl20; - }; - }; + testscenarios = callPackage ../development/python-modules/testscenarios { }; testpath = buildPythonPackage rec { pname = "testpath"; From f8e0efb139bca25a422a5e08e57f2819a43dea9b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:24:29 -0400 Subject: [PATCH 043/190] pythonPackages.testpath: refactor move to python-modules --- .../python-modules/testpath/default.nix | 22 ++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------------ 2 files changed, 23 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/testpath/default.nix diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix new file mode 100644 index 00000000000..cda5abda529 --- /dev/null +++ b/pkgs/development/python-modules/testpath/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "testpath"; + version = "0.3"; + format = "wheel"; + + src = fetchPypi { + inherit pname version format; + sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; + }; + + meta = with stdenv.lib; { + description = "Test utilities for code working with files and commands"; + license = licenses.mit; + homepage = https://github.com/jupyter/testpath; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75d37d4eef1..923a2d8db60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3949,34 +3949,7 @@ in { testscenarios = callPackage ../development/python-modules/testscenarios { }; - testpath = buildPythonPackage rec { - pname = "testpath"; - version = "0.3"; - name = "${pname}-${version}"; - - #format = "flit"; - #src = pkgs.fetchFromGitHub { - # owner = "jupyter"; - # repo = pname; - # rev = "${version}"; - # sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9"; - #}; - #doCheck = true; - #checkPhase = '' - # ${python.interpreter} -m unittest discover - #''; - format = "wheel"; - src = fetchPypi { - inherit pname version format; - sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; - }; - - meta = { - description = "Test utilities for code working with files and commands"; - license = licenses.mit; - homepage = https://github.com/jupyter/testpath; - }; - }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = buildPythonPackage rec { name = "testrepository-${version}"; From 52492477a67fa60d7f2fe7d7cbfbd18d81e711fa Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:27:29 -0400 Subject: [PATCH 044/190] pythonPackages.testrepository: refactor move to python-modules --- .../python-modules/testrepository/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/testrepository/default.nix diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix new file mode 100644 index 00000000000..dbc342c1c4d --- /dev/null +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, testtools +, testresources +, pbr +, subunit +, fixtures +, python +}: + +buildPythonPackage rec { + pname = "testrepository"; + version = "0.0.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"; + }; + + buildInputs = [ testtools testresources ]; + propagatedBuildInputs = [ pbr subunit fixtures ]; + + checkPhase = '' + ${python.interpreter} ./testr + ''; + + meta = with stdenv.lib; { + description = "A database of test results which can be used as part of developer workflow"; + homepage = https://pypi.python.org/pypi/testrepository; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 923a2d8db60..db71ef48151 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3951,28 +3951,7 @@ in { testpath = callPackage ../development/python-modules/testpath { }; - testrepository = buildPythonPackage rec { - name = "testrepository-${version}"; - version = "0.0.20"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testrepository/${name}.tar.gz"; - sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"; - }; - - buildInputs = with self; [ testtools testresources ]; - propagatedBuildInputs = with self; [ pbr subunit fixtures ]; - - checkPhase = '' - ${python.interpreter} ./testr - ''; - - meta = { - description = "A database of test results which can be used as part of developer workflow"; - homepage = https://pypi.python.org/pypi/testrepository; - license = licenses.bsd2; - }; - }; + testrepository = callPackage ../development/python-modules/testrepository { }; testresources = callPackage ../development/python-modules/testresources { }; From 8d26762f197b6dd39a66789bc8c3c75dbc7dff40 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:29:16 -0400 Subject: [PATCH 045/190] pythonPackages.python_mineparse: refactor move to python-modules --- .../python_mimeparse/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/python_mimeparse/default.nix diff --git a/pkgs/development/python-modules/python_mimeparse/default.nix b/pkgs/development/python-modules/python_mimeparse/default.nix new file mode 100644 index 00000000000..755a73d2909 --- /dev/null +++ b/pkgs/development/python-modules/python_mimeparse/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-mimeparse"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; + homepage = https://code.google.com/p/mimeparse/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db71ef48151..3f10623a5f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3961,25 +3961,7 @@ in { transitions = callPackage ../development/python-modules/transitions { }; - python_mimeparse = buildPythonPackage rec { - name = "python-mimeparse-${version}"; - version = "0.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-mimeparse/${name}.tar.gz"; - sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; - homepage = https://code.google.com/p/mimeparse/; - license = licenses.mit; - }; - }; - + python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; extras = callPackage ../development/python-modules/extras { }; From c3793aa1b1b3ab8d1a9fdf74c34f659c0c568b65 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:34:55 -0400 Subject: [PATCH 046/190] pythonPackages.tkinter: refactor move to python-modules --- .../python-modules/tkinter/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/tkinter/default.nix diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix new file mode 100644 index 00000000000..bd242c62ab8 --- /dev/null +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, python +, py +, isPyPy +}: + +buildPythonPackage rec { + name = "tkinter-${python.version}"; + src = py; + format = "other"; + + disabled = isPyPy; + + installPhase = '' + # Move the tkinter module + mkdir -p $out/${py.sitePackages} + mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/ + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + # Update the rpath to point to python without x11Support + old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*) + new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" ) + patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter* + ''; + + meta = py.meta; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f10623a5f7..12695c68582 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3977,26 +3977,7 @@ in { # Python package. tkinter = let py = python.override{x11Support=true;}; - in buildPythonPackage rec { - name = "tkinter-${python.version}"; - src = py; - format = "other"; - - disabled = isPyPy; - - installPhase = '' - # Move the tkinter module - mkdir -p $out/${py.sitePackages} - mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/ - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - # Update the rpath to point to python without x11Support - old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*) - new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" ) - patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter* - ''; - - meta = py.meta; - }; + in callPackage ../development/python-modules/tkinter { py = py; }; tlslite = buildPythonPackage rec { name = "tlslite-${version}"; From 6986e9ecacdaf516d02d0791deb86b3db9c0a0a8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:36:53 -0400 Subject: [PATCH 047/190] pythonPackages.tlslite: refactor move to python-modules --- .../python-modules/tlslite/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/tlslite/default.nix diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix new file mode 100644 index 00000000000..75d622ef34f --- /dev/null +++ b/pkgs/development/python-modules/tlslite/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "tlslite"; + version = "0.4.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r"; + }; + + meta = with stdenv.lib; { + description = "A pure Python implementation of SSL and TLS"; + homepage = https://pypi.python.org/pypi/tlslite; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12695c68582..70cb6137343 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3979,21 +3979,7 @@ in { py = python.override{x11Support=true;}; in callPackage ../development/python-modules/tkinter { py = py; }; - tlslite = buildPythonPackage rec { - name = "tlslite-${version}"; - version = "0.4.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tlslite/${name}.tar.gz"; - sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r"; - }; - - meta = { - description = "A pure Python implementation of SSL and TLS"; - homepage = https://pypi.python.org/pypi/tlslite; - license = licenses.bsd3; - }; - }; + tlslite = callPackage ../development/python-modules/tlslite { }; qrcode = buildPythonPackage rec { name = "qrcode-${version}"; From 4ed0fd0b12acc7b722a59a70be5bd1b0a5fdfadb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:40:17 -0400 Subject: [PATCH 048/190] pythonPackages.qrcode: refactor move to python-modules --- .../python-modules/qrcode/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/qrcode/default.nix diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix new file mode 100644 index 00000000000..173f3f579b1 --- /dev/null +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, pillow +, pymaging_png +, mock +}: + +buildPythonPackage rec { + pname = "qrcode"; + version = "5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; + }; + + propagatedBuildInputs = [ six pillow pymaging_png ]; + checkInputs = [ mock ]; + + meta = with stdenv.lib; { + description = "Quick Response code generation for Python"; + homepage = "https://pypi.python.org/pypi/qrcode"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70cb6137343..ea5cbfcbd7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3981,24 +3981,7 @@ in { tlslite = callPackage ../development/python-modules/tlslite { }; - qrcode = buildPythonPackage rec { - name = "qrcode-${version}"; - version = "5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/qrcode/${name}.tar.gz"; - sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; - }; - - propagatedBuildInputs = with self; [ six pillow pymaging_png ]; - checkInputs = [ self.mock ]; - - meta = { - description = "Quick Response code generation for Python"; - homepage = "https://pypi.python.org/pypi/qrcode"; - license = licenses.bsd3; - }; - }; + qrcode = callPackage ../development/python-modules/qrcode { }; tmdb3 = callPackage ../development/python-modules/tmdb3 { }; From 482b9eac1f24598023d9cb434a983aebd14e7383 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:46:44 -0400 Subject: [PATCH 049/190] pythonPackages.traits: refactor move to python-modules --- .../python-modules/traits/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +-------------- 2 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/traits/default.nix diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix new file mode 100644 index 00000000000..380827e6488 --- /dev/null +++ b/pkgs/development/python-modules/traits/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, pytest +, numpy +, isPy33 +}: + +buildPythonPackage rec { + pname = "traits"; + version = "4.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx"; + }; + + # Use pytest because its easier to discover tests + buildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + # Test suite is broken for 3.x on latest release + # https://github.com/enthought/traits/issues/187 + # https://github.com/enthought/traits/pull/188 + # Furthermore, some tests fail due to being in a chroot + doCheck = isPy33; + + meta = with stdenv.lib; { + description = "Explicitly typed attributes for Python"; + homepage = https://pypi.python.org/pypi/traits; + license = "BSD"; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea5cbfcbd7b..ae6844a1072 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3995,36 +3995,7 @@ in { smmap2 = callPackage ../development/python-modules/smmap2 { }; - traits = buildPythonPackage rec { - name = "traits-${version}"; - version = "4.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/traits/${name}.tar.gz"; - sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx"; - }; - - # Use pytest because its easier to discover tests - buildInputs = with self; [ pytest ]; - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - # Test suite is broken for 3.x on latest release - # https://github.com/enthought/traits/issues/187 - # https://github.com/enthought/traits/pull/188 - # Furthermore, some tests fail due to being in a chroot - doCheck = isPy33; - - propagatedBuildInputs = with self; [ numpy ]; - - meta = { - description = "Explicitly typed attributes for Python"; - homepage = https://pypi.python.org/pypi/traits; - license = "BSD"; - }; - }; - + traits = callPackage ../development/python-modules/traits { }; transaction = callPackage ../development/python-modules/transaction { }; From 48cf32e573bec5ac0af908ff8aa3a11d3b715413 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:49:31 -0400 Subject: [PATCH 050/190] pythonPackages.transmissionrpc: refactor move to python-modules --- .../transmissionrpc/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/transmissionrpc/default.nix diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix new file mode 100644 index 00000000000..932045b6502 --- /dev/null +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "transmissionrpc"; + version = "0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Python implementation of the Transmission bittorent client RPC protocol"; + homepage = https://pypi.python.org/pypi/transmissionrpc/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae6844a1072..348d073ed36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3999,24 +3999,7 @@ in { transaction = callPackage ../development/python-modules/transaction { }; - - transmissionrpc = buildPythonPackage rec { - name = "transmissionrpc-${version}"; - version = "0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/transmissionrpc/${name}.tar.gz"; - sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; - }; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Python implementation of the Transmission bittorent client RPC protocol"; - homepage = https://pypi.python.org/pypi/transmissionrpc/; - license = licenses.mit; - }; - }; + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; eggdeps = buildPythonPackage rec { name = "eggdeps-${version}"; From 3a9d15d951a2a0bef2d53b069d1e027089c4ffef Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:52:36 -0400 Subject: [PATCH 051/190] pythonPackages.eggdeps: refactor move to python-modules --- .../python-modules/eggdeps/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/eggdeps/default.nix diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix new file mode 100644 index 00000000000..0622bd41d23 --- /dev/null +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_interface +, zope_testing +}: + +buildPythonPackage rec { + pname = "eggdeps"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a"; + }; + + propagatedBuildInputs = [ zope_interface zope_testing ]; + + # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + doCheck = false; + + meta = with stdenv.lib; { + description = "A tool which computes a dependency graph between active Python eggs"; + homepage = http://thomas-lotze.de/en/software/eggdeps/; + license = licenses.zpl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 348d073ed36..71bb5a31889 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4001,25 +4001,7 @@ in { transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - eggdeps = buildPythonPackage rec { - name = "eggdeps-${version}"; - version = "0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tl.eggdeps/tl.${name}.tar.gz"; - sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a"; - }; - - # tests fail, see http://hydra.nixos.org/build/4316603/log/raw - doCheck = false; - - propagatedBuildInputs = with self; [ zope_interface zope_testing ]; - meta = { - description = "A tool which computes a dependency graph between active Python eggs"; - homepage = http://thomas-lotze.de/en/software/eggdeps/; - license = licenses.zpl20; - }; - }; + eggdeps = callPackage ../development/python-modules/eggdeps { }; TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; From 0f6fdbf26e6adc56f1b0d2d81a05f6ab9fdeba3c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:55:48 -0400 Subject: [PATCH 052/190] pythonPackages.twiggy: refactor move to python-modules --- .../python-modules/twiggy/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------------- 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/twiggy/default.nix diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix new file mode 100644 index 00000000000..550ec327990 --- /dev/null +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "Twiggy"; + version = "0.4.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e8f1894e5aee522db6cb245ccbfde3c5d1aa08d31330c7e3af783b0e66eec23"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://twiggy.wearpants.org; + # Taken from http://i.wearpants.org/blog/meet-twiggy/ + description = "Twiggy is the first totally new design for a logger since log4j"; + license = licenses.bsd3; + maintainers = with maintainers; [ pierron ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71bb5a31889..2e93be7b420 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4007,26 +4007,7 @@ in { tweepy = callPackage ../development/python-modules/tweepy { }; - twiggy = buildPythonPackage rec { - name = "Twiggy-${version}"; - version = "0.4.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/T/Twiggy/Twiggy-0.4.5.tar.gz"; - sha256 = "4e8f1894e5aee522db6cb245ccbfde3c5d1aa08d31330c7e3af783b0e66eec23"; - }; - - doCheck = false; - - meta = { - homepage = http://twiggy.wearpants.org; - # Taken from http://i.wearpants.org/blog/meet-twiggy/ - description = "Twiggy is the first totally new design for a logger since log4j"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; - }; + twiggy = callPackage ../development/python-modules/twiggy { }; twill = callPackage ../development/python-modules/twill { }; From 14a237803650b1264146bae30405415560087c48 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:59:40 -0400 Subject: [PATCH 053/190] pythonPackages.twitter: refactor move to python-modules --- .../python-modules/twitter/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/twitter/default.nix diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix new file mode 100644 index 00000000000..d8f863cab8b --- /dev/null +++ b/pkgs/development/python-modules/twitter/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "twitter"; + version = "1.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m6b17irb9klc345k8174pni724jzy2973z2x2jg69h83hipjw2c"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Twitter API library"; + license = licenses.mit; + maintainers = with maintainers; [ thoughtpolice ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e93be7b420..ce0ad9cfbc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4011,23 +4011,7 @@ in { twill = callPackage ../development/python-modules/twill { }; - twitter = buildPythonPackage rec { - name = "twitter-${version}"; - version = "1.15.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/twitter/${name}.tar.gz"; - sha256 = "1m6b17irb9klc345k8174pni724jzy2973z2x2jg69h83hipjw2c"; - }; - - doCheck = false; - - meta = { - description = "Twitter API library"; - license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice ]; - }; - }; + twitter = callPackage ../development/python-modules/twitter { }; twitter-common-collections = buildPythonPackage rec { pname = "twitter.common.collections"; From 0d041c02ef01fbe100d11484f739cd8b4761f235 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:01:26 -0400 Subject: [PATCH 054/190] pythonPakcages.twitter-common-collections: refactor move to python-modules --- .../twitter-common-collections/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/twitter-common-collections/default.nix diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix new file mode 100644 index 00000000000..b2d6054aa25 --- /dev/null +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, twitter-common-lang +}: + +buildPythonPackage rec { + pname = "twitter.common.collections"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; + }; + + propagatedBuildInputs = [ twitter-common-lang ]; + + meta = with stdenv.lib; { + description = "Twitter's common collections"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce0ad9cfbc8..b2e624e1808 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4013,25 +4013,7 @@ in { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-collections = buildPythonPackage rec { - pname = "twitter.common.collections"; - version = "0.3.9"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; - }; - - propagatedBuildInputs = with self; [ twitter-common-lang ]; - - meta = { - description = "Twitter's common collections"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; + twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; twitter-common-confluence = buildPythonPackage rec { pname = "twitter.common.confluence"; From 1497dff563d327d3815075cdefdfafd7708acdd7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:05:43 -0400 Subject: [PATCH 055/190] pythonPackages.twitter-common-confluence: refactor move to python-modules --- .../twitter-common-confluence/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/twitter-common-confluence/default.nix diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix new file mode 100644 index 00000000000..53605baa3d5 --- /dev/null +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, twitter-common-log +}: + +buildPythonPackage rec { + pname = "twitter.common.confluence"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; + }; + + propagatedBuildInputs = [ twitter-common-log ]; + + meta = with stdenv.lib; { + description = "Twitter's API to the confluence wiki"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2e624e1808..0559ee7f855 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4015,25 +4015,7 @@ in { twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - twitter-common-confluence = buildPythonPackage rec { - pname = "twitter.common.confluence"; - version = "0.3.9"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; - }; - - propagatedBuildInputs = with self; [ twitter-common-log ]; - - meta = { - description = "Twitter's API to the confluence wiki"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; + twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; twitter-common-dirutil = buildPythonPackage rec { pname = "twitter.common.dirutil"; From 81fbd1413e6a91224ed2d97574ee2261a004bef6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:13:15 -0400 Subject: [PATCH 056/190] pythonPakcages.twitter-common-dirutil: refactor move to python-modules --- .../twitter-common-dirutil/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/twitter-common-dirutil/default.nix diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix new file mode 100644 index 00000000000..0172232a750 --- /dev/null +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, twitter-common-lang +}: + +buildPythonPackage rec { + pname = "twitter.common.dirutil"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; + }; + + propagatedBuildInputs = [ twitter-common-lang ]; + + meta = with stdenv.lib; { + description = "Utilities for manipulating and finding files and directories"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0559ee7f855..8ce4b953e80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4017,25 +4017,7 @@ in { twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - twitter-common-dirutil = buildPythonPackage rec { - pname = "twitter.common.dirutil"; - version = "0.3.9"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; - }; - - propagatedBuildInputs = with self; [ twitter-common-lang ]; - - meta = { - description = "Utilities for manipulating and finding files and directories"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; + twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; twitter-common-lang = buildPythonPackage rec { pname = "twitter.common.lang"; From 18c7709d1d0f34151125f8e7c632973c90ee3a0e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:15:21 -0400 Subject: [PATCH 057/190] pythonPackages.twitter-common-lang: refactor move to python-modules --- .../twitter-common-lang/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/twitter-common-lang/default.nix diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix new file mode 100644 index 00000000000..3541dacce4e --- /dev/null +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "twitter.common.lang"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; + }; + + meta = with stdenv.lib; { + description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ce4b953e80..7eec0a12758 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4019,23 +4019,7 @@ in { twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - twitter-common-lang = buildPythonPackage rec { - pname = "twitter.common.lang"; - version = "0.3.9"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; - }; - - meta = { - description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; + twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; twitter-common-log = buildPythonPackage rec { pname = "twitter.common.log"; From 91bf06221fa7959901a0b0ccaf810fc643325725 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:20:31 -0400 Subject: [PATCH 058/190] pythonPakcages.twitter-common-log: refactor move to python-modules --- .../twitter-common-log/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/twitter-common-log/default.nix diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix new file mode 100644 index 00000000000..e3e1f2859da --- /dev/null +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, twitter-common-options +, twitter-common-dirutil +}: + +buildPythonPackage rec { + pname = "twitter.common.log"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; + }; + + propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; + + meta = with stdenv.lib; { + description = "Twitter's common logging library"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7eec0a12758..0ca2da24ca7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4021,25 +4021,7 @@ in { twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - twitter-common-log = buildPythonPackage rec { - pname = "twitter.common.log"; - version = "0.3.9"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; - }; - - propagatedBuildInputs = with self; [ twitter-common-options twitter-common-dirutil ]; - - meta = { - description = "Twitter's common logging library"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; + twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; twitter-common-options = buildPythonPackage rec { pname = "twitter.common.options"; From 6ee690466c4c9de3e76cd4b242cb6d11f3942925 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:24:18 -0400 Subject: [PATCH 059/190] pythonPackages.twitter-common-options: refactor move to python-modules --- .../twitter-common-options/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/twitter-common-options/default.nix diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix new file mode 100644 index 00000000000..36b18403fab --- /dev/null +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "twitter.common.options"; + version = "0.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; + }; + + meta = with stdenv.lib; { + description = "Twitter's optparse wrapper"; + homepage = "https://twitter.github.io/commons/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ca2da24ca7..c81dc75713e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4023,23 +4023,7 @@ in { twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - twitter-common-options = buildPythonPackage rec { - pname = "twitter.common.options"; - version = "0.3.9"; - name = "${pname}-${version}"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; - }; - - meta = { - description = "Twitter's optparse wrapper"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; - }; + twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; twine = callPackage ../development/python-modules/twine { }; From 3af94ba30eda7fc050655d14c6e9c16ece77ec5b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:26:19 -0400 Subject: [PATCH 060/190] pythonPackages.umalqurra: refactor move to python-modules --- .../python-modules/umalqurra/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +--------------- 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/umalqurra/default.nix diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix new file mode 100644 index 00000000000..a41921a9d8c --- /dev/null +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "umalqurra"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "719f6a36f908ada1c29dae0d934dd0f1e1f6e3305784edbec23ad719397de678"; + }; + + # No tests included + doCheck = false; + + # See for license + # https://github.com/tytkal/python-hijiri-ummalqura/issues/4 + meta = with stdenv.lib; { + description = "Date Api that support Hijri Umalqurra calendar"; + homepage = https://github.com/tytkal/python-hijiri-ummalqura; + license = with licenses; [ publicDomain ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c81dc75713e..9f0f49d44b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4039,27 +4039,7 @@ in { ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; - umalqurra = buildPythonPackage rec { - name = "umalqurra-${version}"; - version = "0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/umalqurra/umalqurra-0.2.tar.gz"; - sha256 = "719f6a36f908ada1c29dae0d934dd0f1e1f6e3305784edbec23ad719397de678"; - }; - - # No tests included - doCheck = false; - - # See for license - # https://github.com/tytkal/python-hijiri-ummalqura/issues/4 - meta = { - description = "Date Api that support Hijri Umalqurra calendar"; - homepage = https://github.com/tytkal/python-hijiri-ummalqura; - license = with licenses; [ publicDomain ]; - }; - - }; + umalqurra = callPackage ../development/python-modules/umalqurra { }; umemcache = callPackage ../development/python-modules/umemcache {}; From 864c7f94cf5ddee6c7f7ab85b97e8cc6293b7949 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:30:25 -0400 Subject: [PATCH 061/190] pythonPackages.unicodecsv: refactor move to python-modules --- .../python-modules/unicodecsv/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/unicodecsv/default.nix diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix new file mode 100644 index 00000000000..d0f54a7c6b2 --- /dev/null +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "0.14.1"; + pname = "unicodecsv"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z7pdwkr6lpsa7xbyvaly7pq3akflbnz8gq62829lr28gl1hi301"; + }; + + # ImportError: No module named runtests + doCheck = false; + + meta = with stdenv.lib; { + description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; + homepage = https://github.com/jdunck/python-unicodecsv; + maintainers = with maintainers; [ koral ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f0f49d44b4..991fdd31357 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4043,24 +4043,7 @@ in { umemcache = callPackage ../development/python-modules/umemcache {}; - unicodecsv = buildPythonPackage rec { - version = "0.14.1"; - name = "unicodecsv-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/unicodecsv/${name}.tar.gz"; - sha256 = "1z7pdwkr6lpsa7xbyvaly7pq3akflbnz8gq62829lr28gl1hi301"; - }; - - # ImportError: No module named runtests - doCheck = false; - - meta = { - description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; - homepage = https://github.com/jdunck/python-unicodecsv; - maintainers = with maintainers; [ koral ]; - }; - }; + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; unittest2 = buildPythonPackage rec { version = "1.1.0"; From a81adf0398d3515ce1cd90ab1b73eddbb2b864b1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:36:41 -0400 Subject: [PATCH 062/190] pythonPackages.unittest2: refactor move to python-modules --- .../python-modules/unittest2/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/unittest2/default.nix diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix new file mode 100644 index 00000000000..85ca7157e12 --- /dev/null +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, traceback2 +}: + +buildPythonPackage rec { + version = "1.1.0"; + pname = "unittest2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; + }; + + propagatedBuildInputs = [ six traceback2 ]; + + # # 1.0.0 and up create a circle dependency with traceback2/pbr + doCheck = false; + + postPatch = '' + # argparse is needed for python < 2.7, which we do not support anymore. + substituteInPlace setup.py --replace "argparse" "" + + # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 + sed -i '510i\ return None, False' unittest2/loader.py + # https://github.com/pypa/packaging/pull/36 + sed -i 's/version=VERSION/version=str(VERSION)/' setup.py + ''; + + meta = with stdenv.lib; { + description = "A backport of the new features added to the unittest testing framework"; + homepage = https://pypi.python.org/pypi/unittest2; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 991fdd31357..3ce0758943e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4045,35 +4045,7 @@ in { unicodecsv = callPackage ../development/python-modules/unicodecsv { }; - unittest2 = buildPythonPackage rec { - version = "1.1.0"; - name = "unittest2-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/unittest2/unittest2-${version}.tar.gz"; - sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; - }; - - # # 1.0.0 and up create a circle dependency with traceback2/pbr - doCheck = false; - - postPatch = '' - # argparse is needed for python < 2.7, which we do not support anymore. - substituteInPlace setup.py --replace "argparse" "" - - # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 - sed -i '510i\ return None, False' unittest2/loader.py - # https://github.com/pypa/packaging/pull/36 - sed -i 's/version=VERSION/version=str(VERSION)/' setup.py - ''; - - propagatedBuildInputs = with self; [ six traceback2 ]; - - meta = { - description = "A backport of the new features added to the unittest testing framework"; - homepage = https://pypi.python.org/pypi/unittest2; - }; - }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; From a9b2e725490d7859c9bf2a1b57641f734fba0b1a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:39:02 -0400 Subject: [PATCH 063/190] pythonPackages.uritemplate_py: refactor move to python-modules --- .../python-modules/uritemplate_py/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 ++-------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/uritemplate_py/default.nix diff --git a/pkgs/development/python-modules/uritemplate_py/default.nix b/pkgs/development/python-modules/uritemplate_py/default.nix new file mode 100644 index 00000000000..2fd76926d2d --- /dev/null +++ b/pkgs/development/python-modules/uritemplate_py/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "uritemplate.py"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k5zvc5fyyrgv33mi3p86a9jn5n0pqffs9cviz92fw6q1kf7zvmr"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/uri-templates/uritemplate-py; + description = "Python implementation of URI Template"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ce0758943e..5b4a41c059e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4047,24 +4047,9 @@ in { unittest2 = callPackage ../development/python-modules/unittest2 { }; - unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; - uritemplate_py = buildPythonPackage rec { - name = "uritemplate.py-${version}"; - version = "3.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uritemplate.py/${name}.tar.gz"; - sha256 = "1k5zvc5fyyrgv33mi3p86a9jn5n0pqffs9cviz92fw6q1kf7zvmr"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/uri-templates/uritemplate-py; - description = "Python implementation of URI Template"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - }; + uritemplate_py = callPackage ../development/python-modules/uritemplate_py { }; uritools = callPackage ../development/python-modules/uritools { }; From a95243647b3a42455605376722f1f742ec707a8a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:41:46 -0400 Subject: [PATCH 064/190] pythonPackages.traceback2: refactor move to python-modules --- .../python-modules/traceback2/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/traceback2/default.nix diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix new file mode 100644 index 00000000000..fe15285f065 --- /dev/null +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pbr +, linecache2 +}: + +buildPythonPackage rec { + version = "1.4.0"; + pname = "traceback2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05"; + }; + + propagatedBuildInputs = [ pbr linecache2 ]; + + # circular dependencies for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A backport of traceback to older supported Pythons"; + homepage = https://pypi.python.org/pypi/traceback2/; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b4a41c059e..5cafa6ed0c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4053,24 +4053,7 @@ in { uritools = callPackage ../development/python-modules/uritools { }; - traceback2 = buildPythonPackage rec { - version = "1.4.0"; - name = "traceback2-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/traceback2/traceback2-${version}.tar.gz"; - sha256 = "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05"; - }; - - propagatedBuildInputs = with self; [ pbr linecache2 ]; - # circular dependencies for tests - doCheck = false; - - meta = { - description = "A backport of traceback to older supported Pythons"; - homepage = https://pypi.python.org/pypi/traceback2/; - }; - }; + traceback2 = callPackage ../development/python-modules/traceback2 { }; linecache2 = buildPythonPackage rec { name = "linecache2-${version}"; From 8090784c0cf8a6cc8a9b84454dd3d5ad5dbd1c17 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:45:59 -0400 Subject: [PATCH 065/190] pythonPackages.linecache2: refactor move to python-modules --- .../python-modules/linecache2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/linecache2/default.nix diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix new file mode 100644 index 00000000000..9890d382742 --- /dev/null +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pbr +}: + +buildPythonPackage rec { + pname = "linecache2"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb"; + }; + + buildInputs = [ pbr ]; + # circular dependencies for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A backport of linecache to older supported Pythons"; + homepage = "https://github.com/testing-cabal/linecache2"; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cafa6ed0c0..e0dd52a1bf3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4055,24 +4055,7 @@ in { traceback2 = callPackage ../development/python-modules/traceback2 { }; - linecache2 = buildPythonPackage rec { - name = "linecache2-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/linecache2/${name}.tar.gz"; - sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb"; - }; - - buildInputs = with self; [ pbr ]; - # circular dependencies for tests - doCheck = false; - - meta = with stdenv.lib; { - description = "A backport of linecache to older supported Pythons"; - homepage = "https://github.com/testing-cabal/linecache2"; - }; - }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; upass = buildPythonPackage rec { version = "0.1.4"; From 5f58cd99d5a2145d4495d2ed5940b1acea189b1a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:51:37 -0400 Subject: [PATCH 066/190] pythonPackages.upass: refactor move to python-modules --- .../python-modules/upass/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/upass/default.nix diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix new file mode 100644 index 00000000000..baf536fdbad --- /dev/null +++ b/pkgs/development/python-modules/upass/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, pyperclip +, urwid +}: + +buildPythonPackage rec { + version = "0.1.4"; + pname = "upass"; + + src = fetchurl { + url = "https://github.com/Kwpolska/upass/archive/v${version}.tar.gz"; + sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb"; + }; + + propagatedBuildInputs = [ pyperclip urwid ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Console UI for pass"; + homepage = https://github.com/Kwpolska/upass; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0dd52a1bf3..1d4b44b6fb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4057,28 +4057,7 @@ in { linecache2 = callPackage ../development/python-modules/linecache2 { }; - upass = buildPythonPackage rec { - version = "0.1.4"; - name = "upass-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/Kwpolska/upass/archive/v${version}.tar.gz"; - sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb"; - }; - - propagatedBuildInputs = with self; [ - pyperclip - urwid - ]; - - doCheck = false; - - meta = { - description = "Console UI for pass"; - homepage = https://github.com/Kwpolska/upass; - license = licenses.bsd3; - }; - }; + upass = callPackage ../development/python-modules/upass { }; update_checker = callPackage ../development/python-modules/update_checker {}; From 410edb293a4ab7601a6ba80f672cf214320e1e5b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 12:55:51 -0400 Subject: [PATCH 067/190] pythonPackages.uptime: refactor move to python-modules --- .../python-modules/uptime/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/uptime/default.nix diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix new file mode 100644 index 00000000000..035acbcec2b --- /dev/null +++ b/pkgs/development/python-modules/uptime/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "uptime"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/Cairnarvon/uptime; + description = "Cross-platform way to retrieve system uptime and boot time"; + license = licenses.bsd2; + maintainers = with maintainers; [ rob ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d4b44b6fb6..729af1a38ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4067,22 +4067,7 @@ in { uproot-methods = callPackage ../development/python-modules/uproot-methods { }; - uptime = buildPythonPackage rec { - name = "uptime-${version}"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uptime/${name}.tar.gz"; - sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/Cairnarvon/uptime; - description = "Cross-platform way to retrieve system uptime and boot time"; - license = licenses.bsd2; - maintainers = with maintainers; [ rob ]; - }; - }; + uptime = callPackage ../development/python-modules/uptime { }; urlgrabber = callPackage ../development/python-modules/urlgrabber {}; From 36be37f7f290e1a8f8ed763a3258877d2cabb684 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 13:04:08 -0400 Subject: [PATCH 068/190] pythonPackages.urwidtrees: refactor move to python-modules --- .../python-modules/urwidtrees/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/urwidtrees/default.nix diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix new file mode 100644 index 00000000000..ac9cf73cab1 --- /dev/null +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, urwid +}: + +buildPythonPackage rec { + name = "urwidtrees"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "pazz"; + repo = "urwidtrees"; + rev = "${version}"; + sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa"; + }; + + propagatedBuildInputs = [ urwid ]; + + meta = with stdenv.lib; { + description = "Tree widgets for urwid"; + homepage = https://github.com/pazz/urwidtrees; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 729af1a38ea..4dc96f898ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4073,25 +4073,7 @@ in { urwid = callPackage ../development/python-modules/urwid {}; - urwidtrees = buildPythonPackage rec { - name = "urwidtrees-${rev}"; - rev = "1.0"; - - src = pkgs.fetchFromGitHub { - owner = "pazz"; - repo = "urwidtrees"; - inherit rev; - sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa"; - }; - - propagatedBuildInputs = with self; [ urwid ]; - - meta = { - description = "Tree widgets for urwid"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - }; - }; + urwidtrees = callPackage ../development/python-modules/urwidtrees { }; user-agents = callPackage ../development/python-modules/user-agents { }; From f4e04780a2a1d7705cc62418eb991de5a65980d8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 13:11:53 -0400 Subject: [PATCH 069/190] pythonPackages.pyuv: refactor move to python-modules --- .../python-modules/pyuv/default.nix | 29 +++++++++++++++++++ .../{ => pyuv}/pyuv-external-libuv.patch | 0 pkgs/top-level/python-packages.nix | 21 +------------- 3 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pyuv/default.nix rename pkgs/development/python-modules/{ => pyuv}/pyuv-external-libuv.patch (100%) diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix new file mode 100644 index 00000000000..04e2c2f0818 --- /dev/null +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPyPy +, pkgs +}: + +buildPythonPackage rec { + pname = "pyuv"; + version = "1.2.0"; + disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 + + src = pkgs.fetchurl { + url = "https://github.com/saghul/pyuv/archive/${pname}-${version}.tar.gz"; + sha256 = "19yl1l5l6dq1xr8xcv6dhx1avm350nr4v2358iggcx4ma631rycx"; + }; + + patches = [ ./pyuv-external-libuv.patch ]; + + buildInputs = [ pkgs.libuv ]; + + meta = with stdenv.lib; { + description = "Python interface for libuv"; + homepage = https://github.com/saghul/pyuv; + repositories.git = git://github.com/saghul/pyuv.git; + license = licenses.mit; + }; + +} diff --git a/pkgs/development/python-modules/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch similarity index 100% rename from pkgs/development/python-modules/pyuv-external-libuv.patch rename to pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4dc96f898ba..650eab1cdd8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4077,26 +4077,7 @@ in { user-agents = callPackage ../development/python-modules/user-agents { }; - pyuv = buildPythonPackage rec { - name = "pyuv-1.2.0"; - disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 - - src = pkgs.fetchurl { - url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz"; - sha256 = "19yl1l5l6dq1xr8xcv6dhx1avm350nr4v2358iggcx4ma631rycx"; - }; - - patches = [ ../development/python-modules/pyuv-external-libuv.patch ]; - - buildInputs = with self; [ pkgs.libuv ]; - - meta = { - description = "Python interface for libuv"; - homepage = https://github.com/saghul/pyuv; - repositories.git = git://github.com/saghul/pyuv.git; - license = licenses.mit; - }; - }; + pyuv = callPackage ../development/python-modules/pyuv { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; From fbc0dba3d12f90967c40bb522d3944edb47fc232 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:22:20 -0400 Subject: [PATCH 070/190] pythonPackages.virtualenv-clone: refactor move to python-modules --- .../virtualenv-clone/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/virtualenv-clone/default.nix diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix new file mode 100644 index 00000000000..03a66b63165 --- /dev/null +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, virtualenv +}: + +buildPythonPackage rec { + pname = "virtualenv-clone"; + version = "0.2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "7087ba4eb48acfd5209a3fd03e15d072f28742619127c98333057e32748d91c4"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ virtualenv ]; + + # needs tox to run the tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/edwardgeorge/virtualenv-clone; + description = "Script to clone virtualenvs"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 650eab1cdd8..72820917895 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4087,26 +4087,7 @@ in { virtualenv = callPackage ../development/python-modules/virtualenv { }; - virtualenv-clone = buildPythonPackage rec { - name = "virtualenv-clone-0.2.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/virtualenv-clone/${name}.tar.gz"; - sha256 = "7087ba4eb48acfd5209a3fd03e15d072f28742619127c98333057e32748d91c4"; - }; - - buildInputs = with self; [pytest]; - propagatedBuildInputs = with self; [virtualenv]; - - # needs tox to run the tests - doCheck = false; - - meta = { - description = "Script to clone virtualenvs"; - license = licenses.mit; - platforms = platforms.all; - }; - }; + virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; virtualenvwrapper = buildPythonPackage (rec { name = "virtualenvwrapper-4.3"; From cac8acb654dd452ac5d50d2ee700de325254f1bf Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:24:53 -0400 Subject: [PATCH 071/190] pythonPackages.virtualenvwrapper: refactor move to python-modules --- .../virtualenvwrapper/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 66 +--------------- 2 files changed, 76 insertions(+), 65 deletions(-) create mode 100644 pkgs/development/python-modules/virtualenvwrapper/default.nix diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix new file mode 100644 index 00000000000..4bf1778b9d5 --- /dev/null +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pbr +, pip +, pkgs +, stevedore +, virtualenv +, virtualenv-clone +, python +}: + +buildPythonPackage rec { + pname = "virtualenvwrapper"; + version = "4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f"; + }; + + # pip depend on $HOME setting + preConfigure = "export HOME=$TMPDIR"; + + buildInputs = [ pbr pip pkgs.which ]; + propagatedBuildInputs = [ stevedore virtualenv virtualenv-clone ]; + + postPatch = '' + for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do + substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which" + + # We can't set PYTHONPATH in a normal way (like exporting in a wrapper + # script) because the user has to evaluate the script and we don't want + # modify the global PYTHONPATH which would affect the user's + # environment. + # Furthermore it isn't possible to just use VIRTUALENVWRAPPER_PYTHON + # for this workaround, because this variable is well quoted inside the + # shell script. + # (the trailing " -" is required to only replace things like these one: + # "$VIRTUALENVWRAPPER_PYTHON" -c "import os,[...] and not in + # if-statements or anything like that. + # ...and yes, this "patch" is hacky :) + substituteInPlace "$file" --replace '"$VIRTUALENVWRAPPER_PYTHON" -' 'env PYTHONPATH="$VIRTUALENVWRAPPER_PYTHONPATH" "$VIRTUALENVWRAPPER_PYTHON" -' + done + ''; + + postInstall = '' + # This might look like a dirty hack but we can't use the makeWrapper function because + # the wrapped file were then called via "exec". The virtualenvwrapper shell scripts + # aren't normal executables. Instead, the user has to evaluate them. + + for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do + local wrapper="$out/bin/$file" + local wrapped="$out/bin/.$file-wrapped" + mv "$wrapper" "$wrapped" + + # WARNING: Don't indent the lines below because that would break EOF + cat > "$wrapper" << EOF +export PATH="${python}/bin:\$PATH" +export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" +source "$wrapped" +EOF + + chmod -x "$wrapped" + chmod +x "$wrapper" + done + ''; + + meta = with stdenv.lib; { + description = "Enhancements to virtualenv"; + homepage = "https://pypi.python.org/pypi/virtualenvwrapper"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72820917895..8702d880f0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4089,71 +4089,7 @@ in { virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; - virtualenvwrapper = buildPythonPackage (rec { - name = "virtualenvwrapper-4.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/virtualenvwrapper/${name}.tar.gz"; - sha256 = "514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f"; - }; - - # pip depend on $HOME setting - preConfigure = "export HOME=$TMPDIR"; - - buildInputs = with self; [ pbr pip pkgs.which ]; - propagatedBuildInputs = with self; [ - stevedore - virtualenv - virtualenv-clone - ]; - - postPatch = '' - for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do - substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which" - - # We can't set PYTHONPATH in a normal way (like exporting in a wrapper - # script) because the user has to evaluate the script and we don't want - # modify the global PYTHONPATH which would affect the user's - # environment. - # Furthermore it isn't possible to just use VIRTUALENVWRAPPER_PYTHON - # for this workaround, because this variable is well quoted inside the - # shell script. - # (the trailing " -" is required to only replace things like these one: - # "$VIRTUALENVWRAPPER_PYTHON" -c "import os,[...] and not in - # if-statements or anything like that. - # ...and yes, this "patch" is hacky :) - substituteInPlace "$file" --replace '"$VIRTUALENVWRAPPER_PYTHON" -' 'env PYTHONPATH="$VIRTUALENVWRAPPER_PYTHONPATH" "$VIRTUALENVWRAPPER_PYTHON" -' - done - ''; - - postInstall = '' - # This might look like a dirty hack but we can't use the makeWrapper function because - # the wrapped file were then called via "exec". The virtualenvwrapper shell scripts - # aren't normal executables. Instead, the user has to evaluate them. - - for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do - local wrapper="$out/bin/$file" - local wrapped="$out/bin/.$file-wrapped" - mv "$wrapper" "$wrapped" - - # WARNING: Don't indent the lines below because that would break EOF - cat > "$wrapper" << EOF -export PATH="${python}/bin:\$PATH" -export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" -source "$wrapped" -EOF - - chmod -x "$wrapped" - chmod +x "$wrapper" - done - ''; - - meta = { - description = "Enhancements to virtualenv"; - homepage = "https://pypi.python.org/pypi/virtualenvwrapper"; - license = licenses.mit; - }; - }); + virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; vmprof = buildPythonPackage rec { version = "0.3.3"; From 79112e85225cab9f2a4b1d08b5bef78d2279a92d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:27:06 -0400 Subject: [PATCH 072/190] pythonPackages.vmprof: refactor move to python-modules --- .../python-modules/vmprof/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/vmprof/default.nix diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix new file mode 100644 index 00000000000..9a9693d770e --- /dev/null +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, six +}: + +buildPythonPackage rec { + version = "0.3.3"; + pname = "vmprof"; + + src = fetchPypi { + inherit pname version; + sha256 = "991bc2f1dc824c63e9b399f9e8606deded92a52378d0e449f258807d7556b039"; + }; + + propagatedBuildInputs = [ requests six]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "A vmprof client"; + license = licenses.mit; + homepage = https://vmprof.readthedocs.org/; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8702d880f0d..63df7057691 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4091,28 +4091,7 @@ in { virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; - vmprof = buildPythonPackage rec { - version = "0.3.3"; - name = "vmprof-${version}"; - - # Url using old scheme doesn't seem to work - src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/c3/f3/f039ca77e727c5c2d3e61967a2a5c9ecc0ef6ca235012fd5559febb77cd0/vmprof-0.3.3.tar.gz"; - sha256 = "991bc2f1dc824c63e9b399f9e8606deded92a52378d0e449f258807d7556b039"; - }; - - propagatedBuildInputs = with self; [ requests six]; - - # No tests included - doCheck = false; - - meta = { - description = "A vmprof client"; - license = licenses.mit; - homepage = https://vmprof.readthedocs.org/; - }; - - }; + vmprof = callPackage ../development/python-modules/vmprof { }; vultr = buildPythonPackage rec { version = "0.1.2"; From 1fe585403d17c3a7995bdfa50408aaed15965117 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:29:27 -0400 Subject: [PATCH 073/190] pythonPackages.vultr: refactor move to python-modules --- .../python-modules/vultr/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/vultr/default.nix diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix new file mode 100644 index 00000000000..e66e21f01a6 --- /dev/null +++ b/pkgs/development/python-modules/vultr/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + version = "0.1.2"; + pname = "vultr"; + + src = fetchFromGitHub { + owner = "spry-group"; + repo = "python-vultr"; + rev = "${version}"; + sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; + }; + + propagatedBuildInputs = [ requests ]; + + # Tests disabled. They fail because they try to access the network + doCheck = false; + + meta = with stdenv.lib; { + description = "Vultr.com API Client"; + homepage = "https://github.com/spry-group/python-vultr"; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63df7057691..74796882a81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4093,30 +4093,7 @@ in { vmprof = callPackage ../development/python-modules/vmprof { }; - vultr = buildPythonPackage rec { - version = "0.1.2"; - name = "vultr-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "spry-group"; - repo = "python-vultr"; - rev = "${version}"; - sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - # Tests disabled. They fail because they try to access the network - doCheck = false; - - meta = { - description = "Vultr.com API Client"; - homepage = "https://github.com/spry-group/python-vultr"; - license = licenses.mit; - maintainers = with maintainers; [ lihop ]; - platforms = platforms.all; - }; - }; + vultr = callPackage ../development/python-modules/vultr { }; waitress = buildPythonPackage rec { name = "waitress-1.0.2"; From 88c225d45a96318bb5f225a0e020f4d260969002 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:33:21 -0400 Subject: [PATCH 074/190] pythonPackages.waitress: refactor move to python-modules --- .../python-modules/waitress/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/waitress/default.nix diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix new file mode 100644 index 00000000000..2c1536a7d8a --- /dev/null +++ b/pkgs/development/python-modules/waitress/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "waitress"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pw6yyxi348r2xpq3ykqnf7gwi881azv2422d2ixb0xi5jws2ky7"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Pylons/waitress; + description = "Waitress WSGI server"; + license = licenses.zpl20; + maintainers = with maintainers; [ garbas domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74796882a81..6d8287257cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4095,21 +4095,7 @@ in { vultr = callPackage ../development/python-modules/vultr { }; - waitress = buildPythonPackage rec { - name = "waitress-1.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/waitress/${name}.tar.gz"; - sha256 = "0pw6yyxi348r2xpq3ykqnf7gwi881azv2422d2ixb0xi5jws2ky7"; - }; - - doCheck = false; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; + waitress = callPackage ../development/python-modules/waitress { }; waitress-django = callPackage ../development/python-modules/waitress-django { }; From e273fa73ed566e721db1c776bd29d3e3268d7534 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:34:51 -0400 Subject: [PATCH 075/190] pythonPackages.web: refactor move to python-modules --- .../python-modules/web/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/web/default.nix diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix new file mode 100644 index 00000000000..86c9d435f1e --- /dev/null +++ b/pkgs/development/python-modules/web/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + version = "0.37"; + pname = "web.py"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "748c7e99ad9e36f62ea19f7965eb7dd7860b530e8f563ed60ce3e53e7409a550"; + }; + + meta = with stdenv.lib; { + description = "Makes web apps"; + longDescription = '' + Think about the ideal way to write a web app. + Write the code to make it happen. + ''; + homepage = "http://webpy.org/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ layus ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d8287257cc..5b91c80b50f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4113,27 +4113,7 @@ in { wcwidth = callPackage ../development/python-modules/wcwidth { }; - web = buildPythonPackage rec { - version = "0.37"; - name = "web.py-${version}"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/web.py/web.py-${version}.tar.gz"; - sha256 = "748c7e99ad9e36f62ea19f7965eb7dd7860b530e8f563ed60ce3e53e7409a550"; - }; - - meta = { - description = "Makes web apps"; - longDescription = '' - Think about the ideal way to write a web app. - Write the code to make it happen. - ''; - homepage = "http://webpy.org/"; - license = licenses.publicDomain; - maintainers = with maintainers; [ layus ]; - }; - }; + web = callPackage ../development/python-modules/web { }; webob = buildPythonPackage rec { pname = "WebOb"; From 0e1a1d0bd9f7288e651b152f31f2e91c6c353545 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:36:26 -0400 Subject: [PATCH 076/190] pythonPackges.webob: refactor move to python-modules --- .../python-modules/webob/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/webob/default.nix diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix new file mode 100644 index 00000000000..1271ac3483d --- /dev/null +++ b/pkgs/development/python-modules/webob/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, pytest +}: + +buildPythonPackage rec { + pname = "WebOb"; + version = "1.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "10vjp2rvqiyvw157fk3sy7yds1gknzw97z4gk0qv1raskx5s2p76"; + }; + + propagatedBuildInputs = [ nose pytest ]; + + meta = with stdenv.lib; { + description = "WSGI request and response object"; + homepage = http://pythonpaste.org/webob/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b91c80b50f..937896f2e90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4115,25 +4115,7 @@ in { web = callPackage ../development/python-modules/web { }; - webob = buildPythonPackage rec { - pname = "WebOb"; - version = "1.7.3"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "10vjp2rvqiyvw157fk3sy7yds1gknzw97z4gk0qv1raskx5s2p76"; - }; - - propagatedBuildInputs = with self; [ nose pytest ]; - - meta = { - description = "WSGI request and response object"; - homepage = http://pythonpaste.org/webob/; - platforms = platforms.all; - }; - }; - + webob = callPackage ../development/python-modules/webob { }; websockify = buildPythonPackage rec { version = "0.7.0"; From 1d10b0c74ae6d274325f872d507b81dffe6d979b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:38:34 -0400 Subject: [PATCH 077/190] pythonPackages.websockify: refactor move to python-modules --- .../python-modules/websockify/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/websockify/default.nix diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix new file mode 100644 index 00000000000..326e8faa614 --- /dev/null +++ b/pkgs/development/python-modules/websockify/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "0.7.0"; + pname = "websockify"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v6pmamjprv2x55fvbdaml26ppxdw8v6xz8p0sav3368ajwwgcqc"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + description = "WebSockets support for any application/server"; + homepage = https://github.com/kanaka/websockify; + license = licenses.lgpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 937896f2e90..b57656a5a4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4117,23 +4117,7 @@ in { webob = callPackage ../development/python-modules/webob { }; - websockify = buildPythonPackage rec { - version = "0.7.0"; - name = "websockify-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/websockify/websockify-${version}.tar.gz"; - sha256 = "1v6pmamjprv2x55fvbdaml26ppxdw8v6xz8p0sav3368ajwwgcqc"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - - meta = { - description = "WebSockets support for any application/server"; - homepage = https://github.com/kanaka/websockify; - }; - }; - + websockify = callPackage ../development/python-modules/websockify { }; webtest = buildPythonPackage rec { version = "2.0.20"; From 86c06938cbfe2a98ffb501cad99ef56903dfb592 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:41:47 -0400 Subject: [PATCH 078/190] pythonPackages.webtest: refactor move to python-modules --- .../python-modules/webtest/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +---------------- 2 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/webtest/default.nix diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix new file mode 100644 index 00000000000..d3dd321cb03 --- /dev/null +++ b/pkgs/development/python-modules/webtest/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, webob +, six +, beautifulsoup4 +, waitress +, mock +, pyquery +, wsgiproxy2 +, PasteDeploy +, coverage +}: + +buildPythonPackage rec { + version = "2.0.20"; + pname = "webtest"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace "nose<1.3.0" "nose" + ''; + + propagatedBuildInputs = [ nose webob six beautifulsoup4 waitress mock pyquery wsgiproxy2 PasteDeploy coverage ]; + + meta = with stdenv.lib; { + description = "Helper to test WSGI applications"; + homepage = http://webtest.readthedocs.org/en/latest/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b57656a5a4a..5ea09977f1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4119,38 +4119,7 @@ in { websockify = callPackage ../development/python-modules/websockify { }; - webtest = buildPythonPackage rec { - version = "2.0.20"; - name = "webtest-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/WebTest/WebTest-${version}.tar.gz"; - sha256 = "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"; - }; - - preConfigure = '' - substituteInPlace setup.py --replace "nose<1.3.0" "nose" - ''; - - propagatedBuildInputs = with self; [ - nose - webob - six - beautifulsoup4 - waitress - mock - pyquery - wsgiproxy2 - PasteDeploy - coverage - ]; - - meta = { - description = "Helper to test WSGI applications"; - homepage = http://webtest.readthedocs.org/en/latest/; - platforms = platforms.all; - }; - }; + webtest = callPackage ../development/python-modules/webtest { }; werkzeug = callPackage ../development/python-modules/werkzeug { }; From f6aedb3d6792db1857b46b3adc3f7b21d62fe448 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:44:15 -0400 Subject: [PATCH 079/190] pythonPackages.wsgiproxy2: refactor move to python-modules --- .../python-modules/wsgiproxy2/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------- 2 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/wsgiproxy2/default.nix diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix new file mode 100644 index 00000000000..5fda762b0be --- /dev/null +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, webob +}: + +buildPythonPackage rec { + pname = "WSGIProxy2"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4"; + }; + + propagatedBuildInputs = [ six webob ]; + + # circular dep on webtest + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pythonpaste.org/wsgiproxy/; + description = "HTTP proxying tools for WSGI apps"; + license = licenses.mit; + maintainers = with maintainers; [ garbas domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ea09977f1c..177e09f718c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4133,22 +4133,7 @@ in { magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; - wsgiproxy2 = buildPythonPackage rec { - name = "WSGIProxy2-0.4.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/WSGIProxy2/${name}.zip"; - sha256 = "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4"; - }; - - # circular dep on webtest - doCheck = false; - propagatedBuildInputs = with self; [ six webob ]; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - }; - }; + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; wxPython = self.wxPython30; From 8bf7a83aae23c8833bd7662137e144ca158436c7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:49:03 -0400 Subject: [PATCH 080/190] pythonPackages.xcaplib: refactor move to python-modules --- .../python-modules/xcaplib/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +--------- 2 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/xcaplib/default.nix diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix new file mode 100644 index 00000000000..7dc67072046 --- /dev/null +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchdarcs +, isPy3k +, eventlib +, application +}: + +buildPythonPackage rec { + pname = "python-xcaplib"; + version = "1.2.0"; + disabled = isPy3k; + + src = fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; + }; + + propagatedBuildInputs = [ eventlib application ]; + + meta = with stdenv.lib; { + homepage = https://github.com/AGProjects/python-xcaplib; + description = "XCAP (RFC4825) client library"; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 177e09f718c..bf5a706587a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4141,20 +4141,7 @@ in { wxGTK = pkgs.wxGTK30; }; - xcaplib = buildPythonPackage rec { - pname = "python-xcaplib"; - name = "${pname}-${version}"; - version = "1.2.0"; - disabled = isPy3k; - - src = pkgs.fetchdarcs { - url = "http://devel.ag-projects.com/repositories/${pname}"; - rev = "release-${version}"; - sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; - }; - - propagatedBuildInputs = with self; [ eventlib application ]; - }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xlib = buildPythonPackage (rec { name = "xlib-${version}"; From 6426e0f01eea56cdd1040686af203363d98b226f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:50:45 -0400 Subject: [PATCH 081/190] pythonPackages.xlib: refactor move to python-modules --- .../python-modules/xlib/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +-------------- 2 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/xlib/default.nix diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix new file mode 100644 index 00000000000..0fe13917db4 --- /dev/null +++ b/pkgs/development/python-modules/xlib/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, six +, setuptools_scm +, pkgs +}: + +buildPythonPackage rec { + pname = "xlib"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "python-xlib"; + repo = "python-xlib"; + rev = "${version}"; + sha256 = "1iiz2nq2hq9x6laavngvfngnmxbgnwh54wdbq6ncx4va7v98liyi"; + }; + + # Tests require `pyutil' so disable them to avoid circular references. + doCheck = false; + + propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ]; + + meta = with stdenv.lib; { + description = "Fully functional X client library for Python programs"; + homepage = http://python-xlib.sourceforge.net/; + license = licenses.gpl2Plus; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf5a706587a..2bb391de70e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4143,30 +4143,7 @@ in { xcaplib = callPackage ../development/python-modules/xcaplib { }; - xlib = buildPythonPackage (rec { - name = "xlib-${version}"; - version = "0.17"; - - src = pkgs.fetchFromGitHub { - owner = "python-xlib"; - repo = "python-xlib"; - rev = "${version}"; - sha256 = "1iiz2nq2hq9x6laavngvfngnmxbgnwh54wdbq6ncx4va7v98liyi"; - }; - - # Tests require `pyutil' so disable them to avoid circular references. - doCheck = false; - - propagatedBuildInputs = with self; [ six setuptools_scm pkgs.xorg.libX11 ]; - - meta = { - description = "Fully functional X client library for Python programs"; - - homepage = http://python-xlib.sourceforge.net/; - - license = licenses.gpl2Plus; - }; - }); + xlib = callPackage ../development/python-modules/xlib { }; xml2rfc = callPackage ../development/python-modules/xml2rfc { }; From 0f2f899bba0bb3c0ff3a0a5c83d52e91ab76df88 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:52:36 -0400 Subject: [PATCH 082/190] pythonPackages.zbase32: refactor move to python-modules --- .../python-modules/zbase32/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/zbase32/default.nix diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix new file mode 100644 index 00000000000..aa860056fb8 --- /dev/null +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptoolsDarcs +}: + +buildPythonPackage rec { + pname = "zbase32"; + version = "1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "2f44b338f750bd37b56e7887591bf2f1965bfa79f163b6afcbccf28da642ec56"; + }; + + # Tests require `pyutil' so disable them to avoid circular references. + doCheck = false; + + propagatedBuildInputs = [ setuptoolsDarcs ]; + + meta = with stdenv.lib; { + description = "zbase32, a base32 encoder/decoder"; + homepage = https://pypi.python.org/pypi/zbase32; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bb391de70e..90580f4507a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4160,26 +4160,7 @@ in { phantomjsSupport = false; }; - zbase32 = buildPythonPackage (rec { - name = "zbase32-1.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zbase32/${name}.tar.gz"; - sha256 = "2f44b338f750bd37b56e7887591bf2f1965bfa79f163b6afcbccf28da642ec56"; - }; - - # Tests require `pyutil' so disable them to avoid circular references. - doCheck = false; - - propagatedBuildInputs = with self; [ setuptoolsDarcs ]; - - meta = { - description = "zbase32, a base32 encoder/decoder"; - homepage = https://pypi.python.org/pypi/zbase32; - license = "BSD"; - }; - }); - + zbase32 = callPackage ../development/python-modules/zbase32 { }; zconfig = callPackage ../development/python-modules/zconfig { }; From 656f33bc2d2d039e3bf9d7a5fc3ce0dd99b98158 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:54:57 -0400 Subject: [PATCH 083/190] pythonPackages.zdaemon: refactor move to python-modules --- .../python-modules/zbaemon/default.nix | 28 +++++++++++++++++++ .../python-modules/zdaemon/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 3 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/zbaemon/default.nix create mode 100644 pkgs/development/python-modules/zdaemon/default.nix diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix new file mode 100644 index 00000000000..1a7627bf5dd --- /dev/null +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zconfig +}: + +buildPythonPackage rec { + pname = "zdaemon"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f"; + }; + + propagatedBuildInputs = [ zconfig ]; + + # too many deps.. + doCheck = false; + + meta = with stdenv.lib; { + description = "A daemon process control library and tools for Unix-based systems"; + homepage = https://pypi.python.org/pypi/zdaemon; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix new file mode 100644 index 00000000000..1a7627bf5dd --- /dev/null +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zconfig +}: + +buildPythonPackage rec { + pname = "zdaemon"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f"; + }; + + propagatedBuildInputs = [ zconfig ]; + + # too many deps.. + doCheck = false; + + meta = with stdenv.lib; { + description = "A daemon process control library and tools for Unix-based systems"; + homepage = https://pypi.python.org/pypi/zdaemon; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 90580f4507a..ff979fa8258 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4164,31 +4164,9 @@ in { zconfig = callPackage ../development/python-modules/zconfig { }; - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; - zdaemon = buildPythonPackage rec { - name = "zdaemon-${version}"; - version = "4.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zdaemon/${name}.tar.gz"; - sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f"; - }; - - propagatedBuildInputs = [ self.zconfig ]; - - # too many deps.. - doCheck = false; - - meta = { - description = "A daemon process control library and tools for Unix-based systems"; - homepage = https://pypi.python.org/pypi/zdaemon; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zdaemon = callPackage ../development/python-modules/zdaemon { }; zfec = buildPythonPackage (rec { name = "zfec-1.4.24"; From e21e72109fb1f2d2344432a827e826936847ccf8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:57:14 -0400 Subject: [PATCH 084/190] pythonPackages.zfec: refactor move to python-modules --- .../python-modules/zfec/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/zfec/default.nix diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix new file mode 100644 index 00000000000..b2e5b939f42 --- /dev/null +++ b/pkgs/development/python-modules/zfec/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptoolsDarcs +, pyutil +, argparse +, isPyPy +}: + +buildPythonPackage rec { + pname = "zfec"; + version = "1.4.24"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1ks94zlpy7n8sb8380gf90gx85qy0p9073wi1wngg6mccxp9xsg3"; + }; + + buildInputs = [ setuptoolsDarcs ]; + propagatedBuildInputs = [ pyutil argparse ]; + + meta = with stdenv.lib; { + homepage = http://allmydata.org/trac/zfec; + description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; + longDescription = '' + Fast, portable, programmable erasure coding a.k.a. "forward + error correction": the generation of redundant blocks of + information such that if some blocks are lost then the + original data can be recovered from the remaining blocks. The + zfec package includes command-line tools, C API, Python API, + and Haskell API. + ''; + license = licenses.gpl2Plus; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff979fa8258..b1026b67b55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4168,35 +4168,7 @@ in { zdaemon = callPackage ../development/python-modules/zdaemon { }; - zfec = buildPythonPackage (rec { - name = "zfec-1.4.24"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zfec/${name}.tar.gz"; - sha256 = "1ks94zlpy7n8sb8380gf90gx85qy0p9073wi1wngg6mccxp9xsg3"; - }; - - buildInputs = with self; [ setuptoolsDarcs ]; - propagatedBuildInputs = with self; [ pyutil argparse ]; - - meta = { - homepage = http://allmydata.org/trac/zfec; - - description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; - - longDescription = '' - Fast, portable, programmable erasure coding a.k.a. "forward - error correction": the generation of redundant blocks of - information such that if some blocks are lost then the - original data can be recovered from the remaining blocks. The - zfec package includes command-line tools, C API, Python API, - and Haskell API. - ''; - - license = licenses.gpl2Plus; - }; - }); + zfec = callPackage ../development/python-modules/zfec { }; zipstream = callPackage ../development/python-modules/zipstream { }; From 3bd097d4d9c92b33bb25ccbb5b66ca1b3c8d3a65 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 09:59:53 -0400 Subject: [PATCH 085/190] pythonPackages.zope_broken: refactor move to python-mdoules --- .../python-modules/zope_broken/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_broken/default.nix diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix new file mode 100644 index 00000000000..df3a2053ebf --- /dev/null +++ b/pkgs/development/python-modules/zope_broken/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope.broken"; + version = "3.6.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999"; + }; + + buildInputs = [ zope_interface ]; + + meta = with stdenv.lib; { + homepage = http://pypi.python.org/pypi/zope.broken; + description = "Zope Broken Object Interfaces"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1026b67b55..3234124cc59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4184,21 +4184,7 @@ in { zetup = callPackage ../development/python-modules/zetup { }; - zope_broken = buildPythonPackage rec { - name = "zope.broken-3.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.broken/${name}.zip"; - sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999"; - }; - - buildInputs = with self; [ zope_interface ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_broken = callPackage ../development/python-modules/zope_broken { }; zope_component = buildPythonPackage rec { name = "zope.component-4.2.1"; From 88298b6b676084fa826119c7aa8fa2b59d8e3946 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:02:50 -0400 Subject: [PATCH 086/190] pythonPackages.zope_component: refactor move to python-modules --- .../python-modules/zope_component/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------ 2 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/zope_component/default.nix diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix new file mode 100644 index 00000000000..8b51253fe92 --- /dev/null +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_configuration +, zope_event +, zope_i18nmessageid +, zope_interface +, zope_testing +}: + +buildPythonPackage rec { + pname = "zope.component"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6"; + }; + + propagatedBuildInputs = [ zope_configuration zope_event zope_i18nmessageid zope_interface zope_testing ]; + + # ignore tests because of a circular dependency on zope_security + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/zopefoundation/zope.component; + description = "Zope Component Architecture"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3234124cc59..c4149aa844c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4186,27 +4186,7 @@ in { zope_broken = callPackage ../development/python-modules/zope_broken { }; - zope_component = buildPythonPackage rec { - name = "zope.component-4.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.component/zope.component-4.2.1.tar.gz"; - sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6"; - }; - - propagatedBuildInputs = with self; [ - zope_configuration zope_event zope_i18nmessageid zope_interface - zope_testing - ]; - - # ignore tests because of a circular dependency on zope_security - doCheck = false; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_component = callPackage ../development/python-modules/zope_component { }; zope_configuration = buildPythonPackage rec { name = "zope.configuration-4.0.3"; From 9060471dcdeabbc310f59db3156304d774deccc2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:05:25 -0400 Subject: [PATCH 087/190] pythonPackages.zope_configuration: refactor move to python-modules --- .../zope_configuration/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------- 2 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/zope_configuration/default.nix diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix new file mode 100644 index 00000000000..46ad9bd0e68 --- /dev/null +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_i18nmessageid +, zope_schema +, isPy3k +}: + +buildPythonPackage rec { + pname = "zope.configuration"; + version = "4.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n"; + }; + + propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; + + # Trouble with implicit namespace packages on Python3 + # see https://github.com/pypa/setuptools/issues/912 + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "Zope Configuration Markup Language (ZCML)"; + homepage = https://github.com/zopefoundation/zope.configuration; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4149aa844c..269e18ed174 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4188,25 +4188,7 @@ in { zope_component = callPackage ../development/python-modules/zope_component { }; - zope_configuration = buildPythonPackage rec { - name = "zope.configuration-4.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.configuration/zope.configuration-4.0.3.tar.gz"; - sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n"; - }; - - propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ]; - - # Trouble with implicit namespace packages on Python3 - # see https://github.com/pypa/setuptools/issues/912 - doCheck = !isPy3k; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_configuration = callPackage ../development/python-modules/zope_configuration { }; zope_contenttype = buildPythonPackage rec { name = "zope.contenttype-4.0.1"; From f50579106a03550a241f98087b3a34659b8f7eb5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:07:58 -0400 Subject: [PATCH 088/190] pythonPackages.zope_contenttype: refactor move to python-modules --- .../zope_contenttype/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +----------- 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/zope_contenttype/default.nix diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix new file mode 100644 index 00000000000..67c5a986688 --- /dev/null +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zope.contenttype"; + version = "4.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "9decc7531ad6925057f1a667ac0ef9d658577a92b0b48dafa7daa97b78a02bbb"; + }; + + meta = with stdenv.lib; { + homepage = http://github.com/zopefoundation/zope.contenttype; + description = "A utility module for content-type (MIME type) handling"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 269e18ed174..e590dbba603 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4190,19 +4190,7 @@ in { zope_configuration = callPackage ../development/python-modules/zope_configuration { }; - zope_contenttype = buildPythonPackage rec { - name = "zope.contenttype-4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.contenttype/${name}.tar.gz"; - sha256 = "9decc7531ad6925057f1a667ac0ef9d658577a92b0b48dafa7daa97b78a02bbb"; - }; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; zope_dottedname = buildPythonPackage rec { name = "zope.dottedname-3.4.6"; From 69e943ba3ef0dc9f4ea2bc704e8a7a2415f468f9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:17:47 -0400 Subject: [PATCH 089/190] pythonPackages.zope_dottedname: refactor move to python-modules --- .../zope_dottedname/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +----------- 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/zope_dottedname/default.nix diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix new file mode 100644 index 00000000000..8d5ef91b983 --- /dev/null +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zope.dottedname"; + version = "3.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "331d801d98e539fa6c5d50c3835ecc144c429667f483281505de53fc771e6bf5"; + }; + + meta = with stdenv.lib; { + homepage = http://pypi.python.org/pypi/zope.dottedname; + description = "Resolver for Python dotted names"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e590dbba603..e6e54fca8a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4192,19 +4192,6 @@ in { zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; - zope_dottedname = buildPythonPackage rec { - name = "zope.dottedname-3.4.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.dottedname/${name}.tar.gz"; - sha256 = "331d801d98e539fa6c5d50c3835ecc144c429667f483281505de53fc771e6bf5"; - }; - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - - zope_event = buildPythonPackage rec { name = "zope.event-${version}"; version = "4.0.3"; @@ -4221,6 +4208,7 @@ in { maintainers = with maintainers; [ goibhniu ]; }; }; + zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; zope_exceptions = buildPythonPackage rec { From dbf529eea16b5ab238a1a7442eebee6dbf4ee0bf Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:18:21 -0400 Subject: [PATCH 090/190] pythonPackages.zope_event: refactor move to python-modules --- .../python-modules/zope_event/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/zope_event/default.nix diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix new file mode 100644 index 00000000000..490d2e48c14 --- /dev/null +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zope.event"; + version = "4.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm"; + }; + + meta = with stdenv.lib; { + description = "An event publishing system"; + homepage = https://pypi.python.org/pypi/zope.event; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6e54fca8a5..287a75a2043 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4192,24 +4192,9 @@ in { zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; - zope_event = buildPythonPackage rec { - name = "zope.event-${version}"; - version = "4.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.event/${name}.tar.gz"; - sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm"; - }; - - meta = { - description = "An event publishing system"; - homepage = https://pypi.python.org/pypi/zope.event; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; + zope_event = callPackage ../development/python-modules/zope_event { }; zope_exceptions = buildPythonPackage rec { name = "zope.exceptions-${version}"; From 4a51ac6876874538ce451c4183dc9779388017fd Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:22:15 -0400 Subject: [PATCH 091/190] pythonPackages.zope_exceptions: refactor move to python-modules --- .../zope_exceptions/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/zope_exceptions/default.nix diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix new file mode 100644 index 00000000000..3afb936d48f --- /dev/null +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope.exceptions"; + version = "4.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + # circular deps + doCheck = false; + + meta = with stdenv.lib; { + description = "Exception interfaces and implementations"; + homepage = https://pypi.python.org/pypi/zope.exceptions; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 287a75a2043..a278a0144d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4196,28 +4196,7 @@ in { zope_event = callPackage ../development/python-modules/zope_event { }; - zope_exceptions = buildPythonPackage rec { - name = "zope.exceptions-${version}"; - version = "4.0.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.exceptions/${name}.tar.gz"; - sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl"; - }; - - propagatedBuildInputs = with self; [ zope_interface ]; - - # circular deps - doCheck = false; - - meta = { - description = "Exception interfaces and implementations"; - homepage = https://pypi.python.org/pypi/zope.exceptions; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; zope_filerepresentation = buildPythonPackage rec { name = "zope.filerepresentation-3.6.1"; From 1fd6cd9a5b1d22afb405b519716411c7702075df Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:24:44 -0400 Subject: [PATCH 092/190] pythonPackages.zope_filerepresentation: refactor move to python-modules --- .../zope_filerepresentation/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_filerepresentation/default.nix diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix new file mode 100644 index 00000000000..f77a018c0e2 --- /dev/null +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_schema +}: + +buildPythonPackage rec { + pname = "zope.filerepresentation"; + version = "3.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "d775ebba4aff7687e0381f050ebda4e48ce50900c1438f3f7e901220634ed3e0"; + }; + + propagatedBuildInputs = [ zope_schema ]; + + meta = with stdenv.lib; { + homepage = http://zopefilerepresentation.readthedocs.io/; + description = "File-system Representation Interfaces"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a278a0144d2..cb25ffdf686 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4198,21 +4198,7 @@ in { zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; - zope_filerepresentation = buildPythonPackage rec { - name = "zope.filerepresentation-3.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.filerepresentation/${name}.tar.gz"; - sha256 = "d775ebba4aff7687e0381f050ebda4e48ce50900c1438f3f7e901220634ed3e0"; - }; - - propagatedBuildInputs = with self; [ zope_schema ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; zope_i18n = buildPythonPackage rec { name = "zope.i18n-3.8.0"; From c9a6836a8f0a7ea6e8bb670c80b9b9fcb8239990 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:27:13 -0400 Subject: [PATCH 093/190] pythonPackages.zope_i18n: refactor move to python-modules --- .../python-modules/zope_i18n/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_i18n/default.nix diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix new file mode 100644 index 00000000000..6f61bd0f99a --- /dev/null +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytz +, zope_component +}: + +buildPythonPackage rec { + pname = "zope.i18n"; + version = "3.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm"; + }; + + propagatedBuildInputs = [ pytz zope_component ]; + + meta = with stdenv.lib; { + homepage = https://github.com/zopefoundation/zope.i18n; + description = "Zope Internationalization Support"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb25ffdf686..ccc1377439f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4200,21 +4200,7 @@ in { zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; - zope_i18n = buildPythonPackage rec { - name = "zope.i18n-3.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.i18n/${name}.tar.gz"; - sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm"; - }; - - propagatedBuildInputs = with self; [ pytz zope_component ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_i18n = callPackage ../development/python-modules/zope_i18n { }; zope_i18nmessageid = buildPythonPackage rec { name = "zope.i18nmessageid-4.0.3"; From ce84dbdc6d76ac735bf8221369433ce45e7a4400 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:29:37 -0400 Subject: [PATCH 094/190] pythonPackages.zope_i18nmessageid: refactor move to python-modules --- .../zope_i18nmessageid/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +----------- 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/zope_i18nmessageid/default.nix diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix new file mode 100644 index 00000000000..70e3f3fb018 --- /dev/null +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "zope.i18nmessageid"; + version = "4.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/zopefoundation/zope.i18nmessageid; + description = "Message Identifiers for internationalization"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ccc1377439f..7528f781941 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4202,19 +4202,7 @@ in { zope_i18n = callPackage ../development/python-modules/zope_i18n { }; - zope_i18nmessageid = buildPythonPackage rec { - name = "zope.i18nmessageid-4.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz"; - sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml"; - }; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; zope_lifecycleevent = buildPythonPackage rec { name = "zope.lifecycleevent-3.7.0"; From 86172105e78a206857e90f28058027245fa4c58e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:32:05 -0400 Subject: [PATCH 095/190] pythonPackages.zope_lifecycleevent: refactor move to python-modules --- .../zope_lifecycleevent/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_lifecycleevent/default.nix diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix new file mode 100644 index 00000000000..902e6c51adb --- /dev/null +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_event +, zope_component +}: + +buildPythonPackage rec { + pname = "zope.lifecycleevent"; + version = "3.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95"; + }; + + propagatedBuildInputs = [ zope_event zope_component ]; + + meta = with stdenv.lib; { + homepage = http://github.com/zopefoundation/zope.lifecycleevent; + description = "Object life-cycle events"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7528f781941..a634b21b714 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4204,21 +4204,7 @@ in { zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; - zope_lifecycleevent = buildPythonPackage rec { - name = "zope.lifecycleevent-3.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.lifecycleevent/${name}.tar.gz"; - sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95"; - }; - - propagatedBuildInputs = with self; [ zope_event zope_component ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; zope_location = buildPythonPackage rec { name = "zope.location-4.0.3"; From 5537f6a402e3f79ecdd93896b2ceeeca23d7a11d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:34:41 -0400 Subject: [PATCH 096/190] pythonPackages.zope_location: refactor move to python-modules --- .../python-modules/zope_location/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/zope_location/default.nix diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix new file mode 100644 index 00000000000..be7d50025d0 --- /dev/null +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_proxy +}: + +buildPythonPackage rec { + pname = "zope.location"; + version = "4.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74"; + }; + + propagatedBuildInputs = [ zope_proxy ]; + + # ignore circular dependency on zope_schema + preBuild = '' + sed -i '/zope.schema/d' setup.py + ''; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/zopefoundation/zope.location/; + description = "Zope Location"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a634b21b714..38933d9c440 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4206,28 +4206,7 @@ in { zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; - zope_location = buildPythonPackage rec { - name = "zope.location-4.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.location/zope.location-4.0.3.tar.gz"; - sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74"; - }; - - propagatedBuildInputs = with self; [ zope_proxy ]; - - # ignore circular dependency on zope_schema - preBuild = '' - sed -i '/zope.schema/d' setup.py - ''; - - doCheck = false; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_location = callPackage ../development/python-modules/zope_location { }; zope_proxy = buildPythonPackage rec { name = "zope.proxy-4.1.6"; From 00f0446487aa0f029aabad36d06560ca767ee42e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:37:07 -0400 Subject: [PATCH 097/190] pythonPAckages.zope_proxy: refactor move to python-modules --- .../python-modules/zope_proxy/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/zope_proxy/default.nix diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix new file mode 100644 index 00000000000..a0fdd70e2a9 --- /dev/null +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope.proxy"; + version = "4.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + # circular deps + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/zopefoundation/zope.proxy; + description = "Generic Transparent Proxies"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38933d9c440..c004f116458 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4208,24 +4208,7 @@ in { zope_location = callPackage ../development/python-modules/zope_location { }; - zope_proxy = buildPythonPackage rec { - name = "zope.proxy-4.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.proxy/${name}.tar.gz"; - sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4"; - }; - - propagatedBuildInputs = with self; [ zope_interface ]; - - # circular deps - doCheck = false; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_proxy = callPackage ../development/python-modules/zope_proxy { }; zope_schema = buildPythonPackage rec { name = "zope.schema-4.4.2"; From 399ac946026b9ba38fca2bd6aeec5f38c307387a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:39:29 -0400 Subject: [PATCH 098/190] pythonPAckages.zope_schema: refactor move to python-modules --- .../python-modules/zope_schema/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------- 2 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/zope_schema/default.nix diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix new file mode 100644 index 00000000000..71e571dba33 --- /dev/null +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_location +, zope_event +, zope_interface +, zope_testing +}: + +buildPythonPackage rec { + pname = "zope.schema"; + version = "4.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank"; + }; + + propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; + + # ImportError: No module named 'zope.event' + # even though zope_event has been included. + # Package seems to work fine. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/zopefoundation/zope.schema; + description = "zope.interface extension for defining data schemas"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c004f116458..f7d63feaef4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4210,26 +4210,7 @@ in { zope_proxy = callPackage ../development/python-modules/zope_proxy { }; - zope_schema = buildPythonPackage rec { - name = "zope.schema-4.4.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.schema/${name}.tar.gz"; - sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank"; - }; - - propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ]; - - # ImportError: No module named 'zope.event' - # even though zope_event has been included. - # Package seems to work fine. - doCheck = false; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_schema = callPackage ../development/python-modules/zope_schema { }; zope_size = buildPythonPackage rec { name = "zope.size-3.5.0"; From 125ade65248b214e113772f6225a4d68064da303 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:49:07 -0400 Subject: [PATCH 099/190] pythonPAckages.zope_size: refactor move to python-modules --- .../python-modules/zope_size/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_size/default.nix diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix new file mode 100644 index 00000000000..8be9a04ae3f --- /dev/null +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_i18nmessageid +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope.size"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f"; + }; + + propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; + + meta = with stdenv.lib; { + homepage = http://github.com/zopefoundation/zope.size; + description = "Interfaces and simple adapter that give the size of an object"; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7d63feaef4..f93072a80a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4212,21 +4212,7 @@ in { zope_schema = callPackage ../development/python-modules/zope_schema { }; - zope_size = buildPythonPackage rec { - name = "zope.size-3.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.size/${name}.tar.gz"; - sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f"; - }; - - propagatedBuildInputs = with self; [ zope_i18nmessageid zope_interface ]; - - meta = { - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_size = callPackage ../development/python-modules/zope_size { }; zope_testing = buildPythonPackage rec { name = "zope.testing-${version}"; From 2c5ff5ea3f9b1d6e01da09c24fa388f8cd438e87 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:50:40 -0400 Subject: [PATCH 100/190] pythonPackages.zope_testing: refactor move to python-modules --- .../python-modules/zope_testing/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/zope_testing/default.nix diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix new file mode 100644 index 00000000000..4e28113a8a1 --- /dev/null +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +, zope_interface +, zope_exceptions +, zope_location +}: + +buildPythonPackage rec { + pname = "zope.testing"; + version = "4.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vvxhjmzl7vw2i1akfj1xbggwn36270ym7f2ic9xwbaswfw1ap56"; + }; + + doCheck = !isPyPy; + + propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; + + meta = with stdenv.lib; { + description = "Zope testing helpers"; + homepage = http://pypi.python.org/pypi/zope.testing; + license = licenses.zpl20; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f93072a80a9..8909d575f6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4214,27 +4214,7 @@ in { zope_size = callPackage ../development/python-modules/zope_size { }; - zope_testing = buildPythonPackage rec { - name = "zope.testing-${version}"; - version = "4.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.testing/${name}.tar.gz"; - sha256 = "1vvxhjmzl7vw2i1akfj1xbggwn36270ym7f2ic9xwbaswfw1ap56"; - }; - - doCheck = !isPyPy; - - propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_location ]; - - meta = { - description = "Zope testing helpers"; - homepage = http://pypi.python.org/pypi/zope.testing; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_testing = callPackage ../development/python-modules/zope_testing { }; zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; From 63183f8b76c0ace87d4dcdec0f9aab0295555ea6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:53:08 -0400 Subject: [PATCH 101/190] pythonPAckages.hgsvn: refactor move to python-modules --- .../python-modules/hgsvn/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------- 2 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/hgsvn/default.nix diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix new file mode 100644 index 00000000000..29af19aaf99 --- /dev/null +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, hglib +, isPy3k +, isPyPy +}: + +buildPythonPackage rec { + pname = "hgsvn"; + version = "0.3.11"; + disabled = isPy3k || isPyPy; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ hglib ]; + + doCheck = false; # too many assumptions + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/hgsvn; + description = "A set of scripts to work locally on Subversion checkouts using Mercurial"; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8909d575f6b..c9bfa2938ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4221,23 +4221,7 @@ in { zope_interface = callPackage ../development/python-modules/zope_interface { }; - - hgsvn = buildPythonPackage rec { - name = "hgsvn-0.3.11"; - src = pkgs.fetchurl rec { - url = "mirror://pypi/h/hgsvn/${name}-hotfix.zip"; - sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p"; - }; - disabled = isPy3k || isPyPy; - doCheck = false; # too many assumptions - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ hglib ]; - - meta = { - homepage = https://pypi.python.org/pypi/hgsvn; - }; - }; + hgsvn = callPackage ../development/python-modules/hgsvn { }; cliapp = buildPythonPackage rec { name = "cliapp-${version}"; From 8dded34d8ccb084026a7113a9f21bfc4774e8a1d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:56:16 -0400 Subject: [PATCH 102/190] pythonPackages.cliapp: refactor move to python-modules --- .../python-modules/cliapp/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/cliapp/default.nix diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix new file mode 100644 index 00000000000..a7ae70a4379 --- /dev/null +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, sphinx +, isPy3k +}: + +buildPythonPackage rec { + pname = "cliapp"; + version = "1.20150305"; + disabled = isPy3k; + + src = fetchgit { + url = "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp"; + rev = "569df8a5959cd8ef46f78c9497461240a5aa1123"; + sha256 = "882c5daf933e4cf089842995efc721e54361d98f64e0a075e7373b734cd899f3"; + }; + + buildInputs = [ sphinx ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://liw.fi/cliapp/; + description = "Python framework for Unix command line programs"; + license = licenses.gpl2; + maintainers = with maintainers; [ rickynils ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9bfa2938ef..fe2ffeb3f87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4223,28 +4223,7 @@ in { hgsvn = callPackage ../development/python-modules/hgsvn { }; - cliapp = buildPythonPackage rec { - name = "cliapp-${version}"; - version = "1.20150305"; - disabled = isPy3k; - - src = pkgs.fetchgit { - url = "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp"; - rev = "569df8a5959cd8ef46f78c9497461240a5aa1123"; - sha256 = "882c5daf933e4cf089842995efc721e54361d98f64e0a075e7373b734cd899f3"; - }; - - buildInputs = with self; [ sphinx ]; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://liw.fi/cliapp/; - description = "Python framework for Unix command line programs"; - maintainers = with maintainers; [ rickynils ]; - }; - }; + cliapp = callPackage ../development/python-modules/cliapp { }; cmdtest = buildPythonPackage rec { name = "cmdtest-${version}"; From 3ef39ecdb0a90f4938ef5556e58ed279c73369e1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 10:58:01 -0400 Subject: [PATCH 103/190] pythonPackages.cmdtest: refactor move to python-modules --- .../python-modules/cmdtest/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------- 2 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/cmdtest/default.nix diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix new file mode 100644 index 00000000000..605529b1747 --- /dev/null +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, cliapp +, ttystatus +, markdown +, isPy3k +, isPyPy +}: + +buildPythonPackage rec { + name = "cmdtest-${version}"; + version = "0.18"; + disabled = isPy3k || isPyPy; + + src = fetchurl { + url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz"; + sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn"; + }; + + propagatedBuildInputs = [ cliapp ttystatus markdown ]; + + # TODO: cmdtest tests must be run before the buildPhase + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://liw.fi/cmdtest/; + description = "Black box tests Unix command line tools"; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe2ffeb3f87..37498f4a44a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4225,26 +4225,7 @@ in { cliapp = callPackage ../development/python-modules/cliapp { }; - cmdtest = buildPythonPackage rec { - name = "cmdtest-${version}"; - version = "0.18"; - disabled = isPy3k || isPyPy; - - propagatedBuildInputs = with self; [ cliapp ttystatus markdown ]; - - # TODO: cmdtest tests must be run before the buildPhase - doCheck = false; - - src = pkgs.fetchurl { - url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.18.orig.tar.xz"; - sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn"; - }; - - meta = { - homepage = http://liw.fi/cmdtest/; - description = "Black box tests Unix command line tools"; - }; - }; + cmdtest = callPackage ../development/python-modules/cmdtest { }; tornado = callPackage ../development/python-modules/tornado { }; tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; }; From 7735833264fbea3f5b6daafbcafbddea70f5356e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:01:14 -0400 Subject: [PATCH 104/190] pythonPakcages.tokenlib: refacotr move to python-modules --- .../python-modules/tokenlib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +-------- 2 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/tokenlib/default.nix diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix new file mode 100644 index 00000000000..24f54b98a96 --- /dev/null +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, requests +, webob +}: + +buildPythonPackage rec { + pname = "tokenlib"; + version = "0.3.1"; + + src = fetchgit { + url = https://github.com/mozilla-services/tokenlib.git; + rev = "refs/tags/${version}"; + sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; + }; + + propagatedBuildInputs = [ requests webob ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mozilla-services/tokenlib; + description = "Generic support library for signed-token-based auth schemes"; + license = licenses.mpl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37498f4a44a..032c1ced8d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4230,17 +4230,7 @@ in { tornado = callPackage ../development/python-modules/tornado { }; tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; }; - tokenlib = buildPythonPackage rec { - name = "tokenlib-${version}"; - version = "0.3.1"; - src = pkgs.fetchgit { - url = https://github.com/mozilla-services/tokenlib.git; - rev = "refs/tags/${version}"; - sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; - }; - - propagatedBuildInputs = with self; [ requests webob ]; - }; + tokenlib = callPackage ../development/python-modules/tokenlib { }; tunigo = callPackage ../development/python-modules/tunigo { }; From e960b3128de4de308641b39aeeb9727b69871051 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:03:55 -0400 Subject: [PATCH 105/190] pythonPackages.tarman: refactor move to python-modules --- .../python-modules/tarman/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------- 2 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/tarman/default.nix diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix new file mode 100644 index 00000000000..305daecc8de --- /dev/null +++ b/pkgs/development/python-modules/tarman/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, unittest2 +, nose +, mock +, libarchive +}: + +buildPythonPackage rec { + version = "0.1.3"; + pname = "tarman"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h"; + }; + + buildInputs = [ unittest2 nose mock ]; + propagatedBuildInputs = [ libarchive ]; + + # tests are still failing + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/matejc/tarman; + description = "Archive manager with curses interface"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 032c1ced8d1..df0c57efcd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4234,24 +4234,7 @@ in { tunigo = callPackage ../development/python-modules/tunigo { }; - tarman = buildPythonPackage rec { - version = "0.1.3"; - name = "tarman-${version}"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tarman/tarman-${version}.zip"; - sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h"; - }; - - buildInputs = with self; [ unittest2 nose mock ]; - propagatedBuildInputs = with self; [ libarchive ]; - - # tests are still failing - doCheck = false; - }; - + tarman = callPackage ../development/python-modules/tarman { }; libarchive = self.python-libarchive; # The latter is the name upstream uses python-libarchive = buildPythonPackage rec { From 0594a95c96071266cbaacff295e35fd8133490e8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:06:37 -0400 Subject: [PATCH 106/190] pythonPackages.libarchive: refactor move to python-modules --- .../python-libarchive/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +-------- 2 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/python-libarchive/default.nix diff --git a/pkgs/development/python-modules/python-libarchive/default.nix b/pkgs/development/python-modules/python-libarchive/default.nix new file mode 100644 index 00000000000..bae94191fc0 --- /dev/null +++ b/pkgs/development/python-modules/python-libarchive/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy3k +, pkgs +}: + +buildPythonPackage rec { + version = "3.1.2-1"; + pname = "libarchive"; + disabled = isPy3k; + + src = fetchurl { + url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; + sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; + }; + + propagatedBuildInputs = [ pkgs.libarchive.lib ]; + + meta = with stdenv.lib; { + description = "Multi-format archive and compression library"; + homepage = https://libarchive.org/; + license = licenses.bsd0; + broken = true; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df0c57efcd2..f072305706e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4237,19 +4237,8 @@ in { tarman = callPackage ../development/python-modules/tarman { }; libarchive = self.python-libarchive; # The latter is the name upstream uses - python-libarchive = buildPythonPackage rec { - version = "3.1.2-1"; - name = "libarchive-${version}"; - disabled = isPy3k; - src = pkgs.fetchurl { - url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; - sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; - }; - - propagatedBuildInputs = with self; [ pkgs.libarchive.lib ]; - meta.broken = true; - }; + python-libarchive = callPackage ../development/python-modules/python-libarchive { }; libarchive-c = buildPythonPackage rec { name = "libarchive-c-${version}"; From 50279026918832dca12a8f049a5b5acbb6c3dc2b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:09:55 -0400 Subject: [PATCH 107/190] pythonPackages.libarchive-c: refactor move to python-modules --- .../python-modules/libarchive-c/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------- 2 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/libarchive-c/default.nix diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix new file mode 100644 index 00000000000..e1beafaf10a --- /dev/null +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, pkgs +}: + +buildPythonPackage rec { + pname = "libarchive-c"; + version = "2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "011bfsmqpcwd6920kckllh7zhw2y4rrasgmddb7wjzn2hg1xpsjn"; + }; + + buildInputs = [ pytest pkgs.glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + + postPatch = '' + substituteInPlace libarchive/ffi.py --replace \ + "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'" + ''; + + checkPhase = '' + py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/Changaco/python-libarchive-c; + description = "Python interface to libarchive"; + license = licenses.cc0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f072305706e..6cea55e485e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4240,27 +4240,7 @@ in { python-libarchive = callPackage ../development/python-modules/python-libarchive { }; - libarchive-c = buildPythonPackage rec { - name = "libarchive-c-${version}"; - version = "2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/libarchive-c/${name}.tar.gz"; - sha256 = "011bfsmqpcwd6920kckllh7zhw2y4rrasgmddb7wjzn2hg1xpsjn"; - }; - - LC_ALL="en_US.UTF-8"; - - postPatch = '' - substituteInPlace libarchive/ffi.py --replace \ - "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'" - ''; - checkPhase = '' - py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' - ''; - - buildInputs = with self; [ pytest pkgs.glibcLocales ]; - }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { }; libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; From 68a085584acaedd2e29fec8f4baa009d328bf139 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:14:55 -0400 Subject: [PATCH 108/190] pythonPackages.tissue: refactor move to python-modules --- .../python-modules/tissue/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +---------- 2 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/tissue/default.nix diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix new file mode 100644 index 00000000000..5ed47bdd028 --- /dev/null +++ b/pkgs/development/python-modules/tissue/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, pep8 +}: + +buildPythonPackage rec { + pname = "tissue"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ pep8 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/WoLpH/tissue; + description = "Tissue - automated pep8 checker for nose"; + license = licenses.lgpl2; + maintainers = with maintainers; [ garbas domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cea55e485e..e0cdb78238f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4254,21 +4254,7 @@ in { testfixtures = callPackage ../development/python-modules/testfixtures {}; - tissue = buildPythonPackage rec { - name = "tissue-0.9.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/tissue/${name}.tar.gz"; - sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pep8 ]; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; + tissue = callPackage ../development/python-modules/tissue { }; titlecase = callPackage ../development/python-modules/titlecase { }; From 0fd1905e8cb1fcebe77e2f2bb08555210549f260 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:17:00 -0400 Subject: [PATCH 109/190] pythonPackages.tracing: refactor move to python-modules --- .../python-modules/tracing/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/tracing/default.nix diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix new file mode 100644 index 00000000000..da9683e187e --- /dev/null +++ b/pkgs/development/python-modules/tracing/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, sphinx +}: + +buildPythonPackage rec { + pname = "tracing"; + version = "0.8"; + + src = fetchurl { + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; + sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; + }; + + buildInputs = [ sphinx ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://liw.fi/tracing/; + description = "Python debug logging helper"; + license = licenses.gpl30; + maintainers = with maintainers; [ rickynils ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0cdb78238f..a4ae0feba5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4258,26 +4258,7 @@ in { titlecase = callPackage ../development/python-modules/titlecase { }; - tracing = buildPythonPackage rec { - name = "tracing-${version}"; - version = "0.8"; - - src = pkgs.fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; - sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; - }; - - buildInputs = with self; [ sphinx ]; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://liw.fi/tracing/; - description = "Python debug logging helper"; - maintainers = with maintainers; [ rickynils ]; - }; - }; + tracing = callPackage ../development/python-modules/tracing { }; translationstring = buildPythonPackage rec { name = "translationstring-1.3"; From 7ab3b624866d4423dd3c85176b2bc27cfb7834b6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:19:15 -0400 Subject: [PATCH 110/190] pythonPAckages.translationstring: refactor move to python-modules --- .../translationstring/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/translationstring/default.nix diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix new file mode 100644 index 00000000000..56640a4c067 --- /dev/null +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "translationstring"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d"; + }; + + meta = with stdenv.lib; { + homepage = http://pylonsproject.org/; + description = "Utility library for i18n relied on by various Repoze and Pyramid packages"; + license = licenses.bsd0; + maintainers = with maintainers; [ garbas domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4ae0feba5b..1bde981011f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4260,20 +4260,7 @@ in { tracing = callPackage ../development/python-modules/tracing { }; - translationstring = buildPythonPackage rec { - name = "translationstring-1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/translationstring/${name}.tar.gz"; - sha256 = "4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d"; - }; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; - + translationstring = callPackage ../development/python-modules/translationstring { }; ttystatus = buildPythonPackage rec { name = "ttystatus-${version}"; From 9e52a735277dcae6ccf4166831eaa778cee6c9db Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:23:09 -0400 Subject: [PATCH 111/190] pythonPackages.ttystatus: refactor move to python-modules --- .../python-modules/tracing/default.nix | 2 +- .../python-modules/ttystatus/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 3 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/ttystatus/default.nix diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index da9683e187e..843f26508ae 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://liw.fi/tracing/; description = "Python debug logging helper"; - license = licenses.gpl30; + license = licenses.gpl3; maintainers = with maintainers; [ rickynils ]; }; diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix new file mode 100644 index 00000000000..042b4a19642 --- /dev/null +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, sphinx +, isPy3k +}: + +buildPythonPackage rec { + pname = "ttystatus"; + version = "0.23"; + disabled = isPy3k; + + src = fetchurl { + url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; + sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; + }; + + buildInputs = [ sphinx ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://liw.fi/ttystatus/; + description = "Progress and status updates on terminals for Python"; + license = licenses.gpl3; + maintainers = with maintainers; [ rickynils ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bde981011f..c5fd09aa8b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4262,27 +4262,7 @@ in { translationstring = callPackage ../development/python-modules/translationstring { }; - ttystatus = buildPythonPackage rec { - name = "ttystatus-${version}"; - version = "0.23"; - disabled = isPy3k; - - src = pkgs.fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; - sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; - }; - - buildInputs = with self; [ sphinx ]; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://liw.fi/ttystatus/; - description = "Progress and status updates on terminals for Python"; - maintainers = with maintainers; [ rickynils ]; - }; - }; + ttystatus = callPackage ../development/python-modules/ttystatus { }; larch = buildPythonPackage rec { name = "larch-${version}"; From 9041374d64e1accbcf5e5a689100f94051f6063f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:24:54 -0400 Subject: [PATCH 112/190] pythonPackages.larch: refactor move to python-modules --- .../python-modules/larch/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/larch/default.nix diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix new file mode 100644 index 00000000000..74703ff5c9d --- /dev/null +++ b/pkgs/development/python-modules/larch/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, sphinx +, tracing +, ttystatus +, cliapp +}: + +buildPythonPackage rec { + pname = "larch"; + version = "1.20131130"; + + src = fetchurl { + url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; + sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; + }; + + buildInputs = [ sphinx ]; + propagatedBuildInputs = [ tracing ttystatus cliapp ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://liw.fi/larch/; + description = "Python B-tree library"; + license = licenses.gpl3; + maintainers = with maintainers; [ rickynils ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5fd09aa8b0..49481eafbb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4264,28 +4264,7 @@ in { ttystatus = callPackage ../development/python-modules/ttystatus { }; - larch = buildPythonPackage rec { - name = "larch-${version}"; - version = "1.20131130"; - - src = pkgs.fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; - sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; - }; - - buildInputs = with self; [ sphinx ]; - propagatedBuildInputs = with self; [ tracing ttystatus cliapp ]; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://liw.fi/larch/; - description = "Python B-tree library"; - maintainers = with maintainers; [ rickynils ]; - }; - }; - + larch = callPackage ../development/python-modules/larch { }; websocket_client = callPackage ../development/python-modules/websockets_client { }; From 6c10afe1301d8aae442ea431b0c656f3480c13f0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:32:23 -0400 Subject: [PATCH 113/190] pythonPackages.webhelpers: refactor move to python-modules --- .../python-modules/webhelpers/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------- 2 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/webhelpers/default.nix diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix new file mode 100644 index 00000000000..007f32f6cc5 --- /dev/null +++ b/pkgs/development/python-modules/webhelpers/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, routes +, markupsafe +, webob +, nose +}: + +buildPythonPackage rec { + pname = "WebHelpers"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583"; + }; + + buildInputs = [ routes markupsafe webob nose ]; + + # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://webhelpers.readthedocs.org/en/latest/; + description = "Web Helpers"; + license = licenses.free; + maintainers = with maintainers; [ garbas domenkozar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49481eafbb4..fd74e18e35f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4268,25 +4268,7 @@ in { websocket_client = callPackage ../development/python-modules/websockets_client { }; - - webhelpers = buildPythonPackage rec { - name = "WebHelpers-1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/WebHelpers/${name}.tar.gz"; - sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583"; - }; - - buildInputs = with self; [ routes markupsafe webob nose ]; - - # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff - doCheck = false; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; + webhelpers = callPackage ../development/python-modules/webhelpers { }; whichcraft = callPackage ../development/python-modules/whichcraft { }; From 1109081215228c66b62d5f884ede0d5f48e3193a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:35:29 -0400 Subject: [PATCH 114/190] pythonPAckages.worldengine: refactor move to python-modules --- .../python-modules/worldengine/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 48 +------------- 2 files changed, 64 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/python-modules/worldengine/default.nix diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix new file mode 100644 index 00000000000..0a49c256640 --- /dev/null +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, nose +, noise +, numpy +, pyplatec +, protobuf +, purepng +, argparse +, h5py +, gdal +}: + +buildPythonPackage rec { + pname = "worldengine"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine"; + rev = "v${version}"; + sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry"; + }; + + src-data = fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine-data"; + rev = "029051e"; + sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm"; + }; + + postUnpack = '' + ln -s ${src-data} worldengine-data + ''; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng argparse h5py gdal ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace pypng>=0.0.18 purepng \ + --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ + --replace 'argparse==1.2.1' "" \ + --replace 'protobuf==3.0.0a3' 'protobuf' \ + --replace 'noise==1.2.2' 'noise' \ + --replace 'PyPlatec==1.4.0' 'PyPlatec' \ + ''; + + doCheck = true; + + postCheck = '' + nosetests tests + ''; + + meta = with stdenv.lib; { + homepage = http://world-engine.org; + description = "World generator using simulation of plates, rain shadow, erosion, etc"; + license = licenses.mit; + maintainers = with maintainers; [ rardiol ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd74e18e35f..8874569c240 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4274,53 +4274,7 @@ in { whisper = callPackage ../development/python-modules/whisper { }; - worldengine = buildPythonPackage rec { - name = "worldengine-${version}"; - version = "0.19.0"; - - src = pkgs.fetchFromGitHub { - owner = "Mindwerks"; - repo = "worldengine"; - rev = "v${version}"; - sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry"; - }; - - src-data = pkgs.fetchFromGitHub { - owner = "Mindwerks"; - repo = "worldengine-data"; - rev = "029051e"; - sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm"; - }; - - postUnpack = '' - ln -s ${src-data} worldengine-data - ''; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf purepng argparse h5py gdal ]; - - prePatch = '' - substituteInPlace setup.py \ - --replace pypng>=0.0.18 purepng \ - --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ - --replace 'argparse==1.2.1' "" \ - --replace 'protobuf==3.0.0a3' 'protobuf' \ - --replace 'noise==1.2.2' 'noise' \ - --replace 'PyPlatec==1.4.0' 'PyPlatec' \ - ''; - - doCheck = true; - postCheck = '' - nosetests tests - ''; - - meta = { - homepage = http://world-engine.org; - description = "World generator using simulation of plates, rain shadow, erosion, etc"; - platforms = platforms.all; - maintainers = with maintainers; [ rardiol ]; - }; - }; + worldengine = callPackage ../development/python-modules/worldengine { }; carbon = callPackage ../development/python-modules/carbon { }; From 2d7d2fa0e2469d3d6dd2dee398c887fa30bf7e20 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:36:56 -0400 Subject: [PATCH 115/190] pythonPAckages.ujson: refactor move to python-modules --- .../python-modules/ujson/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/ujson/default.nix diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix new file mode 100644 index 00000000000..a9d68978c3b --- /dev/null +++ b/pkgs/development/python-modules/ujson/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +}: + +buildPythonPackage rec { + pname = "ujson"; + version = "1.35"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n"; + }; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/ujson; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8874569c240..6e0c7ea5151 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4278,23 +4278,7 @@ in { carbon = callPackage ../development/python-modules/carbon { }; - ujson = buildPythonPackage rec { - name = "ujson-1.35"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/ujson/${name}.tar.gz"; - sha256 = "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/ujson; - description = "Ultra fast JSON encoder and decoder for Python"; - license = licenses.bsd3; - }; - }; - + ujson = callPackage ../development/python-modules/ujson { }; unidecode = callPackage ../development/python-modules/unidecode {}; From cf540a7e0816069cd5f0f39983968cecfe181f79 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:41:18 -0400 Subject: [PATCH 116/190] pythonPackages.txgithub: refactor move to python-modules --- .../python-modules/txgithub/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------- 2 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/txgithub/default.nix diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix new file mode 100644 index 00000000000..5340b202e68 --- /dev/null +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyopenssl +, twisted +, service-identity +}: + +buildPythonPackage rec { + pname = "txgithub"; + version = "15.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16gbizy8vkxasxylwzj4p66yw8979nvzxdj6csidgmng7gi2k8nx"; + }; + + propagatedBuildInputs = [ pyopenssl twisted service-identity ]; + + # fix python3 issues + patchPhase = '' + sed -i 's/except usage.UsageError, errortext/except usage.UsageError as errortext/' txgithub/scripts/create_token.py + sed -i 's/except usage.UsageError, errortext/except usage.UsageError as errortext/' txgithub/scripts/gist.py + sed -i 's/print response\[\x27html_url\x27\]/print(response\[\x27html_url\x27\])/' txgithub/scripts/gist.py + sed -i '41d' txgithub/scripts/gist.py + sed -i '41d' txgithub/scripts/gist.py + ''; + + # No tests distributed + doCheck = false; + + meta = with stdenv.lib; { + description = "GitHub API client implemented using Twisted."; + homepage = "https://github.com/tomprince/txgithub"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e0c7ea5151..ecf6429fd4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4288,34 +4288,7 @@ in { usbtmc = callPackage ../development/python-modules/usbtmc {}; - txgithub = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "txgithub"; - version = "15.0.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "16gbizy8vkxasxylwzj4p66yw8979nvzxdj6csidgmng7gi2k8nx"; - }; - propagatedBuildInputs = with self; [ pyopenssl twisted service-identity ]; - # fix python3 issues - patchPhase = '' - sed -i 's/except usage.UsageError, errortext/except usage.UsageError as errortext/' txgithub/scripts/create_token.py - sed -i 's/except usage.UsageError, errortext/except usage.UsageError as errortext/' txgithub/scripts/gist.py - sed -i 's/print response\[\x27html_url\x27\]/print(response\[\x27html_url\x27\])/' txgithub/scripts/gist.py - sed -i '41d' txgithub/scripts/gist.py - sed -i '41d' txgithub/scripts/gist.py - ''; - - # No tests distributed - doCheck = false; - meta = { - description = "GitHub API client implemented using Twisted."; - homepage = "https://github.com/tomprince/txgithub"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }; + txgithub = callPackage ../development/python-modules/txgithub { }; txrequests = buildPythonPackage rec { name = "${pname}-${version}"; From 1ab1ff496354cc7d27d669bc50a05bb076d88ae7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:42:54 -0400 Subject: [PATCH 117/190] pythonPackages.txrequests: refactor move to python-modules --- .../python-modules/txrequests/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/txrequests/default.nix diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix new file mode 100644 index 00000000000..c1d98738b56 --- /dev/null +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, twisted +, requests +, cryptography +, python +}: + +buildPythonPackage rec { + pname = "txrequests"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kkxxd17ar5gyjkz9yrrdr15a64qw6ym60ndi0zbwx2s634yfafw"; + }; + + propagatedBuildInputs = [ twisted requests cryptography ]; + + # Require network access + doCheck = false; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + description = "Asynchronous Python HTTP for Humans."; + homepage = "https://github.com/tardyp/txrequests"; + license = licenses.asl20; + maintainers = with maintainers; [ nand0p ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecf6429fd4c..91d3d083068 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4290,29 +4290,7 @@ in { txgithub = callPackage ../development/python-modules/txgithub { }; - txrequests = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "txrequests"; - version = "0.9.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "0kkxxd17ar5gyjkz9yrrdr15a64qw6ym60ndi0zbwx2s634yfafw"; - }; - propagatedBuildInputs = with self; [ twisted requests cryptography ]; - - # Require network access - doCheck = false; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - meta = { - description = "Asynchronous Python HTTP for Humans."; - homepage = "https://github.com/tardyp/txrequests"; - license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }; + txrequests = callPackage ../development/python-modules/txrequests { }; txamqp = buildPythonPackage rec { name = "txamqp-${version}"; From 35f95f05957a50ad0d78b0c25f3ccc1b08115a25 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:44:47 -0400 Subject: [PATCH 118/190] pythonPackages.txamqp: refactor move to python-modules --- .../python-modules/txamqp/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/txamqp/default.nix diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix new file mode 100644 index 00000000000..2c3ee66663f --- /dev/null +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, twisted +}: + +buildPythonPackage rec { + pname = "txamqp"; + version = "0.3"; + + src = fetchurl { + url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz"; + sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463"; + }; + + buildInputs = [ twisted ]; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/txamqp; + description = "Library for communicating with AMQP peers and brokers using Twisted"; + license = licenses.asl20; + maintainers = with maintainers; [ rickynils ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91d3d083068..a0e8c3edc42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4292,23 +4292,7 @@ in { txrequests = callPackage ../development/python-modules/txrequests { }; - txamqp = buildPythonPackage rec { - name = "txamqp-${version}"; - version = "0.3"; - - src = pkgs.fetchurl rec { - url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz"; - sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463"; - }; - - buildInputs = with self; [ twisted ]; - - meta = { - homepage = https://launchpad.net/txamqp; - description = "Library for communicating with AMQP peers and brokers using Twisted"; - maintainers = with maintainers; [ rickynils ]; - }; - }; + txamqp = callPackage ../development/python-modules/txamqp { }; versiontools = buildPythonPackage rec { name = "versiontools-1.9.1"; From dcd9daa561a84db1e7e1b218d58596c06056828e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:47:15 -0400 Subject: [PATCH 119/190] pythonPackages.versiontools: refactor move to python-modules --- .../python-modules/versiontools/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 11 +-------- 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/versiontools/default.nix diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix new file mode 100644 index 00000000000..e92dbae8138 --- /dev/null +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "versiontools"; + version = "1.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9"; + }; + + doCheck = (!isPy3k); + + meta = with stdenv.lib; { + homepage = https://launchpad.net/versiontools; + description = "Smart replacement for plain tuple used in __version__"; + license = licenses.lgpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0e8c3edc42..32c4d4c3a32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4294,16 +4294,7 @@ in { txamqp = callPackage ../development/python-modules/txamqp { }; - versiontools = buildPythonPackage rec { - name = "versiontools-1.9.1"; - doCheck = (!isPy3k); - - src = pkgs.fetchurl { - url = "mirror://pypi/v/versiontools/${name}.tar.gz"; - sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9"; - }; - - }; + versiontools = callPackage ../development/python-modules/versiontools { }; veryprettytable = buildPythonPackage rec { name = "veryprettytable-${version}"; From d241cc3a650a2791d5490d96dad26961ede45c9d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:48:50 -0400 Subject: [PATCH 120/190] pythonPackages.veryprettytable: refactor move to python-modules --- .../veryprettytable/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/veryprettytable/default.nix diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix new file mode 100644 index 00000000000..8d71e6331f5 --- /dev/null +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, termcolor +, colorama +}: + +buildPythonPackage rec { + pname = "veryprettytable"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k1rifz8x6qcicmx2is9vgxcj0qb2f5pvzrp7zhmvbmci3yack3f"; + }; + + propagatedBuildInputs = [ termcolor colorama ]; + + meta = with stdenv.lib; { + description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; + homepage = https://github.com/smeggingsmegger/VeryPrettyTable; + license = licenses.free; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32c4d4c3a32..21bd139edcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4296,23 +4296,7 @@ in { versiontools = callPackage ../development/python-modules/versiontools { }; - veryprettytable = buildPythonPackage rec { - name = "veryprettytable-${version}"; - version = "0.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/veryprettytable/${name}.tar.gz"; - sha256 = "1k1rifz8x6qcicmx2is9vgxcj0qb2f5pvzrp7zhmvbmci3yack3f"; - }; - - propagatedBuildInputs = [ self.termcolor self.colorama ]; - - meta = { - description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = https://github.com/smeggingsmegger/VeryPrettyTable; - license = licenses.free; - }; - }; + veryprettytable = callPackage ../development/python-modules/veryprettytable { }; graphite-web = callPackage ../development/python-modules/graphite-web { }; From 2cb75f82fcdce3953745fce3a9f1c87edf53efb3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 11:50:28 -0400 Subject: [PATCH 121/190] pythonPAckages.pyspotify: refactor move to python-modules --- .../python-modules/pyspotify/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 38 +--------------- 2 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/pyspotify/default.nix diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix new file mode 100644 index 00000000000..39671041d8a --- /dev/null +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, cffi +, pkgs +}: + +buildPythonPackage rec { + pname = "pyspotify"; + version = "2.0.5"; + + src = fetchurl { + url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz"; + sha256 = "1ilbz2w1gw3f1bpapfa09p84dwh08bf7qcrkmd3aj0psz57p2rls"; + }; + + propagatedBuildInputs = [ cffi ]; + buildInputs = [ pkgs.libspotify ]; + + # python zip complains about old timestamps + preConfigure = '' + find -print0 | xargs -0 touch + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + find "$out" -name _spotify.so -exec \ + install_name_tool -change \ + @loader_path/../Frameworks/libspotify.framework/libspotify \ + ${pkgs.libspotify}/lib/libspotify.dylib \ + {} \; + ''; + + # There are no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pyspotify.mopidy.com; + description = "A Python interface to Spotify’s online music streaming service"; + license = licenses.unfree; + maintainers = with maintainers; [ lovek323 rickynils ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 21bd139edcf..80a0ca8b82a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4308,43 +4308,7 @@ in { graphitepager = callPackage ../development/python-modules/graphitepager { }; - pyspotify = buildPythonPackage rec { - name = "pyspotify-${version}"; - - version = "2.0.5"; - - src = pkgs.fetchurl { - url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz"; - sha256 = "1ilbz2w1gw3f1bpapfa09p84dwh08bf7qcrkmd3aj0psz57p2rls"; - }; - - propagatedBuildInputs = with self; [ cffi ]; - buildInputs = [ pkgs.libspotify ]; - - # python zip complains about old timestamps - preConfigure = '' - find -print0 | xargs -0 touch - ''; - - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - find "$out" -name _spotify.so -exec \ - install_name_tool -change \ - @loader_path/../Frameworks/libspotify.framework/libspotify \ - ${pkgs.libspotify}/lib/libspotify.dylib \ - {} \; - ''; - - # There are no tests - doCheck = false; - - meta = { - homepage = http://pyspotify.mopidy.com; - description = "A Python interface to Spotify’s online music streaming service"; - license = licenses.unfree; - maintainers = with maintainers; [ lovek323 rickynils ]; - platforms = platforms.unix; - }; - }; + pyspotify = callPackage ../development/python-modules/pyspotify { }; pykka = buildPythonPackage rec { name = "pykka-${version}"; From f82b1b758002842880873b68dc3792c1605d8754 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:13:21 -0400 Subject: [PATCH 122/190] pythonPackges.pykka: refactor move to python-modules --- .../python-modules/pykka/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pykka/default.nix diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix new file mode 100644 index 00000000000..4fe7816d4fd --- /dev/null +++ b/pkgs/development/python-modules/pykka/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchgit +}: + +buildPythonPackage rec { + pname = "pykka"; + version = "1.2.0"; + + src = fetchgit { + url = "https://github.com/jodal/pykka.git"; + rev = "refs/tags/v${version}"; + sha256 = "0qlfw1054ap0cha1m6dbnq51kjxqxaf338g7jwnwy33b3gr8x0hg"; + }; + + # There are no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://www.pykka.org; + description = "A Python implementation of the actor model"; + license = licenses.asl20; + maintainers = with maintainers; [ rickynils ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80a0ca8b82a..d06351ce218 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4310,26 +4310,7 @@ in { pyspotify = callPackage ../development/python-modules/pyspotify { }; - pykka = buildPythonPackage rec { - name = "pykka-${version}"; - - version = "1.2.0"; - - src = pkgs.fetchgit { - url = "https://github.com/jodal/pykka.git"; - rev = "refs/tags/v${version}"; - sha256 = "0qlfw1054ap0cha1m6dbnq51kjxqxaf338g7jwnwy33b3gr8x0hg"; - }; - - # There are no tests - doCheck = false; - - meta = { - homepage = http://www.pykka.org; - description = "A Python implementation of the actor model"; - maintainers = with maintainers; [ rickynils ]; - }; - }; + pykka = callPackage ../development/python-modules/pykka { }; ws4py = callPackage ../development/python-modules/ws4py {}; From 13b2ea65822eeee0be2b8759acd9402f4fc86e7e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:14:55 -0400 Subject: [PATCH 123/190] pythonPackages.gdata: refactor move to python-modules --- .../python-modules/gdata/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/gdata/default.nix diff --git a/pkgs/development/python-modules/gdata/default.nix b/pkgs/development/python-modules/gdata/default.nix new file mode 100644 index 00000000000..dbf2911ce19 --- /dev/null +++ b/pkgs/development/python-modules/gdata/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchurl +}: + +buildPythonPackage rec { + pname = "gdata"; + version = "2.0.18"; + + src = fetchurl { + url = "https://gdata-python-client.googlecode.com/files/${pname}-${version}.tar.gz"; + sha256 = "1dpxl5hwyyqd71avpm5vkvw8fhlvf9liizmhrq9jphhrx0nx5rsn"; + }; + + # Fails with "error: invalid command 'test'" + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/gdata-python-client/; + description = "Python client library for Google data APIs"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d06351ce218..92e216ee9c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4314,24 +4314,7 @@ in { ws4py = callPackage ../development/python-modules/ws4py {}; - gdata = buildPythonPackage rec { - name = "gdata-${version}"; - version = "2.0.18"; - - src = pkgs.fetchurl { - url = "https://gdata-python-client.googlecode.com/files/${name}.tar.gz"; - sha256 = "1dpxl5hwyyqd71avpm5vkvw8fhlvf9liizmhrq9jphhrx0nx5rsn"; - }; - - # Fails with "error: invalid command 'test'" - doCheck = false; - - meta = { - homepage = https://code.google.com/p/gdata-python-client/; - description = "Python client library for Google data APIs"; - license = licenses.asl20; - }; - }; + gdata = callPackage ../development/python-modules/gdata { }; IMAPClient = buildPythonPackage rec { name = "IMAPClient-${version}"; From 1c5e08e217ee3f17ef1ecc66e6fc4df4513cbe3b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:16:55 -0400 Subject: [PATCH 124/190] pythonPackages.IMAPClient: refactor move to python-modules --- .../python-modules/imapclient/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/imapclient/default.nix diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix new file mode 100644 index 00000000000..5334d473620 --- /dev/null +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy34 +, isPy35 +, mock +}: + +buildPythonPackage rec { + pname = "IMAPClient"; + version = "0.13"; + disabled = isPy34 || isPy35; + + src = fetchurl { + url = "http://freshfoo.com/projects/IMAPClient/${pname}-${version}.tar.gz"; + sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is"; + }; + + buildInputs = [ mock ]; + + preConfigure = '' + sed -i '/distribute_setup/d' setup.py + substituteInPlace setup.py --replace "mock==0.8.0" "mock" + ''; + + meta = with stdenv.lib; { + homepage = http://imapclient.freshfoo.com/; + description = "Easy-to-use, Pythonic and complete IMAP client library"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92e216ee9c7..e41b893ef0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4316,29 +4316,7 @@ in { gdata = callPackage ../development/python-modules/gdata { }; - IMAPClient = buildPythonPackage rec { - name = "IMAPClient-${version}"; - version = "0.13"; - disabled = isPy34 || isPy35; - - src = pkgs.fetchurl { - url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; - sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is"; - }; - - buildInputs = with self; [ mock ]; - - preConfigure = '' - sed -i '/distribute_setup/d' setup.py - substituteInPlace setup.py --replace "mock==0.8.0" "mock" - ''; - - meta = { - homepage = http://imapclient.freshfoo.com/; - description = "Easy-to-use, Pythonic and complete IMAP client library"; - license = licenses.bsd3; - }; - }; + IMAPClient = callPackage ../development/python-modules/imapclient { }; Logbook = callPackage ../development/python-modules/Logbook { }; From 1c0b595b059b2e4383665fa1732db2cf2eb616d6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:18:37 -0400 Subject: [PATCH 125/190] pythonPackages.rpdb: refactor move to python-modules --- .../python-modules/rpdb/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/rpdb/default.nix diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix new file mode 100644 index 00000000000..182709b525a --- /dev/null +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "rpdb"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rql1hq3lziwcql0h3dy05w074cn866p397ng9bv6qbz85ifw1bk"; + }; + + meta = with stdenv.lib; { + description = "pdb wrapper with remote access via tcp socket"; + homepage = https://github.com/tamentis/rpdb; + license = licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e41b893ef0b..ad57900d31f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4328,21 +4328,7 @@ in { inherit (pkgs) libvirt; }; - rpdb = buildPythonPackage rec { - name = "rpdb-0.1.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rpdb/${name}.tar.gz"; - sha256 = "0rql1hq3lziwcql0h3dy05w074cn866p397ng9bv6qbz85ifw1bk"; - }; - - meta = { - description = "pdb wrapper with remote access via tcp socket"; - homepage = https://github.com/tamentis/rpdb; - license = licenses.bsd2; - }; - }; - + rpdb = callPackage ../development/python-modules/rpdb { }; grequests = buildPythonPackage rec { pname = "grequests"; From 424082d2fbbdde0dbe4a77b9863e6f2259cf87a7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:21:46 -0400 Subject: [PATCH 126/190] pythonPackages.grequests: refactor move to python-modules --- .../python-modules/grequests/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/grequests/default.nix diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix new file mode 100644 index 00000000000..c42ace2e695 --- /dev/null +++ b/pkgs/development/python-modules/grequests/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, gevent +}: + +buildPythonPackage rec { + pname = "grequests"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; + }; + + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ requests gevent ]; + + meta = with stdenv.lib; { + description = "Asynchronous HTTP requests"; + homepage = https://github.com/kennethreitz/grequests; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ matejc ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad57900d31f..16a1a0f0a6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4330,28 +4330,7 @@ in { rpdb = callPackage ../development/python-modules/rpdb { }; - grequests = buildPythonPackage rec { - pname = "grequests"; - version = "0.3.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; - }; - - # No tests in archive - doCheck = false; - - propagatedBuildInputs = with self; [ requests gevent ]; - - meta = { - description = "Asynchronous HTTP requests"; - homepage = https://github.com/kennethreitz/grequests; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ matejc ]; - }; - }; + grequests = callPackage ../development/python-modules/grequests { }; first = callPackage ../development/python-modules/first {}; From 7008718bcf2f4b75ab9facfb3fa338eb53b374c5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:23:59 -0400 Subject: [PATCH 127/190] pythonPackages.flaskbabel: refactor move to python-modules --- .../python-modules/flaskbabel/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------- 2 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/flaskbabel/default.nix diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix new file mode 100644 index 00000000000..e04bae7f1c0 --- /dev/null +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +, jinja2 +, speaklater +, Babel +, pytz +}: + +buildPythonPackage rec { + pname = "Flask-Babel"; + version = "0.11.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "16b80cipdba9xj3jlaiaq6wgrgpjb70w3j01jjy9hbp4k71kd6yj"; + }; + + propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; + + meta = with stdenv.lib; { + description = "Adds i18n/l10n support to Flask applications"; + homepage = https://github.com/mitsuhiko/flask-babel; + license = licenses.bsd0; + maintainers = with maintainers; [ matejc ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16a1a0f0a6f..7bac1c7912d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4334,23 +4334,7 @@ in { first = callPackage ../development/python-modules/first {}; - flaskbabel = buildPythonPackage rec { - name = "Flask-Babel-0.11.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Babel/${name}.tar.gz"; - sha256 = "16b80cipdba9xj3jlaiaq6wgrgpjb70w3j01jjy9hbp4k71kd6yj"; - }; - - propagatedBuildInputs = with self; [ flask jinja2 speaklater Babel pytz ]; - - meta = { - description = "Adds i18n/l10n support to Flask applications"; - homepage = https://github.com/mitsuhiko/flask-babel; - license = "bsd"; - maintainers = with maintainers; [ matejc ]; - }; - }; + flaskbabel = callPackage ../development/python-modules/flaskbabel { }; speaklater = buildPythonPackage rec { name = "speaklater-1.3"; From 1654bd18651b34cb229da1654f376462f4ab82fc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:25:46 -0400 Subject: [PATCH 128/190] pythonPackages.speaklater: refactor move to python-modules --- .../python-modules/speaklater/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/speaklater/default.nix diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix new file mode 100644 index 00000000000..5de86d9e14c --- /dev/null +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "speaklater"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr"; + }; + + meta = with stdenv.lib; { + description = "Implements a lazy string for python useful for use with gettext"; + homepage = https://github.com/mitsuhiko/speaklater; + license = licenses.bsd0; + maintainers = with maintainers; [ matejc ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bac1c7912d..386e45d6c62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4336,21 +4336,7 @@ in { flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - speaklater = buildPythonPackage rec { - name = "speaklater-1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/speaklater/${name}.tar.gz"; - sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr"; - }; - - meta = { - description = "Implements a lazy string for python useful for use with gettext"; - homepage = https://github.com/mitsuhiko/speaklater; - license = "bsd"; - maintainers = with maintainers; [ matejc ]; - }; - }; + speaklater = callPackage ../development/python-modules/speaklater { }; speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; From 46d331ba8dd4601ca5e4fdabe73504bd3f8ec97d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:27:12 -0400 Subject: [PATCH 129/190] pythonPackages.power: refactor move to python-modules --- .../python-modules/power/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/power/default.nix diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix new file mode 100644 index 00000000000..a54bd025dc7 --- /dev/null +++ b/pkgs/development/python-modules/power/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "power"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d7d60ec332acbe3a7d00379b45e39abf650bf7ee311d61da5ab921f52f060f0"; + }; + + # Tests can't work because there is no power information available. + doCheck = false; + + meta = with stdenv.lib; { + description = "Cross-platform system power status information"; + homepage = https://github.com/Kentzo/Power; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 386e45d6c62..8ddb7911919 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4342,23 +4342,7 @@ in { pushbullet = callPackage ../development/python-modules/pushbullet { }; - power = buildPythonPackage rec { - name = "power-1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/power/${name}.tar.gz"; - sha256 = "7d7d60ec332acbe3a7d00379b45e39abf650bf7ee311d61da5ab921f52f060f0"; - }; - - # Tests can't work because there is no power information available. - doCheck = false; - - meta = { - description = "Cross-platform system power status information"; - homepage = https://github.com/Kentzo/Power; - license = licenses.mit; - }; - }; + power = callPackage ../development/python-modules/power { }; # added 2018-05-23, can be removed once 18.09 is branched off udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; From f84db6dceee5fc7d6801153638825cc6c8b8073e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:28:47 -0400 Subject: [PATCH 130/190] pythonPackges.tlsh: refacotr move to python-modules --- .../python-modules/tlsh/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------ 2 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/tlsh/default.nix diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix new file mode 100644 index 00000000000..893fe0240b6 --- /dev/null +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pkgs +}: + +buildPythonPackage rec { + pname = "tlsh"; + version = "3.4.5"; + + src = fetchFromGitHub { + owner = "trendmicro"; + repo = "tlsh"; + rev = "22fa9a62068b92c63f2b5a87004a7a7ceaac1930"; + sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"; + }; + + buildInputs = [ pkgs.cmake ]; + + # no test data + doCheck = false; + + preConfigure = '' + mkdir build + cd build + cmake .. + cd ../py_ext + ''; + + meta = with stdenv.lib; { + description = "Trend Micro Locality Sensitive Hash"; + homepage = https://github.com/trendmicro/tlsh; + license = licenses.asl20; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ddb7911919..af1d8ed4162 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4349,30 +4349,7 @@ in { pythonefl = callPackage ../development/python-modules/python-efl { }; - tlsh = buildPythonPackage rec { - name = "tlsh-3.4.5"; - src = pkgs.fetchFromGitHub { - owner = "trendmicro"; - repo = "tlsh"; - rev = "22fa9a62068b92c63f2b5a87004a7a7ceaac1930"; - sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"; - }; - buildInputs = with pkgs; [ cmake ]; - # no test data - doCheck = false; - preConfigure = '' - mkdir build - cd build - cmake .. - cd ../py_ext - ''; - meta = with stdenv.lib; { - description = "Trend Micro Locality Sensitive Hash"; - homepage = https://github.com/trendmicro/tlsh; - license = licenses.asl20; - platforms = platforms.linux; - }; - }; + tlsh = callPackage ../development/python-modules/tlsh { }; toposort = buildPythonPackage rec { name = "toposort-${version}"; From ae3f7898c67a59209049c079028f61f2f18d7c79 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:30:20 -0400 Subject: [PATCH 131/190] pythonPackages.toposort: refactor move to python-modules --- .../python-modules/toposort/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/toposort/default.nix diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix new file mode 100644 index 00000000000..67b946b352f --- /dev/null +++ b/pkgs/development/python-modules/toposort/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "toposort"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1izmirbwmd9xrk7rq83p486cvnsslfa5ljvl7rijj1r64zkcnf3a"; + }; + + meta = with stdenv.lib; { + description = "A topological sort algorithm"; + homepage = https://pypi.python.org/pypi/toposort/1.1; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af1d8ed4162..c9ad25afa37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4351,21 +4351,7 @@ in { tlsh = callPackage ../development/python-modules/tlsh { }; - toposort = buildPythonPackage rec { - name = "toposort-${version}"; - version = "1.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/toposort/toposort-1.1.tar.gz"; - sha256 = "1izmirbwmd9xrk7rq83p486cvnsslfa5ljvl7rijj1r64zkcnf3a"; - }; - meta = { - description = "A topological sort algorithm"; - homepage = https://pypi.python.org/pypi/toposort/1.1; - maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; - #license = licenses.apache; - }; - }; + toposort = callPackage ../development/python-modules/toposort { }; snapperGUI = buildPythonPackage rec { name = "Snapper-GUI"; From a576b19efb4da479aad6dab73316c45423882f91 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:32:58 -0400 Subject: [PATCH 132/190] pythonPackages.snapperGUI: refactor move to python-modules --- .../python-modules/snappergui/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/snappergui/default.nix diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix new file mode 100644 index 00000000000..43e942a9588 --- /dev/null +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, pygobject3 +, dbus-python +}: + +buildPythonPackage rec { + name = "Snapper-GUI"; + version = "0.1"; + + src = fetchgit { + url = "https://github.com/ricardomv/snapper-gui"; + rev = "11d98586b122180c75a86fccda45c4d7e3137591"; + sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1"; + }; + + # no tests available + doCheck = false; + + propagatedBuildInputs = [ pygobject3 dbus-python ]; + + meta = with stdenv.lib; { + homepage = https://github.com/ricardomv/snapper-gui; + description = "Graphical frontend for snapper"; + license = licenses.gpl2; + maintainers = with maintainers; [ tstrobel ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9ad25afa37..7825e58e531 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4353,27 +4353,7 @@ in { toposort = callPackage ../development/python-modules/toposort { }; - snapperGUI = buildPythonPackage rec { - name = "Snapper-GUI"; - - src = pkgs.fetchgit { - url = "https://github.com/ricardomv/snapper-gui"; - rev = "11d98586b122180c75a86fccda45c4d7e3137591"; - sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1"; - }; - - # no tests available - doCheck = false; - - propagatedBuildInputs = with self; [ pygobject3 dbus-python ]; - - meta = { - homepage = https://github.com/ricardomv/snapper-gui; - description = "Graphical frontend for snapper"; - license = licenses.gpl2; - maintainers = with maintainers; [ tstrobel ]; - }; - }; + snapperGUI = callPackage ../development/python-modules/snappergui { }; uncertainties = callPackage ../development/python-modules/uncertainties { }; From 00eb722bf74ec675c080602d61d7191a2cc5040f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:34:56 -0400 Subject: [PATCH 133/190] pythonPackages.funcy: refactor move to python-modules --- .../python-modules/funcy/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/funcy/default.nix diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix new file mode 100644 index 00000000000..ab7500466e0 --- /dev/null +++ b/pkgs/development/python-modules/funcy/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "funcy"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "511495db0c5660af18d3151b008c6ce698ae7fbf60887278e79675e35eed1f01"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Collection of fancy functional tools focused on practicality"; + homepage = "http://funcy.readthedocs.org/"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7825e58e531..5732d8490f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4357,24 +4357,7 @@ in { uncertainties = callPackage ../development/python-modules/uncertainties { }; - funcy = buildPythonPackage rec { - name = "funcy-1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/funcy/${name}.tar.gz"; - sha256 = "511495db0c5660af18d3151b008c6ce698ae7fbf60887278e79675e35eed1f01"; - }; - - # No tests - doCheck = false; - - meta = { - description = "Collection of fancy functional tools focused on practicality"; - homepage = "http://funcy.readthedocs.org/"; - license = licenses.bsd3; - - }; - }; + funcy = callPackage ../development/python-modules/funcy { }; vxi11 = callPackage ../development/python-modules/vxi11 { }; From e53a0479b51d15c330e31e2960e0749ec74952b5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:39:39 -0400 Subject: [PATCH 134/190] pythonPackages.svg2tikz: refactor move to python-modules --- .../python-modules/svg2tikz/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/svg2tikz/default.nix diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix new file mode 100644 index 00000000000..c3308bf229c --- /dev/null +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, lxml +, isPy27 +}: + +buildPythonPackage { + name = "svg2tikz"; + version = "1.0.0"; + disabled = ! isPy27; + + propagatedBuildInputs = [ lxml ]; + + src = fetchgit { + url = "https://github.com/kjellmf/svg2tikz"; + sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; + rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kjellmf/svg2tikz; + description = "An SVG to TikZ converter"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gal_bolle ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5732d8490f3..f11c956fba7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4361,25 +4361,7 @@ in { vxi11 = callPackage ../development/python-modules/vxi11 { }; - svg2tikz = self.buildPythonPackage { - name = "svg2tikz-1.0.0"; - disabled = ! isPy27; - - propagatedBuildInputs = with self; [lxml]; - - src = pkgs.fetchgit { - url = "https://github.com/kjellmf/svg2tikz"; - sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; - rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; - }; - - meta = { - homepage = https://github.com/kjellmf/svg2tikz; - description = "An SVG to TikZ converter"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ gal_bolle ]; - }; - }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; WSGIProxy = buildPythonPackage rec { name = "WSGIProxy-${version}"; From 10797302fb4c18cfb7828d6146881527bfa86b3c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:42:01 -0400 Subject: [PATCH 135/190] pythonPAckages.WSGIProxy: refactor move to python-modules --- .../python-modules/wsgiproxy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/wsgiproxy/default.nix diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix new file mode 100644 index 00000000000..8ae8b4aefa5 --- /dev/null +++ b/pkgs/development/python-modules/wsgiproxy/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, paste +, six +, isPy3k +}: + +buildPythonPackage rec { + pname = "WSGIProxy"; + version = "0.2.2"; + disabled = isPy3k; # Judging from SyntaxError + + src = fetchPypi { + inherit pname version; + sha256 = "0wqz1q8cvb81a37gb4kkxxpv4w7k8192a08qzyz67rn68ln2wcig"; + }; + + propagatedBuildInputs = [ paste six ]; + + meta = with stdenv.lib; { + description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other"; + homepage = "http://pythonpaste.org/wsgiproxy/"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f11c956fba7..c3127a1b164 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4363,26 +4363,7 @@ in { svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - WSGIProxy = buildPythonPackage rec { - name = "WSGIProxy-${version}"; - version = "0.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/WSGIProxy/WSGIProxy-${version}.tar.gz"; - sha256 = "0wqz1q8cvb81a37gb4kkxxpv4w7k8192a08qzyz67rn68ln2wcig"; - }; - - propagatedBuildInputs = with self; [ - paste six - ]; - - disabled = isPy3k; # Judging from SyntaxError - - meta = with stdenv.lib; { - description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other"; - homepage = "http://pythonpaste.org/wsgiproxy/"; - }; - }; + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; blist = buildPythonPackage rec { name = "blist-${version}"; From ab96dd445e5537ea1830754b8f5cc470395aeab9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:44:30 -0400 Subject: [PATCH 136/190] pythonPackages.blist: refactor move to python-modules --- .../python-modules/blist/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 11 +-------- 2 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/blist/default.nix diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix new file mode 100644 index 00000000000..d6d55accaca --- /dev/null +++ b/pkgs/development/python-modules/blist/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +}: + +buildPythonPackage rec { + pname = "blist"; + version = "1.3.6"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is"; + }; + + meta = with stdenv.lib; { + homepage = http://stutzbachenterprises.com/blist/; + description = "A list-like type with better asymptotic performance and similar performance on small lists"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3127a1b164..8fdd339903a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4365,16 +4365,7 @@ in { WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - blist = buildPythonPackage rec { - name = "blist-${version}"; - version = "1.3.6"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/blist/blist-${version}.tar.gz"; - sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is"; - }; - }; + blist = callPackage ../development/python-modules/blist { }; canonicaljson = callPackage ../development/python-modules/canonicaljson { }; From d4cf05070c2802310bc2b227a3b84a7ba81133ea Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:47:57 -0400 Subject: [PATCH 137/190] pythonPackages.daemonize: refactor move to python-modules --- .../python-modules/daemonize/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/daemonize/default.nix diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix new file mode 100644 index 00000000000..68863c61ada --- /dev/null +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "daemonize"; + version = "2.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2"; + }; + + meta = with stdenv.lib; { + description = "Library to enable your code run as a daemon process on Unix-like systems"; + homepage = https://github.com/thesharp/daemonize; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8fdd339903a..b44252464b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4369,15 +4369,7 @@ in { canonicaljson = callPackage ../development/python-modules/canonicaljson { }; - daemonize = buildPythonPackage rec { - name = "daemonize-${version}"; - version = "2.4.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/daemonize/daemonize-${version}.tar.gz"; - sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2"; - }; - }; + daemonize = callPackage ../development/python-modules/daemonize { }; pydenticon = buildPythonPackage rec { name = "pydenticon-${version}"; From c5ae2c30475be4739345d35597653c5179266716 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:50:20 -0400 Subject: [PATCH 138/190] pythonPackages.pydenticon: refactor move to python-modules --- .../python-modules/pydenticon/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +--------- 2 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pydenticon/default.nix diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix new file mode 100644 index 00000000000..f217b68808c --- /dev/null +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pillow +, mock +}: + +buildPythonPackage rec { + pname = "pydenticon"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "035dawcspgjw2rksbnn863s7b0i9ac8cc1nshshvd1l837ir1czp"; + }; + + propagatedBuildInputs = [ pillow mock ]; + + meta = with stdenv.lib; { + homepage = https://github.com/azaghal/pydenticon; + description = "Library for generating identicons. Port of Sigil (https://github.com/cupcake/sigil) with enhancements"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b44252464b8..9cf07452466 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4371,18 +4371,7 @@ in { daemonize = callPackage ../development/python-modules/daemonize { }; - pydenticon = buildPythonPackage rec { - name = "pydenticon-${version}"; - version = "0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pydenticon/pydenticon-0.2.tar.gz"; - sha256 = "035dawcspgjw2rksbnn863s7b0i9ac8cc1nshshvd1l837ir1czp"; - }; - propagatedBuildInputs = with self; [ - pillow mock - ]; - }; + pydenticon = callPackage ../development/python-modules/pydenticon { }; pynac = buildPythonPackage rec { name = "pynac-${version}"; From 62caeb1e319b29ad2da06f52ca7c327788e91725 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:52:24 -0400 Subject: [PATCH 139/190] pythonPackages.pynac: refactor move to python-modules --- .../python-modules/pynac/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +---------- 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/pynac/default.nix diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix new file mode 100644 index 00000000000..0839cb1aa4a --- /dev/null +++ b/pkgs/development/python-modules/pynac/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchurl +}: + +buildPythonPackage rec { + pname = "pynac"; + version = "0.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/pynac/pynac/pynac-0.2/pynac-0.2.tar.gz"; + sha256 = "0avzqqcxl54karjmla9jbsyid98mva36lxahwmrsx5h40ys2ggxp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/se-esss-litterbox/Pynac; + description = "A Python wrapper around the Dynac charged particle simulator"; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cf07452466..b561881cf49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4373,17 +4373,7 @@ in { pydenticon = callPackage ../development/python-modules/pydenticon { }; - pynac = buildPythonPackage rec { - name = "pynac-${version}"; - version = "0.2"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/project/pynac/pynac/pynac-0.2/pynac-0.2.tar.gz"; - sha256 = "0avzqqcxl54karjmla9jbsyid98mva36lxahwmrsx5h40ys2ggxp"; - }; - - propagatedBuildInputs = with self; []; - }; + pynac = callPackage ../development/python-modules/pynac { }; pybindgen = callPackage ../development/python-modules/pybindgen {}; From 5db93023357004253454b78b03fde3dafa2a24b9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:55:38 -0400 Subject: [PATCH 140/190] pythonPackages.signedjson: refactor move to python-modules --- .../python-modules/signedjson/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +---------- 2 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/signedjson/default.nix diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix new file mode 100644 index 00000000000..33a615fefd4 --- /dev/null +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, canonicaljson +, unpaddedbase64 +, pynacl +}: + +buildPythonPackage rec { + pname = "signedjson"; + version = "1.0.0"; + + src = fetchgit { + url = "https://github.com/matrix-org/python-signedjson.git"; + rev = "refs/tags/v${version}"; + sha256 = "0b8xxhc3npd4567kqapfp4gs7m0h057xam3an7424az262ind82n"; + }; + + propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl ]; + + meta = with stdenv.lib; { + homepage = https://pypi.org/project/signedjson/; + description = "Sign JSON with Ed25519 signatures"; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b561881cf49..92735dbc927 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4385,20 +4385,7 @@ in { service-identity = callPackage ../development/python-modules/service_identity { }; - signedjson = buildPythonPackage rec { - name = "signedjson-${version}"; - version = "1.0.0"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/python-signedjson.git"; - rev = "refs/tags/v${version}"; - sha256 = "0b8xxhc3npd4567kqapfp4gs7m0h057xam3an7424az262ind82n"; - }; - - propagatedBuildInputs = with self; [ - canonicaljson unpaddedbase64 pynacl - ]; - }; + signedjson = callPackage ../development/python-modules/signedjson { }; unpaddedbase64 = buildPythonPackage rec { name = "unpaddedbase64-${version}"; From 246bf6c54d35fe15775929c54853bfb7c9110a00 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 12:59:28 -0400 Subject: [PATCH 141/190] pythonPAckages.unpaddedbase64: refactor move to python-modules --- .../python-modules/unpaddedbase64/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +--------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/unpaddedbase64/default.nix diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix new file mode 100644 index 00000000000..b69f894cb5c --- /dev/null +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchgit +}: + +buildPythonPackage rec { + pname = "unpaddedbase64"; + version = "1.1.0"; + + src = fetchgit { + url = "https://github.com/matrix-org/python-unpaddedbase64.git"; + rev = "refs/tags/v${version}"; + sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/matrix-org/python-unpaddedbase64; + description = "Unpadded Base64"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92735dbc927..e31d98d20c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4387,17 +4387,7 @@ in { signedjson = callPackage ../development/python-modules/signedjson { }; - unpaddedbase64 = buildPythonPackage rec { - name = "unpaddedbase64-${version}"; - version = "1.1.0"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/python-unpaddedbase64.git"; - rev = "refs/tags/v${version}"; - sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; - }; - }; - + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; thumbor = callPackage ../development/python-modules/thumbor { }; From b9ad8d843d4b684f6e1eb9047e1175bd03df0fe6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:02:56 -0400 Subject: [PATCH 142/190] pythonPackages.thumborPexif: refactor move to python-modules --- .../python-modules/thumborpexif/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/thumborpexif/default.nix diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix new file mode 100644 index 00000000000..c3aa0136f33 --- /dev/null +++ b/pkgs/development/python-modules/thumborpexif/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +}: + +buildPythonPackage rec { + pname = "thumbor-pexif"; + version = "0.14"; + disabled = ! isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "715cd24760c7c28d6270c79c9e29b55b8d952a24e0e56833d827c2c62451bc3c"; + }; + + meta = with stdenv.lib; { + description = "Module to parse and edit the EXIF data tags in a JPEG image"; + homepage = http://www.benno.id.au/code/pexif/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e31d98d20c0..545a72686f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4391,21 +4391,7 @@ in { thumbor = callPackage ../development/python-modules/thumbor { }; - thumborPexif = self.buildPythonPackage rec { - name = "thumbor-pexif-0.14"; - disabled = ! isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/thumbor-pexif/${name}.tar.gz"; - sha256 = "715cd24760c7c28d6270c79c9e29b55b8d952a24e0e56833d827c2c62451bc3c"; - }; - - meta = { - description = "Module to parse and edit the EXIF data tags in a JPEG image"; - homepage = http://www.benno.id.au/code/pexif/; - license = licenses.mit; - }; - }; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; pync = buildPythonPackage rec { version = "1.4"; From 8bbd8dcc1ffcfa23b1e11f06a34e17fac75a0a5e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:05:04 -0400 Subject: [PATCH 143/190] pythonPackages.pync: refacotr move to python-modules --- .../python-modules/pync/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +-------------- 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/pync/default.nix diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix new file mode 100644 index 00000000000..ad02b3f2f2f --- /dev/null +++ b/pkgs/development/python-modules/pync/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, dateutil +, pkgs +}: + +buildPythonPackage rec { + version = "1.4"; + pname = "pync"; + disabled = ! isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0lc1x0pai85avm1r452xnvxc12wijnhz87xv20yp3is9fs6rnkrh"; + }; + + buildInputs = [ pkgs.coreutils ]; + propagatedBuildInputs = [ dateutil ]; + + preInstall = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py + ''; + + meta = with stdenv.lib; { + description = "Python Wrapper for Mac OS 10.8 Notification Center"; + homepage = https://pypi.python.org/pypi/pync/1.4; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ lovek323 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 545a72686f9..d9628552241 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4393,33 +4393,7 @@ in { thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - pync = buildPythonPackage rec { - version = "1.4"; - baseName = "pync"; - name = "${baseName}-${version}"; - disabled = ! isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${baseName}/${name}.tar.gz"; - sha256 = "0lc1x0pai85avm1r452xnvxc12wijnhz87xv20yp3is9fs6rnkrh"; - }; - - buildInputs = with self; [ pkgs.coreutils ]; - - propagatedBuildInputs = with self; [ dateutil ]; - - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py - ''; - - meta = { - description = "Python Wrapper for Mac OS 10.8 Notification Center"; - homepage = https://pypi.python.org/pypi/pync/1.4; - license = licenses.mit; - platforms = platforms.darwin; - maintainers = with maintainers; [ lovek323 ]; - }; - }; + pync = callPackage ../development/python-modules/pync { }; weboob = callPackage ../development/python-modules/weboob { }; From 606d7c79e9c1b5cdf132875d6c24dfbb102cb6ec Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:07:34 -0400 Subject: [PATCH 144/190] pythonPackages.datadiff: refactor move to python-modules --- .../python-modules/datadiff/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/datadiff/default.nix diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix new file mode 100644 index 00000000000..72964e3d1f6 --- /dev/null +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "datadiff"; + version = "1.1.6"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543"; + }; + + buildInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "DataDiff"; + homepage = https://sourceforge.net/projects/datadiff/; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9628552241..f0a6d386151 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4397,22 +4397,7 @@ in { weboob = callPackage ../development/python-modules/weboob { }; - datadiff = buildPythonPackage rec { - name = "datadiff-1.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/datadiff/datadiff-1.1.6.zip"; - sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543"; - }; - - buildInputs = with self; [ nose ]; - - meta = { - description = "DataDiff"; - homepage = https://sourceforge.net/projects/datadiff/; - license = licenses.asl20; - }; - }; + datadiff = callPackage ../development/python-modules/datadiff { }; termcolor = buildPythonPackage rec { name = "termcolor-1.1.0"; From ec00d1aa543f8f2991fa033bdcdafa2214295d02 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:09:56 -0400 Subject: [PATCH 145/190] pythonPackages.termcolor: refactor move to python-modules --- .../python-modules/termcolor/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/termcolor/default.nix diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix new file mode 100644 index 00000000000..2931f0e5199 --- /dev/null +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "termcolor"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"; + }; + + meta = with stdenv.lib; { + description = "Termcolor"; + homepage = https://pypi.python.org/pypi/termcolor; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0a6d386151..52f91d46fd8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4399,20 +4399,7 @@ in { datadiff = callPackage ../development/python-modules/datadiff { }; - termcolor = buildPythonPackage rec { - name = "termcolor-1.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz"; - sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"; - }; - - meta = { - description = "Termcolor"; - homepage = https://pypi.python.org/pypi/termcolor; - license = licenses.mit; - }; - }; + termcolor = callPackage ../development/python-modules/termcolor { }; html2text = buildPythonPackage rec { name = "html2text-2016.9.19"; From 1b9a9d2530c3651b5563302852b76d7fa501358d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:12:19 -0400 Subject: [PATCH 146/190] pythonPAckages.html2text: refactor move to python-modules --- .../python-modules/html2text/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/html2text/default.nix diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix new file mode 100644 index 00000000000..6840f461cc9 --- /dev/null +++ b/pkgs/development/python-modules/html2text/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "html2text"; + version = "2016.9.19"; + + src = fetchPypi { + inherit pname version; + sha256 = "554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55"; + }; + + meta = with stdenv.lib; { + description = "Turn HTML into equivalent Markdown-structured text"; + homepage = https://github.com/Alir3z4/html2text/; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52f91d46fd8..5bfe34ff0c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4401,20 +4401,7 @@ in { termcolor = callPackage ../development/python-modules/termcolor { }; - html2text = buildPythonPackage rec { - name = "html2text-2016.9.19"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/html2text/${name}.tar.gz"; - sha256 = "554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55"; - }; - - meta = { - description = "Turn HTML into equivalent Markdown-structured text"; - homepage = https://github.com/Alir3z4/html2text/; - license = licenses.gpl3; - }; - }; + html2text = callPackage ../development/python-modules/html2text { }; pychart = callPackage ../development/python-modules/pychart {}; From 04558f25d8f29f0e1d96599c3cfbd693a323d5cb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:14:21 -0400 Subject: [PATCH 147/190] pythonPAckages.parsimonious: refactor move to python-modules --- .../python-modules/parsimonious/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/parsimonious/default.nix diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix new file mode 100644 index 00000000000..13fabd4cbf9 --- /dev/null +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, nose +, six +}: + +buildPythonPackage rec { + version = "0.7.0"; + pname = "parsimonious"; + + src = fetchFromGitHub { + repo = "parsimonious"; + owner = "erikrose"; + rev = version; + sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a"; + }; + + propagatedBuildInputs = [ nose six ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/erikrose/parsimonious"; + description = "Fast arbitrary-lookahead parser written in pure Python"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bfe34ff0c9..871dc8e44e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4405,24 +4405,7 @@ in { pychart = callPackage ../development/python-modules/pychart {}; - parsimonious = buildPythonPackage rec { - version = "0.7.0"; - name = "parsimonious-${version}"; - src = pkgs.fetchFromGitHub { - repo = "parsimonious"; - owner = "erikrose"; - rev = version; - sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a"; - }; - - propagatedBuildInputs = with self; [ nose six ]; - - meta = { - homepage = "https://github.com/erikrose/parsimonious"; - description = "Fast arbitrary-lookahead parser written in pure Python"; - license = licenses.mit; - }; - }; + parsimonious = callPackage ../development/python-modules/parsimonious { }; networkx = callPackage ../development/python-modules/networkx { }; From 5083413b004845ec18d96cf680bb67cbc2ba0f2d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:16:18 -0400 Subject: [PATCH 148/190] pythonPackages.ofxparse: refactor move to python-modules --- .../python-modules/ofxparse/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/ofxparse/default.nix diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix new file mode 100644 index 00000000000..6308921aeab --- /dev/null +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "ofxparse"; + version = "0.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; + }; + + propagatedBuildInputs = [ six beautifulsoup4 ]; + + meta = with stdenv.lib; { + homepage = "http://sites.google.com/site/ofxparse"; + description = "Tools for working with the OFX (Open Financial Exchange) file format"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 871dc8e44e6..673465dfccb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4413,21 +4413,7 @@ in { ofxhome = callPackage ../development/python-modules/ofxhome { }; - ofxparse = buildPythonPackage rec { - name = "ofxparse-0.14"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; - sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; - }; - - propagatedBuildInputs = with self; [ six beautifulsoup4 ]; - - meta = { - homepage = "http://sites.google.com/site/ofxparse"; - description = "Tools for working with the OFX (Open Financial Exchange) file format"; - license = licenses.mit; - }; - }; + ofxparse = callPackage ../development/python-modules/ofxparse { }; ofxtools = buildPythonPackage rec { name = "ofxtools-0.3.8"; From b67cc15b3e395b61f156693894971a63df77aeae Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:18:50 -0400 Subject: [PATCH 149/190] pythonPackages.ofxtools: refactor move to python-modules --- .../python-modules/ofxtools/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 2 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/ofxtools/default.nix diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix new file mode 100644 index 00000000000..8490aae4f5c --- /dev/null +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "ofxtools"; + version = "0.3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s ofxtools + ''; + + buildInputs = [ sqlalchemy ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/csingley/ofxtools"; + description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions"; + license = licenses.mit; + broken = true; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 673465dfccb..203bb5fdf97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4415,26 +4415,7 @@ in { ofxparse = callPackage ../development/python-modules/ofxparse { }; - ofxtools = buildPythonPackage rec { - name = "ofxtools-0.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxtools/${name}.tar.gz"; - sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s ofxtools - ''; - - buildInputs = with self; [ sqlalchemy ]; - - meta = { - homepage = "https://github.com/csingley/ofxtools"; - description = "Library for working with Open Financial Exchange (OFX) formatted data used by financial institutions"; - license = licenses.mit; - broken = true; - }; - }; + ofxtools = callPackage ../development/python-modules/ofxtools { }; basemap = buildPythonPackage rec { name = "basemap-1.0.7"; From c9d4ba24074b993c537639e5f14d5270931c3525 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:23:44 -0400 Subject: [PATCH 150/190] pythonPAckages.basemap: refactor move to python-modules --- .../python-modules/basemap/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +------------- 2 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/basemap/default.nix diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix new file mode 100644 index 00000000000..256abef592c --- /dev/null +++ b/pkgs/development/python-modules/basemap/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, numpy +, matplotlib +, pillow +, setuptools +, pkgs +}: + +buildPythonPackage rec { + pname = "basemap"; + version = "1.0.7"; + + src = fetchurl { + url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; + sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0"; + }; + + propagatedBuildInputs = [ numpy matplotlib pillow ]; + buildInputs = [ setuptools pkgs.geos pkgs.proj ]; + + # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script + configurePhase = '' + export GEOS_DIR=${pkgs.geos} + ''; + + # The 'check' target is not supported by the `setup.py` script. + # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://matplotlib.org/basemap/"; + description = "Plot data on map projections with matplotlib"; + longDescription = '' + An add-on toolkit for matplotlib that lets you plot data on map projections with + coastlines, lakes, rivers and political boundaries. See + http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. + ''; + license = with licenses; [ mit gpl2 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 203bb5fdf97..2aa88a3c30c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4417,37 +4417,7 @@ in { ofxtools = callPackage ../development/python-modules/ofxtools { }; - basemap = buildPythonPackage rec { - name = "basemap-1.0.7"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; - sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0"; - }; - - propagatedBuildInputs = with self; [ numpy matplotlib pillow ]; - buildInputs = with self; with pkgs ; [ setuptools geos proj ]; - - # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script - configurePhase = '' - export GEOS_DIR=${pkgs.geos} - ''; - - # The 'check' target is not supported by the `setup.py` script. - # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) - doCheck = false; - - meta = { - homepage = "https://matplotlib.org/basemap/"; - description = "Plot data on map projections with matplotlib"; - longDescription = '' - An add-on toolkit for matplotlib that lets you plot data on map projections with - coastlines, lakes, rivers and political boundaries. See - http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. - ''; - license = with licenses; [ mit gpl2 ]; - }; - }; + basemap = callPackage ../development/python-modules/basemap { }; dicttoxml = callPackage ../development/python-modules/dicttoxml { }; From e0d6142ed8024ac45d4e93cce392d00e2c3e9079 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:27:31 -0400 Subject: [PATCH 151/190] pythonPackages.evernote: refactor move to python-modules --- .../python-modules/evernote/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/evernote/default.nix diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix new file mode 100644 index 00000000000..717ab77018e --- /dev/null +++ b/pkgs/development/python-modules/evernote/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, oauth2 +}: + +buildPythonPackage rec { + pname = "evernote"; + version = "1.25.0"; + disabled = ! isPy27; #some dependencies do not work with py3 + + src = fetchPypi { + inherit pname version; + sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d"; + }; + + propagatedBuildInputs = [ oauth2 ]; + + meta = with stdenv.lib; { + description = "Evernote SDK for Python"; + homepage = http://dev.evernote.com; + license = licenses.asl20; + maintainers = with maintainers; [ hbunke ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2aa88a3c30c..346da83808f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4423,25 +4423,7 @@ in { markdown2 = callPackage ../development/python-modules/markdown2 { }; - evernote = buildPythonPackage rec { - name = "evernote-${version}"; - version = "1.25.0"; - disabled = ! isPy27; #some dependencies do not work with py3 - - src = pkgs.fetchurl { - url = "mirror://pypi/e/evernote/${name}.tar.gz"; - sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d"; - }; - - propagatedBuildInputs = with self; [ oauth2 ]; - - meta = { - description = "Evernote SDK for Python"; - homepage = http://dev.evernote.com; - license = licenses.asl20; - maintainers = with maintainers; [ hbunke ]; - }; - }; + evernote = callPackage ../development/python-modules/evernote { }; setproctitle = buildPythonPackage rec { name = "python-setproctitle-${version}"; From 13352bb72009d7fd077c8d4592d4c442335d9a02 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:29:09 -0400 Subject: [PATCH 152/190] pythonPackages.setproctitle: refactor move to python-modules --- .../python-modules/setproctitle/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/setproctitle/default.nix diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix new file mode 100644 index 00000000000..3aea75e3de8 --- /dev/null +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-setproctitle"; + version = "1.1.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w"; + }; + + meta = with stdenv.lib; { + description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; + homepage = https://github.com/dvarrazzo/py-setproctitle; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ exi ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 346da83808f..4640224be13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4425,22 +4425,7 @@ in { evernote = callPackage ../development/python-modules/evernote { }; - setproctitle = buildPythonPackage rec { - name = "python-setproctitle-${version}"; - version = "1.1.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/setproctitle/setproctitle-${version}.tar.gz"; - sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w"; - }; - - meta = { - description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; - homepage = https://github.com/dvarrazzo/py-setproctitle; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ exi ]; - }; - }; + setproctitle = callPackage ../development/python-modules/setproctitle { }; thrift = buildPythonPackage rec { name = "thrift-${version}"; From 80c90495243f2800711047e24c38238dec763d88 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:35:44 -0400 Subject: [PATCH 153/190] pythonPackages.thrift: refactor move to python-modules --- .../python-modules/thrift/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------------- 2 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/thrift/default.nix diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix new file mode 100644 index 00000000000..932c642e9b1 --- /dev/null +++ b/pkgs/development/python-modules/thrift/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "thrift"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e"; + }; + + # No tests. Breaks when not disabling. + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for the Apache Thrift RPC system"; + homepage = http://thrift.apache.org/; + license = licenses.asl20; + maintainers = with maintainers; [ hbunke ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4640224be13..9a4d4cc17c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4427,26 +4427,7 @@ in { setproctitle = callPackage ../development/python-modules/setproctitle { }; - thrift = buildPythonPackage rec { - name = "thrift-${version}"; - version = "0.9.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/thrift/${name}.tar.gz"; - sha256 = "dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e"; - }; - - # No tests. Breaks when not disabling. - doCheck = false; - - meta = { - description = "Python bindings for the Apache Thrift RPC system"; - homepage = http://thrift.apache.org/; - license = licenses.asl20; - maintainers = with maintainers; [ hbunke ]; - - }; - }; + thrift = callPackage ../development/python-modules/thrift { }; geeknote = buildPythonPackage rec { version = "2015-05-11"; From b1ea3cdc674cd8e0706e6ad7f469812e5d640846 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:38:42 -0400 Subject: [PATCH 154/190] pythonPackages.geeknote: refactor move to python-modules --- .../python-modules/geeknote/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +---------------- 2 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/geeknote/default.nix diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix new file mode 100644 index 00000000000..d352d6def24 --- /dev/null +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, thrift +, beautifulsoup4 +, markdown2 +, sqlalchemy +, html2text +, evernote +}: + +buildPythonPackage rec { + version = "2015-05-11"; + pname = "geeknote"; + disabled = ! isPy27; + + src = fetchFromGitHub { + owner = "VitaliyRodnenko"; + repo = "geeknote"; + rev = "8489a87d044e164edb321ba9acca8d4631de3dca"; + sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf"; + }; + + /* build with tests fails with "Can not create application dirictory : + /homeless-shelter/.geeknotebuilder". */ + doCheck = false; + + propagatedBuildInputs = [ thrift beautifulsoup4 markdown2 sqlalchemy html2text evernote ]; + + meta = with stdenv.lib; { + description = "Work with Evernote from command line"; + homepage = http://www.geeknote.me; + license = licenses.gpl1; + maintainers = with maintainers; [ hbunke ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a4d4cc17c8..84ac88918ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4429,39 +4429,7 @@ in { thrift = callPackage ../development/python-modules/thrift { }; - geeknote = buildPythonPackage rec { - version = "2015-05-11"; - name = "geeknote-${version}"; - disabled = ! isPy27; - - src = pkgs.fetchFromGitHub { - owner = "VitaliyRodnenko"; - repo = "geeknote"; - rev = "8489a87d044e164edb321ba9acca8d4631de3dca"; - sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf"; - }; - - /* build with tests fails with "Can not create application dirictory : - /homeless-shelter/.geeknotebuilder". */ - doCheck = false; - - propagatedBuildInputs = with self; [ - thrift - beautifulsoup4 - markdown2 - sqlalchemy - html2text - evernote - ]; - - meta = { - description = "Work with Evernote from command line"; - homepage = http://www.geeknote.me; - license = licenses.gpl1; - maintainers = with maintainers; [ hbunke ]; - - }; - }; + geeknote = callPackage ../development/python-modules/geeknote { }; trollius = callPackage ../development/python-modules/trollius {}; From fcb1e3bbba3cbf1d1b994b14e9023cfcad7f7952 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:45:21 -0400 Subject: [PATCH 155/190] pythonPackages.neovim_gui: refactor move to python-modules --- .../python-modules/neovim_gui/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +---------------- 2 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/neovim_gui/default.nix diff --git a/pkgs/development/python-modules/neovim_gui/default.nix b/pkgs/development/python-modules/neovim_gui/default.nix new file mode 100644 index 00000000000..da3a0591f7c --- /dev/null +++ b/pkgs/development/python-modules/neovim_gui/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, neovim +, click +, pygobject3 +, isPy27 +, pkgs +}: + +buildPythonPackage rec { + pname = "neovim-pygui"; + version = "0.1.3"; + disabled = !isPy27; + + src = fetchFromGitHub { + owner = "neovim"; + repo = "python-gui"; + rev = version; + sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz"; + }; + + propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobjectIntrospection pkgs.makeWrapper pkgs.gtk3 ]; + + patchPhase = '' + sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py + ''; + + postInstall = '' + wrapProgram $out/bin/pynvim \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH" + ''; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84ac88918ed..5f8cec39e4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4435,37 +4435,7 @@ in { neovim = callPackage ../development/python-modules/neovim {}; - neovim_gui = buildPythonPackage rec { - name = "neovim-pygui-${self.neovim.version}"; - version = "0.1.3"; - disabled = !isPy27; - - src = pkgs.fetchFromGitHub { - owner = "neovim"; - repo = "python-gui"; - rev = version; - sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz"; - }; - - propagatedBuildInputs = [ - self.neovim - self.click - self.pygobject3 - pkgs.gobjectIntrospection - pkgs.makeWrapper - pkgs.gtk3 - ]; - - patchPhase = '' - sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py - ''; - - postInstall = '' - wrapProgram $out/bin/pynvim \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "${self.pygobject3}/lib/python2.7/site-packages:$PYTHONPATH" - ''; - }; + neovim_gui = callPackage ../development/python-modules/neovim_gui { }; typogrify = buildPythonPackage rec { name = "typogrify-2.0.7"; From eb7fbb8c376491fe3bb02e0f3861b2998fe1a4ff Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:48:16 -0400 Subject: [PATCH 156/190] pythonPackages.typogrify: refactor move to python-modules --- .../python-modules/typogrify/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------- 2 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/typogrify/default.nix diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix new file mode 100644 index 00000000000..85323cc77e7 --- /dev/null +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPyPy +, django +, smartypants +, jinja2 +}: + +buildPythonPackage rec { + pname = "typogrify"; + version = "2.0.7"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; + }; + + propagatedBuildInputs = [ django smartypants jinja2 ]; + + # Wants to set up Django + doCheck = false; + + meta = with stdenv.lib; { + description = "Filters to enhance web typography, including support for Django & Jinja templates"; + homepage = "https://github.com/mintchaos/typogrify"; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f8cec39e4f..2c66822170a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4437,23 +4437,7 @@ in { neovim_gui = callPackage ../development/python-modules/neovim_gui { }; - typogrify = buildPythonPackage rec { - name = "typogrify-2.0.7"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/typogrify/${name}.tar.gz"; - sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; - }; - disabled = isPyPy; - # Wants to set up Django - doCheck = false; - propagatedBuildInputs = with self; [ django smartypants jinja2 ]; - meta = { - description = "Filters to enhance web typography, including support for Django & Jinja templates"; - homepage = "https://github.com/mintchaos/typogrify"; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }; + typogrify = callPackage ../development/python-modules/typogrify { }; smartypants = buildPythonPackage rec { version = "1.8.6"; From ff645155790b52e600ccf6fb795c35882e537ba2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:50:47 -0400 Subject: [PATCH 157/190] pythonPackages.smartypants: refactor move to python-modules --- .../python-modules/smartypants/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/smartypants/default.nix diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix new file mode 100644 index 00000000000..3c4735013ab --- /dev/null +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchhg +, isPyPy +}: + +buildPythonPackage rec { + version = "1.8.6"; + pname = "smartypants"; + disabled = isPyPy; + + src = fetchhg { + url = "https://bitbucket.org/livibetter/smartypants.py"; + rev = "v${version}"; + sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6"; + }; + + meta = with stdenv.lib; { + description = "Python with the SmartyPants"; + homepage = "https://bitbucket.org/livibetter/smartypants.py"; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c66822170a..0332127a7a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4439,23 +4439,7 @@ in { typogrify = callPackage ../development/python-modules/typogrify { }; - smartypants = buildPythonPackage rec { - version = "1.8.6"; - name = "smartypants-${version}"; - src = pkgs.fetchhg { - url = "https://bitbucket.org/livibetter/smartypants.py"; - rev = "v${version}"; - sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6"; - }; - disabled = isPyPy; - buildInputs = with self; [ ]; #docutils pygments ]; - meta = { - description = "Python with the SmartyPants"; - homepage = "https://bitbucket.org/livibetter/smartypants.py"; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }; + smartypants = callPackage ../development/python-modules/smartypants { }; pypeg2 = buildPythonPackage rec { version = "2.15.2"; From 15b5f85a963de1a99047ed0f7cf037b32033db68 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:52:22 -0400 Subject: [PATCH 158/190] pythonPackages.pypeg2: refactor move to python-modules --- .../python-modules/pypeg2/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pypeg2/default.nix diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix new file mode 100644 index 00000000000..de2ddc98a8e --- /dev/null +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + version = "2.15.2"; + pname = "pypeg2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b"; + }; + + checkPhase = '' + # The tests assume that test_xmlast does not run before test_pyPEG2. + python -m unittest pypeg2.test.test_pyPEG2 pypeg2.test.test_xmlast + ''; + + #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "PEG parser interpreter in Python"; + homepage = http://fdik.org/pyPEG; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0332127a7a0..dbd15fd0704 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4441,29 +4441,7 @@ in { smartypants = callPackage ../development/python-modules/smartypants { }; - pypeg2 = buildPythonPackage rec { - version = "2.15.2"; - name = "pypeg2-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyPEG2/pyPEG2-${version}.tar.gz"; - sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b"; - }; - - checkPhase = '' - # The tests assume that test_xmlast does not run before test_pyPEG2. - python -m unittest pypeg2.test.test_pyPEG2 pypeg2.test.test_xmlast - ''; - - #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 - doCheck = !isPy3k; - - meta = { - description = "PEG parser interpreter in Python"; - homepage = http://fdik.org/pyPEG; - license = licenses.gpl2; - }; - }; + pypeg2 = callPackage ../development/python-modules/pypeg2 { }; torchvision = callPackage ../development/python-modules/torchvision { }; From dae0571bc34e59ec1877c2c5cc780ec138beda33 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:54:45 -0400 Subject: [PATCH 159/190] pythonPackages.jenkinsapi: refactor move to python-modules --- .../python-modules/jenkinsapi/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 2 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/jenkinsapi/default.nix diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix new file mode 100644 index 00000000000..a8032070708 --- /dev/null +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytz +, requests +, coverage +, mock +, nose +, unittest2 +}: + +buildPythonPackage rec { + pname = "jenkinsapi"; + version = "0.2.32"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22"; + }; + + propagatedBuildInputs = [ pytz requests ]; + buildInputs = [ coverage mock nose unittest2 ]; + + meta = with stdenv.lib; { + description = "A Python API for accessing resources on a Jenkins continuous-integration server"; + homepage = https://github.com/salimfadhley/jenkinsapi; + maintainers = with maintainers; [ drets ]; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbd15fd0704..613852d406d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4445,26 +4445,7 @@ in { torchvision = callPackage ../development/python-modules/torchvision { }; - jenkinsapi = buildPythonPackage rec { - name = "jenkinsapi-${version}"; - version = "0.2.32"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jenkinsapi/${name}.tar.gz"; - sha256 = "0fcc78b8dfc87237942aad2a8be54dbc08bc4afceaa7f6897f3d894e7d4bfd22"; - }; - - propagatedBuildInputs = with self; [ pytz requests ]; - - buildInputs = with self; [ coverage mock nose unittest2 ]; - - meta = { - description = "A Python API for accessing resources on a Jenkins continuous-integration server"; - homepage = https://github.com/salimfadhley/jenkinsapi; - maintainers = with maintainers; [ drets ]; - license = licenses.mit; - }; - }; + jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; jenkins-job-builder = buildPythonPackage rec { name = "jenkins-job-builder-2.0.0.0b2"; From 8b8155facc22b8c76fabe1d4f060eeabfe5ae832 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 13:57:00 -0400 Subject: [PATCH 160/190] pythonPackages.jenkins-job-builder: refactor move to python-modules --- .../jenkins-job-builder/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +---------------- 2 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/jenkins-job-builder/default.nix diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix new file mode 100644 index 00000000000..ac654498ac4 --- /dev/null +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pip +, pbr +, mock +, python-jenkins +, pyyaml +, six +, stevedore +, isPy27 +}: + +buildPythonPackage rec { + pname = "jenkins-job-builder"; + version = "2.0.0.0b2"; + disabled = !isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1y0yl2w6c9c91f9xbjkvff1ag8p72r24nzparrzrw9sl8kn9632x"; + }; + + patchPhase = '' + export HOME=$TMPDIR + ''; + + buildInputs = [ pip ]; + propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ]; + + meta = with stdenv.lib; { + description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; + homepage = "https://docs.openstack.org/infra/system-config/jjb.html"; + license = licenses.asl20; + maintainers = with maintainers; [ garbas ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 613852d406d..2d0744c996b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4447,39 +4447,7 @@ in { jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - jenkins-job-builder = buildPythonPackage rec { - name = "jenkins-job-builder-2.0.0.0b2"; - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz"; - sha256 = "1y0yl2w6c9c91f9xbjkvff1ag8p72r24nzparrzrw9sl8kn9632x"; - }; - - patchPhase = '' - export HOME=$TMPDIR - ''; - - buildInputs = with self; [ - pip - ]; - - propagatedBuildInputs = with self; [ - pbr - mock - python-jenkins - pyyaml - six - stevedore - ]; - - meta = { - description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; - homepage = "https://docs.openstack.org/infra/system-config/jjb.html"; - license = licenses.asl20; - maintainers = with maintainers; [ garbas ]; - }; - }; + jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; dot2tex = buildPythonPackage rec { name = "dot2tex-2.9.0"; From 64a24d3f9ad6b478c5ab61e526ec5dedea1ac0cc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:49:18 -0400 Subject: [PATCH 161/190] pythonPackages.dot2tex: refactor move to python-modules --- .../python-modules/dot2tex/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/dot2tex/default.nix diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix new file mode 100644 index 00000000000..9d644c22eaf --- /dev/null +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, pyparsing +}: + +buildPythonPackage rec { + pname = "dot2tex"; + version = "2.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; + }; + + # Tests fail with 3.x. Furthermore, package is no longer maintained. + disabled = isPy3k; + + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; + homepage = "https://github.com/kjellmf/dot2tex"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d0744c996b..68df3ed5da0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4449,27 +4449,7 @@ in { jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - dot2tex = buildPythonPackage rec { - name = "dot2tex-2.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dot2tex/dot2tex-2.9.0.tar.gz"; - sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; - }; - - # Tests fail with 3.x. Furthermore, package is no longer maintained. - disabled = isPy3k; - - propagatedBuildInputs = with self; [ - pyparsing - ]; - - meta = { - description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; - homepage = "https://github.com/kjellmf/dot2tex"; - license = licenses.mit; - }; - }; + dot2tex = callPackage ../development/python-modules/dot2tex { }; poezio = callPackage ../applications/networking/instant-messengers/poezio { }; From c2526182c880a6ad969dd231b6802d418ae09b4b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:51:52 -0400 Subject: [PATCH 162/190] pythonPackages.suds: refactor move to python-modules --- .../python-modules/suds/default.nix | 29 +++++++++++++++++++ .../{ => suds}/suds-0.4-CVE-2013-2217.patch | 0 pkgs/top-level/python-packages.nix | 22 +------------- 3 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/suds/default.nix rename pkgs/development/python-modules/{ => suds}/suds-0.4-CVE-2013-2217.patch (100%) diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix new file mode 100644 index 00000000000..c4a8e480ed4 --- /dev/null +++ b/pkgs/development/python-modules/suds/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "suds"; + version = "0.4"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1w4s9051iv90c0gs73k80c3d51y2wbx1xgfdgg2hk7mv4gjlllnm"; + }; + + patches = [ ./suds-0.4-CVE-2013-2217.patch ]; + + meta = with stdenv.lib; { + # Broken for security issues: + # - https://github.com/NixOS/nixpkgs/issues/19678 + # - https://lwn.net/Vulnerabilities/559200/ + broken = true; + description = "Lightweight SOAP client"; + homepage = https://fedorahosted.org/suds; + license = licenses.lgpl3Plus; + }; + +} diff --git a/pkgs/development/python-modules/suds-0.4-CVE-2013-2217.patch b/pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch similarity index 100% rename from pkgs/development/python-modules/suds-0.4-CVE-2013-2217.patch rename to pkgs/development/python-modules/suds/suds-0.4-CVE-2013-2217.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68df3ed5da0..9250789462d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4463,27 +4463,7 @@ in { pafy = callPackage ../development/python-modules/pafy { }; - suds = buildPythonPackage rec { - name = "suds-0.4"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/suds/suds-0.4.tar.gz"; - sha256 = "1w4s9051iv90c0gs73k80c3d51y2wbx1xgfdgg2hk7mv4gjlllnm"; - }; - - patches = [ ../development/python-modules/suds-0.4-CVE-2013-2217.patch ]; - - meta = with stdenv.lib; { - # Broken for security issues: - # - https://github.com/NixOS/nixpkgs/issues/19678 - # - https://lwn.net/Vulnerabilities/559200/ - broken = true; - description = "Lightweight SOAP client"; - homepage = https://fedorahosted.org/suds; - license = licenses.lgpl3Plus; - }; - }; + suds = callPackage ../development/python-modules/suds { }; suds-jurko = buildPythonPackage rec { name = "suds-jurko-${version}"; From 1a3bfa1941fc251213828a3b7ae2382bc11e6812 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:54:19 -0400 Subject: [PATCH 163/190] pythonPackages.suds-jurko: refactor move to python-modules --- .../python-modules/suds-jurko/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/suds-jurko/default.nix diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix new file mode 100644 index 00000000000..5c04c5bd5d3 --- /dev/null +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, isPyPy +}: + +buildPythonPackage rec { + pname = "suds-jurko"; + version = "0.6"; + disabled = isPyPy; # lots of failures + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; + }; + + buildInputs = [ pytest ]; + + preBuild = '' + # fails + substituteInPlace tests/test_transport_http.py \ + --replace "test_sending_unicode_data" "noop" + ''; + + meta = with stdenv.lib; { + description = "Lightweight SOAP client (Jurko's fork)"; + homepage = https://bitbucket.org/jurko/suds; + license = licenses.lgpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9250789462d..1cf038accb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4465,29 +4465,7 @@ in { suds = callPackage ../development/python-modules/suds { }; - suds-jurko = buildPythonPackage rec { - name = "suds-jurko-${version}"; - version = "0.6"; - disabled = isPyPy; # lots of failures - - src = pkgs.fetchurl { - url = "mirror://pypi/s/suds-jurko/${name}.zip"; - sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; - }; - - buildInputs = [ self.pytest ]; - - preBuild = '' - # fails - substituteInPlace tests/test_transport_http.py \ - --replace "test_sending_unicode_data" "noop" - ''; - - meta = with stdenv.lib; { - description = "Lightweight SOAP client (Jurko's fork)"; - homepage = https://bitbucket.org/jurko/suds; - }; - }; + suds-jurko = callPackage ../development/python-modules/suds-jurko { }; mailcap-fix = buildPythonPackage rec { name = "mailcap-fix-${version}"; From 74a6022c91ff2032b24eedf4b6808e8ed7866267 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:55:40 -0400 Subject: [PATCH 164/190] pythonPackages.mailcap-fix: refactor move to python-modules --- .../python-modules/mailcap-fix/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/mailcap-fix/default.nix diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix new file mode 100644 index 00000000000..886a3ed66b3 --- /dev/null +++ b/pkgs/development/python-modules/mailcap-fix/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy36 +}: + +buildPythonPackage rec { + pname = "mailcap-fix"; + version = "1.0.1"; + disabled = isPy36; # this fix is merged into python 3.6 + + src = fetchPypi { + inherit pname version; + sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i"; + }; + + meta = with stdenv.lib; { + description = "A patched mailcap module that conforms to RFC 1524"; + homepage = "https://github.com/michael-lazar/mailcap_fix"; + license = licenses.unlicense; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cf038accb6..64a0bf0414b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4467,23 +4467,7 @@ in { suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - mailcap-fix = buildPythonPackage rec { - name = "mailcap-fix-${version}"; - version = "1.0.1"; - - disabled = isPy36; # this fix is merged into python 3.6 - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mailcap-fix/${name}.tar.gz"; - sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i"; - }; - - meta = with stdenv.lib; { - description = "A patched mailcap module that conforms to RFC 1524"; - homepage = "https://github.com/michael-lazar/mailcap_fix"; - license = licenses.unlicense; - }; - }; + mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; maildir-deduplicate = buildPythonPackage rec { name = "maildir-deduplicate-${version}"; From 1024394c664e8dfb21adad89052c07470113ea62 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:57:17 -0400 Subject: [PATCH 165/190] pythonPackages.maildir-deduplicate: refactor move to python-modules --- .../maildir-deduplicate/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/maildir-deduplicate/default.nix diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/pkgs/development/python-modules/maildir-deduplicate/default.nix new file mode 100644 index 00000000000..a0a4e52ea27 --- /dev/null +++ b/pkgs/development/python-modules/maildir-deduplicate/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, click +}: + +buildPythonPackage rec { + pname = "maildir-deduplicate"; + version = "1.0.2"; + disabled = !isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9"; + }; + + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + description = "Command-line tool to deduplicate mails from a set of maildir folders"; + homepage = "https://github.com/kdeldycke/maildir-deduplicate"; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64a0bf0414b..e8f3c5eb910 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4469,26 +4469,7 @@ in { mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; - maildir-deduplicate = buildPythonPackage rec { - name = "maildir-deduplicate-${version}"; - version = "1.0.2"; - - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/maildir-deduplicate/${name}.tar.gz"; - sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9"; - }; - - propagatedBuildInputs = with self; [ click ]; - - meta = with stdenv.lib; { - description = "Command-line tool to deduplicate mails from a set of maildir folders"; - homepage = "https://github.com/kdeldycke/maildir-deduplicate"; - license = licenses.gpl2; - }; - }; - + maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; mps-youtube = buildPythonPackage rec { name = "mps-youtube-${version}"; From 42960fb742d939c37be1fdd14d69ad51d0a852e3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 14:59:01 -0400 Subject: [PATCH 166/190] pythonPackages.mps-youtube: refactor move to python-modules --- .../python-modules/mps-youtube/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +--------------- 2 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/mps-youtube/default.nix diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/development/python-modules/mps-youtube/default.nix new file mode 100644 index 00000000000..4a3ff00f835 --- /dev/null +++ b/pkgs/development/python-modules/mps-youtube/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pafy +}: + +buildPythonPackage rec { + name = "mps-youtube-${version}"; + version = "0.2.7.1"; + disabled = (!isPy3k); + + src = fetchFromGitHub { + owner = "mps-youtube"; + repo = "mps-youtube"; + rev = "v${version}"; + sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys"; + }; + + propagatedBuildInputs = [ pafy ]; + + # disabled due to error in loading unittest + # don't know how to make test from: + doCheck = false; + + # before check create a directory and redirect XDG_CONFIG_HOME to it + preCheck = '' + mkdir -p check-phase + export XDG_CONFIG_HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + description = "Terminal based YouTube player and downloader"; + homepage = https://github.com/np1/mps-youtube; + license = licenses.gpl3; + maintainers = with maintainers; [ odi ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8f3c5eb910..cd1c3999205 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4471,38 +4471,7 @@ in { maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; - mps-youtube = buildPythonPackage rec { - name = "mps-youtube-${version}"; - version = "0.2.7.1"; - - disabled = (!isPy3k); - - # disabled due to error in loading unittest - # don't know how to make test from: - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - src = pkgs.fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "v${version}"; - sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys"; - }; - - propagatedBuildInputs = with self; [ pafy ]; - - meta = with stdenv.lib; { - description = "Terminal based YouTube player and downloader"; - homepage = https://github.com/np1/mps-youtube; - license = licenses.gpl3; - maintainers = with maintainers; [ odi ]; - }; - }; + mps-youtube = callPackage ../development/python-modules/mps-youtube { }; d2to1 = callPackage ../development/python-modules/d2to1 { }; From f5ac53a2b55e3d75ce3f2170c9412668aa7d1b84 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:00:41 -0400 Subject: [PATCH 167/190] pythonPackage.willow: refactor move to python-modules --- .../python-modules/willow/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/willow/default.nix diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix new file mode 100644 index 00000000000..88e6838cf93 --- /dev/null +++ b/pkgs/development/python-modules/willow/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, six +, pillow +}: + +buildPythonPackage rec { + pname = "willow"; + version = "0.2.2"; + disabled = pythonOlder "2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "111c82fbfcda2710ce6201b0b7e0cfa1ff3c4f2f0dc788cc8dfc8db933c39c73"; + }; + + propagatedBuildInputs = [ six pillow ]; + + # Test data is not included + # https://github.com/torchbox/Willow/issues/34 + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; + homepage = https://github.com/torchbox/Willow/; + license = licenses.bsd2; + maintainers = with maintainers; [ desiderius ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd1c3999205..ebaa54a5049 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4477,29 +4477,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - willow = buildPythonPackage rec { - name = "willow-${version}"; - version = "0.2.2"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/Willow/Willow-${version}.tar.gz"; - sha256 = "111c82fbfcda2710ce6201b0b7e0cfa1ff3c4f2f0dc788cc8dfc8db933c39c73"; - }; - - propagatedBuildInputs = with self; [ six pillow ]; - - # Test data is not included - # https://github.com/torchbox/Willow/issues/34 - doCheck = false; - - meta = { - description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; - homepage = https://github.com/torchbox/Willow/; - license = licenses.bsd2; - maintainers = with maintainers; [ desiderius ]; - }; - }; + willow = callPackage ../development/python-modules/willow { }; importmagic = buildPythonPackage rec { simpleName = "importmagic"; From a80b2e35432cd1ee798fc9e02a18fda62b01d270 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:02:22 -0400 Subject: [PATCH 168/190] pythonPackages.importmagic: refactor move to python-modules --- .../python-modules/importmagic/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/importmagic/default.nix diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix new file mode 100644 index 00000000000..c708343818f --- /dev/null +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "importmagic"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj"; + }; + + propagatedBuildInputs = [ six ]; + + doCheck = false; # missing json file from tarball + + meta = with stdenv.lib; { + description = "Python Import Magic - automagically add, remove and manage imports"; + homepage = https://github.com/alecthomas/importmagic; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebaa54a5049..ca57d9371fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4479,25 +4479,7 @@ in { willow = callPackage ../development/python-modules/willow { }; - importmagic = buildPythonPackage rec { - simpleName = "importmagic"; - name = "${simpleName}-${version}"; - version = "0.1.3"; - doCheck = false; # missing json file from tarball - - src = pkgs.fetchurl { - url = "mirror://pypi/i/${simpleName}/${name}.tar.gz"; - sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj"; - }; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Python Import Magic - automagically add, remove and manage imports"; - homepage = https://github.com/alecthomas/importmagic; - license = "bsd"; - }; - }; + importmagic = callPackage ../development/python-modules/importmagic { }; xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; From 82878eaade2cb9f4c6979b51edbf82a6b46c3731 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:03:54 -0400 Subject: [PATCH 169/190] pythonPackages.xkcdpass: refactor move to python-modules --- .../python-modules/xkcdpass/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/xkcdpass/default.nix diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix new file mode 100644 index 00000000000..d191ab85928 --- /dev/null +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "xkcdpass"; + version = "1.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c1f8bee886820c42ccc64c15c3a2275dc6d01028cf6af7c481ded87267d8269"; + }; + + # No tests included + # https://github.com/redacted/XKCD-password-generator/issues/32 + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/xkcdpass/; + description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca57d9371fd..eb826e61a13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4485,25 +4485,7 @@ in { xgboost = pkgs.xgboost; }; - xkcdpass = buildPythonPackage rec { - name = "xkcdpass-${version}"; - version = "1.4.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/x/xkcdpass/xkcdpass-1.4.2.tar.gz"; - sha256 = "4c1f8bee886820c42ccc64c15c3a2275dc6d01028cf6af7c481ded87267d8269"; - }; - - # No tests included - # https://github.com/redacted/XKCD-password-generator/issues/32 - doCheck = false; - - meta = { - homepage = https://pypi.python.org/pypi/xkcdpass/; - description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; - license = licenses.bsd3; - maintainers = [ ]; - }; - }; + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; xlsx2csv = buildPythonPackage rec { name = "xlsx2csv-${version}"; From 6ca3651766ac0aa33d08af90cb848474cf738320 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:05:19 -0400 Subject: [PATCH 170/190] pythonPackages.xlsx2csv: refactor move to python-modules --- .../python-modules/xlsx2csv/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/xlsx2csv/default.nix diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix new file mode 100644 index 00000000000..d38506f185f --- /dev/null +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "xlsx2csv"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/bitprophet/alabaster; + description = "Convert xlsx to csv"; + license = licenses.bsd3; + maintainers = with maintainers; [ jb55 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb826e61a13..b2b415d0b22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4487,20 +4487,7 @@ in { xkcdpass = callPackage ../development/python-modules/xkcdpass { }; - xlsx2csv = buildPythonPackage rec { - name = "xlsx2csv-${version}"; - version = "0.7.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/x/xlsx2csv/${name}.tar.gz"; - sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866"; - }; - meta = { - homepage = https://github.com/bitprophet/alabaster; - description = "Convert xlsx to csv"; - license = licenses.bsd3; - maintainers = with maintainers; [ jb55 ]; - }; - }; + xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; xmpppy = callPackage ../development/python-modules/xmpppy {}; From 0851a181f010641304c357b716d0074dbde1a789 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:07:01 -0400 Subject: [PATCH 171/190] pythonPackages.trezor_agent: refactor move to python-modules --- .../python-modules/trezor_agent/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/trezor_agent/default.nix diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix new file mode 100644 index 00000000000..baca97be877 --- /dev/null +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, trezor +, libagent +, ecdsa +, ed25519 +, mnemonic +, keepkey +, semver +}: + +buildPythonPackage rec{ + pname = "trezor_agent"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz"; + }; + + propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ]; + + meta = with stdenv.lib; { + description = "Using Trezor as hardware SSH agent"; + homepage = https://github.com/romanz/trezor-agent; + license = licenses.gpl3; + maintainers = with maintainers; [ np ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2b415d0b22..76cbccdbbe5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4529,28 +4529,7 @@ in { trezor = callPackage ../development/python-modules/trezor { }; - trezor_agent = buildPythonPackage rec{ - name = "${pname}-${version}"; - pname = "trezor_agent"; - version = "0.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz"; - }; - - propagatedBuildInputs = with self; [ - trezor libagent ecdsa ed25519 - mnemonic keepkey semver - ]; - - meta = { - description = "Using Trezor as hardware SSH agent"; - homepage = https://github.com/romanz/trezor-agent; - license = licenses.gpl3; - maintainers = with maintainers; [ np ]; - }; - }; + trezor_agent = callPackage ../development/python-modules/trezor_agent { }; x11_hash = buildPythonPackage rec{ version = "1.4"; From b794f354415ffefac07026ec7aa97f649308b55a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:08:17 -0400 Subject: [PATCH 172/190] pythonPackages.x11_hash: refactor move to python-modules --- .../python-modules/x11_hash/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------- 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/x11_hash/default.nix diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix new file mode 100644 index 00000000000..060d08869b8 --- /dev/null +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec{ + version = "1.4"; + pname = "x11_hash"; + + src = fetchPypi { + inherit pname version; + sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22"; + }; + + meta = with stdenv.lib; { + description = "Binding for X11 proof of work hashing"; + homepage = https://github.com/mazaclub/x11_hash; + license = licenses.mit; + maintainers = with maintainers; [ np ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76cbccdbbe5..73b0a7e6680 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4531,22 +4531,7 @@ in { trezor_agent = callPackage ../development/python-modules/trezor_agent { }; - x11_hash = buildPythonPackage rec{ - version = "1.4"; - name = "x11_hash-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/x/x11_hash/${name}.tar.gz"; - sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22"; - }; - - meta = { - description = "Binding for X11 proof of work hashing"; - homepage = https://github.com/mazaclub/x11_hash; - license = licenses.mit; - maintainers = with maintainers; [ np ]; - }; - }; + x11_hash = callPackage ../development/python-modules/x11_hash { }; termstyle = callPackage ../development/python-modules/termstyle { }; From 3ae4a36ae3a6771d60de39cd9c5b93b9fc0aeba0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 16:52:14 -0400 Subject: [PATCH 173/190] pythonPackages.w3lib: refactor move to python-modules --- .../python-modules/w3lib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/w3lib/default.nix diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix new file mode 100644 index 00000000000..3b18b488719 --- /dev/null +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, pytest +}: + +buildPythonPackage rec { + pname = "w3lib"; + version = "1.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq"; + }; + + buildInputs = [ six pytest ]; + + meta = with stdenv.lib; { + description = "A library of web-related functions"; + homepage = "https://github.com/scrapy/w3lib"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73b0a7e6680..ef404d8a293 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4539,24 +4539,7 @@ in { topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - w3lib = buildPythonPackage rec { - name = "w3lib-${version}"; - version = "1.17.0"; - - buildInputs = with self ; [ six pytest ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/w3lib/${name}.tar.gz"; - sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq"; - }; - - meta = { - description = "A library of web-related functions"; - homepage = "https://github.com/scrapy/w3lib"; - license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; - }; - }; + w3lib = callPackage ../development/python-modules/w3lib { }; queuelib = buildPythonPackage rec { name = "queuelib-${version}"; From 89623a675e7a607e5aa99e56d642d5fe4973c4cb Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 16:53:41 -0400 Subject: [PATCH 174/190] pythonPackages.queuelib: refactor move to python-modules --- .../python-modules/queuelib/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/queuelib/default.nix diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix new file mode 100644 index 00000000000..e80235bcdad --- /dev/null +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "queuelib"; + version = "1.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914"; + }; + + buildInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "A collection of persistent (disk-based) queues for Python"; + homepage = "https://github.com/scrapy/queuelib"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef404d8a293..bf5537f858b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4541,24 +4541,7 @@ in { w3lib = callPackage ../development/python-modules/w3lib { }; - queuelib = buildPythonPackage rec { - name = "queuelib-${version}"; - version = "1.4.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/queuelib/${name}.tar.gz"; - sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914"; - }; - - buildInputs = with self ; [ pytest ]; - - meta = { - description = "A collection of persistent (disk-based) queues for Python"; - homepage = "https://github.com/scrapy/queuelib"; - license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; - }; - }; + queuelib = callPackage ../development/python-modules/queuelib { }; scrapy = callPackage ../development/python-modules/scrapy { }; From f310c74cfd1113d1bda1bcecf0a41ec6d064cdb4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 16:55:03 -0400 Subject: [PATCH 175/190] pythonPackages.pandocfilters: refactor move to python-modules --- .../python-modules/pandocfilters/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pandocfilters/default.nix diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix new file mode 100644 index 00000000000..b3a815e997c --- /dev/null +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec{ + version = "1.4.1"; + pname = "pandocfilters"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; + }; + + # No tests available + doCheck = false; + + meta = with stdenv.lib; { + description = "A python module for writing pandoc filters, with a collection of examples"; + homepage = https://github.com/jgm/pandocfilters; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf5537f858b..f7e27e39b89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4545,25 +4545,7 @@ in { scrapy = callPackage ../development/python-modules/scrapy { }; - pandocfilters = buildPythonPackage rec{ - version = "1.4.1"; - pname = "pandocfilters"; - name = pname + "-${version}"; - - src = fetchPypi{ - inherit pname version; - sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; - }; - # No tests available - doCheck = false; - - meta = { - description = "A python module for writing pandoc filters, with a collection of examples"; - homepage = https://github.com/jgm/pandocfilters; - license = licenses.mit; - maintainers = with maintainers; []; - }; - }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; htmltreediff = callPackage ../development/python-modules/htmltreediff { }; From 8e222182204681548ca3654a753ab42c1ea59e0d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 16:56:42 -0400 Subject: [PATCH 176/190] pythonPAckages.repeated_test: refactor move to python-modules --- .../python-modules/repeated_test/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/repeated_test/default.nix diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix new file mode 100644 index 00000000000..5722a858fae --- /dev/null +++ b/pkgs/development/python-modules/repeated_test/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, unittest2 +, six +}: + +buildPythonPackage rec { + pname = "repeated_test"; + version = "0.1a3"; + + src = fetchPypi { + inherit pname version; + sha256 = "062syp7kl2g0x6qx3z8zb5sdycpi7qcpxp9iml2v8dqzqnij9bpg"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; + homepage = "https://github.com/epsy/repeated_test"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7e27e39b89..3683006e18d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4549,28 +4549,7 @@ in { htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - repeated_test = buildPythonPackage rec { - name = "repeated_test-${version}"; - version = "0.1a3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/repeated-test/${name}.tar.gz"; - sha256 = "062syp7kl2g0x6qx3z8zb5sdycpi7qcpxp9iml2v8dqzqnij9bpg"; - }; - - buildInputs = with self; [ - unittest2 - ]; - propagatedBuildInputs = with self; [ - six - ]; - - meta = { - description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; - homepage = "https://github.com/epsy/repeated_test"; - license = licenses.mit; - }; - }; + repeated_test = callPackage ../development/python-modules/repeated_test { }; Keras = callPackage ../development/python-modules/keras { }; From b1dbddd58494a176f821b9da23e6982d4ee5eac4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:02:30 -0400 Subject: [PATCH 177/190] pythonPackages.Lasagne: refactor move to python-modules --- .../python-modules/lasagne/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +--------------- 2 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/lasagne/default.nix diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix new file mode 100644 index 00000000000..febd38acc63 --- /dev/null +++ b/pkgs/development/python-modules/lasagne/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, Theano +, isPy3k +}: + +buildPythonPackage rec { + pname = "Lasagne"; + version = "0.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0cqj86rdm6c7y5vq3i13qy76fg5xi3yjp4r0hpqy8hvynv54wqrw"; + }; + + propagatedBuildInputs = [ numpy Theano ]; + + # there are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Lightweight library to build and train neural networks in Theano"; + homepage = "https://github.com/Lasagne/Lasagne"; + maintainers = with maintainers; [ NikolaMandic ]; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3683006e18d..f4315c98a4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4557,31 +4557,7 @@ in { keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - Lasagne = buildPythonPackage rec { - name = "Lasagne-${version}"; - version = "0.1"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lasagne/${name}.tar.gz"; - sha256 = "0cqj86rdm6c7y5vq3i13qy76fg5xi3yjp4r0hpqy8hvynv54wqrw"; - }; - - propagatedBuildInputs = with self; [ - numpy - Theano - ]; - - # there are no tests - doCheck = false; - - meta = { - description = "Lightweight library to build and train neural networks in Theano"; - homepage = "https://github.com/Lasagne/Lasagne"; - maintainers = with maintainers; [ NikolaMandic ]; - license = licenses.mit; - }; - }; + Lasagne = callPackage ../development/python-modules/lasagne { }; send2trash = callPackage ../development/python-modules/send2trash { }; From b42e1d1b1eaf97e686f734a7225fbb5e3b20d556 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:05:49 -0400 Subject: [PATCH 178/190] pythonPackages.sigtools: refactor move to python-modules --- .../python-modules/sigtools/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +---------------- 2 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/sigtools/default.nix diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix new file mode 100644 index 00000000000..88bddacbe05 --- /dev/null +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, repeated_test +, sphinx +, mock +, coverage +, unittest2 +, funcsigs +, six +}: + +buildPythonPackage rec { + pname = "sigtools"; + version = "1.1a3"; + + src = fetchPypi { + inherit pname version; + sha256 = "190w14vzbiyvxcl9jmyyimpahar5b0bq69v9iv7chi852yi71w6w"; + }; + + buildInputs = [ repeated_test sphinx mock coverage unittest2 ]; + propagatedBuildInputs = [ funcsigs six ]; + + patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; + + meta = with stdenv.lib; { + description = "Utilities for working with 3.3's inspect.Signature objects."; + homepage = "https://pypi.python.org/pypi/sigtools"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4315c98a4c..27cab50751a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4561,35 +4561,7 @@ in { send2trash = callPackage ../development/python-modules/send2trash { }; - sigtools = buildPythonPackage rec { - name = "sigtools-${version}"; - version = "1.1a3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sigtools/${name}.tar.gz"; - sha256 = "190w14vzbiyvxcl9jmyyimpahar5b0bq69v9iv7chi852yi71w6w"; - }; - - buildInputs = with self; [ - repeated_test - sphinx - mock - coverage - unittest2 - ]; - propagatedBuildInputs = with self; [ - funcsigs - six - ]; - - patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; - - meta = { - description = "Utilities for working with 3.3's inspect.Signature objects."; - homepage = "https://pypi.python.org/pypi/sigtools"; - license = licenses.mit; - }; - }; + sigtools = callPackage ../development/python-modules/sigtools { }; clize = buildPythonPackage rec { name = "clize-${version}"; From 19a50012dc813d1e346b18dce77b2ba4e26c47b5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:07:48 -0400 Subject: [PATCH 179/190] pythonPackages.clize: refactor move to python-modules --- .../python-modules/clize/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/clize/default.nix diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix new file mode 100644 index 00000000000..8456f8d473b --- /dev/null +++ b/pkgs/development/python-modules/clize/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, dateutil +, sigtools +}: + +buildPythonPackage rec { + pname = "clize"; + version = "3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm"; + }; + + buildInputs = [ dateutil ]; + propagatedBuildInputs = [ sigtools ]; + + meta = with stdenv.lib; { + description = "Command-line argument parsing for Python"; + homepage = "https://github.com/epsy/clize"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27cab50751a..0d8bada4f73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4563,28 +4563,7 @@ in { sigtools = callPackage ../development/python-modules/sigtools { }; - clize = buildPythonPackage rec { - name = "clize-${version}"; - version = "3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/clize/${name}.tar.gz"; - sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm"; - }; - - buildInputs = with self; [ - dateutil - ]; - propagatedBuildInputs = with self; [ - sigtools - ]; - - meta = { - description = "Command-line argument parsing for Python"; - homepage = "https://github.com/epsy/clize"; - license = licenses.mit; - }; - }; + clize = callPackage ../development/python-modules/clize { }; zerobin = buildPythonPackage rec { name = "zerobin-${version}"; From 1a4f32c3f7207f725e825261a562b289c273dcc1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:12:21 -0400 Subject: [PATCH 180/190] pythonPackages.zerobin: refactor move to python-modules --- .../python-modules/zerobin/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +-------------- 2 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/zerobin/default.nix diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix new file mode 100644 index 00000000000..d1cab88b45b --- /dev/null +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cherrypy +, bottle +, lockfile +, clize +}: + +buildPythonPackage rec { + pname = "zerobin"; + version = "20160108"; + + src = fetchFromGitHub { + owner = "sametmax"; + repo = "0bin"; + rev = "7da1615"; + sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid"; + }; + + propagatedBuildInputs = [ cherrypy bottle lockfile clize ]; + + # zerobin doesn't have any tests, but includes a copy of cherrypy which + # can wrongly fail the check phase. + doCheck = false; + + meta = with stdenv.lib; { + description = "A client side encrypted pastebin"; + homepage = https://0bin.net/; + license = licenses.wtfpl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d8bada4f73..4698e15361d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4565,32 +4565,7 @@ in { clize = callPackage ../development/python-modules/clize { }; - zerobin = buildPythonPackage rec { - name = "zerobin-${version}"; - version = "20160108"; - - src = pkgs.fetchFromGitHub { - owner = "sametmax"; - repo = "0bin"; - rev = "7da1615"; - sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid"; - }; - - propagatedBuildInputs = with self; [ - cherrypy - bottle - lockfile - clize - ]; - # zerobin doesn't have any tests, but includes a copy of cherrypy which - # can wrongly fail the check phase. - doCheck = false; - meta = { - description = "A client side encrypted pastebin"; - homepage = https://0bin.net/; - license = licenses.wtfpl; - }; - }; + zerobin = callPackage ../development/python-modules/zerobin { }; tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; From f0e62b79fcdf6701c59c04395b8cafb6a8300e19 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:15:09 -0400 Subject: [PATCH 181/190] pythonPAckages.simpleai: refactor move to python-modules --- .../python-modules/simpleai/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------- 2 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/simpleai/default.nix diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix new file mode 100644 index 00000000000..3d4bdf3968f --- /dev/null +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, isPy3k +}: + +buildPythonPackage rec { + version = "0.7.11"; + pname = "simpleai"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "03frjc5jxsz9xm24jz7qa4hcp0dicgazrxkdsa2rsnir672lwkwz"; + }; + + propagatedBuildInputs = [ numpy ]; + + #No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/simpleai-team/simpleai; + description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'"; + maintainers = with maintainers; [ NikolaMandic ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4698e15361d..ab1b1fc04d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4589,28 +4589,7 @@ in { tflearn = callPackage ../development/python-modules/tflearn { }; - simpleai = buildPythonPackage rec { - version = "0.7.11"; - name = "simpleai-${version}"; - - src = pkgs.fetchurl { - url= "https://pypi.python.org/packages/source/s/simpleai/${name}.tar.gz"; - sha256 = "03frjc5jxsz9xm24jz7qa4hcp0dicgazrxkdsa2rsnir672lwkwz"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - - disabled = isPy3k; - - #No tests in archive - doCheck = false; - - meta = { - homepage = https://github.com/simpleai-team/simpleai; - description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'"; - maintainers = with maintainers; [ NikolaMandic ]; - }; - }; + simpleai = callPackage ../development/python-modules/simpleai { }; word2vec = buildPythonPackage rec { name = "word2vec-${version}"; From 173793c63f65cb1d2b602b241d0d8b6886228eee Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:17:56 -0400 Subject: [PATCH 182/190] pythonPackages.word2vec: refactor move to python-modules --- .../python-modules/word2vec/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/word2vec/default.nix diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix new file mode 100644 index 00000000000..d3c294308c4 --- /dev/null +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, numpy +, python +}: + +buildPythonPackage rec { + pname = "word2vec"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a811e3e98a8e6dfe7bc851ebbbc2d6e5ab5142f2a134dd3c03daac997b546faa"; + }; + + propagatedBuildInputs = [ cython numpy ]; + + checkPhase = '' + cd word2vec/tests; + ${python.interpreter} test_word2vec.py + ''; + + meta = with stdenv.lib; { + description = "Tool for computing continuous distributed representations of words"; + homepage = "https://github.com/danielfrg/word2vec"; + license = licenses.asl20; + maintainers = with maintainers; [ NikolaMandic ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab1b1fc04d6..6879d5d5330 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4591,29 +4591,7 @@ in { simpleai = callPackage ../development/python-modules/simpleai { }; - word2vec = buildPythonPackage rec { - name = "word2vec-${version}"; - version = "0.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/word2vec/${name}.tar.gz"; - sha256 = "a811e3e98a8e6dfe7bc851ebbbc2d6e5ab5142f2a134dd3c03daac997b546faa"; - }; - - propagatedBuildInputs = with self; [ cython numpy ]; - - checkPhase = '' - cd word2vec/tests; - ${python.interpreter} test_word2vec.py - ''; - - meta = { - description = "Tool for computing continuous distributed representations of words"; - homepage = "https://github.com/danielfrg/word2vec"; - license = licenses.asl20; - maintainers = with maintainers; [ NikolaMandic ]; - }; - }; + word2vec = callPackage ../development/python-modules/word2vec { }; tvdb_api = buildPythonPackage rec { name = "tvdb_api-${version}"; From 97b2d6790a89c77844e1114e5cc5fcbfb0f5ca39 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:20:17 -0400 Subject: [PATCH 183/190] pythonPAckages.tvdb_api: refactor move to python-modules --- .../python-modules/tvdb_api/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/tvdb_api/default.nix diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix new file mode 100644 index 00000000000..758c699d446 --- /dev/null +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests-cache +}: + +buildPythonPackage rec { + pname = "tvdb_api"; + version = "1.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hq887yb3rwc0rcw32lh7xdkk9bbrqy274aspzqkd6f7dyhp73ih"; + }; + + propagatedBuildInputs = [ requests-cache ]; + + meta = with stdenv.lib; { + description = "Simple to use TVDB (thetvdb.com) API in Python."; + homepage = "https://github.com/dbr/tvdb_api"; + license = licenses.unlicense; + maintainers = with maintainers; [ peterhoeg ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6879d5d5330..5c68310b67c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4593,24 +4593,7 @@ in { word2vec = callPackage ../development/python-modules/word2vec { }; - tvdb_api = buildPythonPackage rec { - name = "tvdb_api-${version}"; - version = "1.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tvdb_api/${name}.tar.gz"; - sha256 = "0hq887yb3rwc0rcw32lh7xdkk9bbrqy274aspzqkd6f7dyhp73ih"; - }; - - propagatedBuildInputs = with self; [ requests-cache ]; - - meta = { - description = "Simple to use TVDB (thetvdb.com) API in Python."; - homepage = "https://github.com/dbr/tvdb_api"; - license = licenses.unlicense; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = buildPythonPackage rec { name = "tvnamer-${version}"; From 6fd3323d26b05b88fa811b0d0540534addf23856 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:23:10 -0400 Subject: [PATCH 184/190] pythonPackages.tvnamer: refactor move to python-modules --- .../python-modules/tvnamer/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------- 2 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/tvnamer/default.nix diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix new file mode 100644 index 00000000000..172c4423920 --- /dev/null +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, tvdb_api +}: + +buildPythonPackage rec { + pname = "tvnamer"; + version = "2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "10iizmwna2xpyc2694hsrvny68y3bdq576p8kxsvg5gj2spnsxav"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ tvdb_api ]; + + # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. + doCheck = false; + + meta = with stdenv.lib; { + description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; + homepage = "https://github.com/dbr/tvnamer"; + license = licenses.unlicense; + maintainers = with maintainers; [ peterhoeg ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c68310b67c..057d74dc65e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4595,28 +4595,7 @@ in { tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - tvnamer = buildPythonPackage rec { - name = "tvnamer-${version}"; - version = "2.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tvnamer/${name}.tar.gz"; - sha256 = "10iizmwna2xpyc2694hsrvny68y3bdq576p8kxsvg5gj2spnsxav"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ tvdb_api ]; - - # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. - doCheck = false; - - meta = { - description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; - homepage = "https://github.com/dbr/tvnamer"; - license = licenses.unlicense; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; + tvnamer = callPackage ../development/python-modules/tvnamer { }; threadpool = buildPythonPackage rec { name = "threadpool-${version}"; From 6afd56f61a3d3227e7ba6eaa032f9c0f04e70d1c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:25:58 -0400 Subject: [PATCH 185/190] pythonPackages.threadpool: refactor move to python-modules --- .../python-modules/threadpool/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/threadpool/default.nix diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix new file mode 100644 index 00000000000..b3d7f58c66d --- /dev/null +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "threadpool"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "197gzrxn9lbk0q1v079814c6s05cr4rwzyl6c1m6inkyif4yzr6c"; + }; + + meta = with stdenv.lib; { + homepage = http://chrisarndt.de/projects/threadpool/; + description = "Easy to use object-oriented thread pool framework"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 057d74dc65e..8852bc68b22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4597,15 +4597,7 @@ in { tvnamer = callPackage ../development/python-modules/tvnamer { }; - threadpool = buildPythonPackage rec { - name = "threadpool-${version}"; - version = "1.3.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/threadpool/${name}.tar.bz2"; - sha256 = "197gzrxn9lbk0q1v079814c6s05cr4rwzyl6c1m6inkyif4yzr6c"; - }; - }; + threadpool = callPackage ../development/python-modules/threadpool { }; rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; From c0e09bef5a9903cebc47a8ed7fc74646110449ec Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:28:45 -0400 Subject: [PATCH 186/190] pythonPAckages.yapsy: refactor move to python-modules --- .../python-modules/yapsy/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +--------- 2 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/yapsy/default.nix diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix new file mode 100644 index 00000000000..1f4a28459be --- /dev/null +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "Yapsy"; + version = "1.11.223"; + + src = fetchPypi { + inherit pname version; + sha256 = "19pjsnqizswnczhlav4lb7zlzs0n73ijrsgksy4374b14jkkkfs5"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://yapsy.sourceforge.net/; + description = "Yet another plugin system"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8852bc68b22..cdc23eed626 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4601,17 +4601,7 @@ in { rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; - Yapsy = buildPythonPackage rec { - name = "Yapsy-${version}"; - version = "1.11.223"; - - src = pkgs.fetchurl { - url = "mirror://pypi/y/yapsy/${name}.tar.gz"; - sha256 = "19pjsnqizswnczhlav4lb7zlzs0n73ijrsgksy4374b14jkkkfs5"; - }; - - doCheck = false; - }; + Yapsy = callPackage ../development/python-modules/yapsy { }; ansi = callPackage ../development/python-modules/ansi { }; From a36ce69f6cac17eadc0aacc7d352900d6f9c8b57 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:32:31 -0400 Subject: [PATCH 187/190] pythonPAckages.pygments-markdown-lexer: refactor move to python-modules --- .../pygments-markdown-lexer/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +--------- 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/pygments-markdown-lexer/default.nix diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix new file mode 100644 index 00000000000..65688cf17bb --- /dev/null +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pygments +}: + +buildPythonPackage rec { + pname = "pygments-markdown-lexer"; + version = "0.1.0.dev39"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc"; + }; + + propagatedBuildInputs = [ pygments ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/jhermann/pygments-markdown-lexer; + description = "Pygments Markdown Lexer – A Markdown lexer for Pygments to highlight Markdown code snippets"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdc23eed626..8addb60f5df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4605,19 +4605,7 @@ in { ansi = callPackage ../development/python-modules/ansi { }; - pygments-markdown-lexer = buildPythonPackage rec { - name = "pygments-markdown-lexer-${version}"; - version = "0.1.0.dev39"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pygments-markdown-lexer/${name}.zip"; - sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc"; - }; - - doCheck = false; - - propagatedBuildInputs = with self; [ pygments ]; - }; + pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; telegram = buildPythonPackage rec { name = "telegram-${version}"; From f54484f5273cf28615d0eb53951350b33877de0b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:34:54 -0400 Subject: [PATCH 188/190] pythonPackages.telegram: refactor move to python-modules --- .../python-modules/telegram/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/telegram/default.nix diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix new file mode 100644 index 00000000000..df45aaaee3b --- /dev/null +++ b/pkgs/development/python-modules/telegram/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "telegram"; + version = "0.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/liluo/telegram; + description = "Telegram APIs"; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8addb60f5df..008001d3a6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4607,15 +4607,7 @@ in { pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; - telegram = buildPythonPackage rec { - name = "telegram-${version}"; - version = "0.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/telegram/${name}.tar.gz"; - sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl"; - }; - }; + telegram = callPackage ../development/python-modules/telegram { }; python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; From c33c576212b13e64a5d1536f4ec063651b7a4d2d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:38:11 -0400 Subject: [PATCH 189/190] pythonPackages.pivy: refactor move to python-modules --- .../python-modules/pivy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +-------- 2 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/pivy/default.nix diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix new file mode 100644 index 00000000000..ee02f2cb5d2 --- /dev/null +++ b/pkgs/development/python-modules/pivy/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchhg +, pkgs +, isPy3k +}: + +buildPythonPackage rec { + version = "20101207"; + pname = "pivy"; + disabled = isPy3k; # Judging from SyntaxError + + src = fetchhg { + url = "https://bitbucket.org/Coin3D/pivy"; + rev = "8eab90908f2a3adcc414347566f4434636202344"; + sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; + }; + + buildInputs = [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.libGLU_combined pkgs.xorg.libXi ]; + + meta = with stdenv.lib; { + homepage = http://pivy.coin3d.org/; + description = "A Python binding for Coin"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 008001d3a6e..6eb00ad092d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4635,17 +4635,7 @@ in { hypchat = callPackage ../development/python-modules/hypchat { }; - pivy = buildPythonPackage rec { - version = "20101207"; - name = "pivy-${version}"; - src = pkgs.fetchhg { - url = "https://bitbucket.org/Coin3D/pivy"; - rev = "8eab90908f2a3adcc414347566f4434636202344"; - sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; - }; - disabled = isPy3k; # Judging from SyntaxError - buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.libGLU_combined pkgs.xorg.libXi ]; - }; + pivy = callPackage ../development/python-modules/pivy { }; smugpy = callPackage ../development/python-modules/smugpy { }; From fa7d1d8bfb3bb67ae0a8a14bcc3eb9c7aa84f761 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:41:25 -0400 Subject: [PATCH 190/190] pythonPackages.smugline: refactor move to python-modules --- .../python-modules/smugline/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +----------- 2 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/smugline/default.nix diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix new file mode 100644 index 00000000000..ac625cf1fa0 --- /dev/null +++ b/pkgs/development/python-modules/smugline/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, docopt +, requests +, smugpy +, python +, pkgs +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "smugline"; + version = "20160106"; + + src = fetchFromGitHub { + owner = "gingerlime"; + repo = pname; + rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4"; + sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ python pkgs.makeWrapper ]; + propagatedBuildInputs = [ docopt requests smugpy ]; + + installPhase = '' + mkdir -p $out/bin $out/libexec + cp smugline.py $out/libexec + makeWrapper ${python.interpreter} $out/bin/smugline \ + --add-flags "$out/libexec/smugline.py" \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gingerlime/smugline; + description = "A simple command line tool for smugmug "; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6eb00ad092d..d7d6c8313f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4639,32 +4639,7 @@ in { smugpy = callPackage ../development/python-modules/smugpy { }; - smugline = stdenv.mkDerivation rec { - name = pname + "-" + version; - pname = "smugline"; - version = "20160106"; - - src = pkgs.fetchFromGitHub { - owner = "gingerlime"; - repo = pname; - rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4"; - sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - buildInputs = [ python pkgs.makeWrapper ]; - - propagatedBuildInputs = with self; [ docopt requests smugpy ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec - cp smugline.py $out/libexec - makeWrapper ${python.interpreter} $out/bin/smugline \ - --add-flags "$out/libexec/smugline.py" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - }; + smugline = callPackage ../development/python-modules/smugline { }; txaio = callPackage ../development/python-modules/txaio { };