From 4ea19b77712ccc4e5c29b8b2b55943a0695d955b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Apr 2019 16:58:26 +0200 Subject: [PATCH 1/4] python.pkgs.zipp: init at 0.3.3 --- .../python-modules/zipp/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/zipp/default.nix diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix new file mode 100644 index 00000000000..2c060c9881c --- /dev/null +++ b/pkgs/development/python-modules/zipp/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-flake8 +}: + +buildPythonPackage rec { + pname = "zipp"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ pytest pytest-flake8 ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pathlib-compatible object wrapper for zip files"; + homepage = https://github.com/jaraco/zipp; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb1e2f5f15d..7db61041e3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4738,6 +4738,8 @@ in { zfec = callPackage ../development/python-modules/zfec { }; + zipp = callPackage ../development/python-modules/zipp { }; + zope_broken = callPackage ../development/python-modules/zope_broken { }; zope_component = callPackage ../development/python-modules/zope_component { }; From 6e4594f2ce72781132d740198e1cba37513f5058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Apr 2019 16:50:33 +0200 Subject: [PATCH 2/4] python.pkgs.importlib-metadata: 0.6 -> 0.8 --- .../importlib-metadata/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 55c835e75cc..046cfbad26b 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -1,29 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools_scm +, zipp , pathlib2 , contextlib2 +, configparser , isPy3k , importlib-resources +, packaging }: buildPythonPackage rec { pname = "importlib-metadata"; - version = "0.6"; + version = "0.8"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "36b02c84f9001adf65209fefdf951be8e9014a95eab9938c0779ad5670359b1c"; + sha256 = "b50191ead8c70adfa12495fba19ce6d75f2e0275c14c5a7beb653d6799b512bd"; }; - propagatedBuildInputs = [] ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ importlib-resources ]; + propagatedBuildInputs = [ zipp ] + ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; + + checkInputs = [ importlib-resources packaging ]; meta = with lib; { description = "Read metadata from Python packages"; homepage = https://importlib-metadata.readthedocs.io/; license = licenses.asl20; }; -} \ No newline at end of file +} From 389dfb628be0bef0e03155a55517d89905424317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Apr 2019 16:59:54 +0200 Subject: [PATCH 3/4] flexget: 2.17.20 -> 2.20.17 --- pkgs/applications/networking/flexget/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index b8af1541809..9afc61c3c0c 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,4 +1,4 @@ -{ lib, python36 }: +{ lib, python3 }: # Flexget have been a trouble maker in the past, # if you see flexget breaking when updating packages, don't worry. @@ -6,7 +6,7 @@ # -- Mic92 let - python' = python36.override { inherit packageOverrides; }; + python' = python3.override { inherit packageOverrides; }; packageOverrides = self: super: { guessit = super.guessit.overridePythonAttrs (old: rec { @@ -24,16 +24,14 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.17.20"; + version = "2.20.17"; src = fetchPypi { inherit pname version; - sha256 = "a09ef9482ed54f7e96eb8b4d08c59687c5c43a3341c9d2675383693e6c3681c3"; + sha256 = "ed021d8d5c10555dad8dc1cb93c012e17b541fc25fc122b7ca76bb7e53fe82b3"; }; postPatch = '' - # build for the correct python version - substituteInPlace setup.cfg --replace $'[bdist_wheel]\npython-tag = py27' "" # remove dependency constraints sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt ''; @@ -47,12 +45,13 @@ buildPythonApplication rec { beautifulsoup4 html5lib PyRSS2Gen pynzb rpyc jinja2 requests dateutil jsonschema - pathpy guessit APScheduler + pathpy guessit rebulk APScheduler terminaltables colorclass cherrypy flask flask-restful flask-restplus flask-compress flask_login flask-cors pyparsing zxcvbn-python future + progressbar # Optional requirements deluge-client # Plugins From c2fd8b347d4fd349627caef7d3b531ea68e80563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Apr 2019 17:18:36 +0200 Subject: [PATCH 4/4] python.pkgs.progressbar: works on python3 --- pkgs/development/python-modules/progressbar/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index a8e8bf07ad5..a68ecf59ad0 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -4,9 +4,6 @@ buildPythonPackage rec { pname = "progressbar"; version = "2.5"; - # https://github.com/niltonvolpato/python-progressbar/issues/54 - disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63";