From fb4e70b0dcba920df9075254a2a8282b0d30e335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Mar 2023 18:04:21 -0800 Subject: [PATCH 1/7] python310Packages.fritzconnection: 1.11.0 -> 1.12.0 Diff: https://github.com/kbr/fritzconnection/compare/refs/tags/1.11.0...1.12.0 Changelog: https://fritzconnection.readthedocs.io/en/1.12.0/sources/version_history.html --- .../python-modules/fritzconnection/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 79301cf60031..bdc0826ac87b 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA="; + hash = "sha256-1giXmmyuy+qrY6xV3yZn4kcDd6w6l8uCL4ozcZE4N00="; }; propagatedBuildInputs = [ @@ -28,6 +28,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$TEMP + ''; + pythonImportsCheck = [ "fritzconnection" ]; @@ -35,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; - changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html"; + changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/version_history.html"; license = licenses.mit; maintainers = with maintainers; [ dotlambda valodim ]; }; From 0397322d80da4a9ee117bde84b8de9e6cce88e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Mar 2023 18:38:44 -0800 Subject: [PATCH 2/7] python310Packages.txi2p-tahoe: init at 0.3.7 --- .../python-modules/txi2p-tahoe/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/txi2p-tahoe/default.nix diff --git a/pkgs/development/python-modules/txi2p-tahoe/default.nix b/pkgs/development/python-modules/txi2p-tahoe/default.nix new file mode 100644 index 000000000000..3d891c6eeed1 --- /dev/null +++ b/pkgs/development/python-modules/txi2p-tahoe/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, parsley +, twisted +, python +}: + +buildPythonPackage rec { + pname = "txi2p-tahoe"; + version = "0.3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tahoe-lafs"; + repo = "txi2p"; + rev = "refs/tags/${version}"; + hash = "sha256-u/IOhxK9jWC/tTKKLsc4PexbCuki+yEtMNw7LuQKmuk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + parsley + twisted + ]; + + pythonImportsCheck = [ "txi2p" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m twisted.trial txi2p + runHook postCheck + ''; + + meta = { + description = "I2P bindings for Twisted"; + homepage = "https://github.com/tahoe-lafs/txi2p"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2007572180c..7052148590b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11894,6 +11894,8 @@ self: super: with self; { txgithub = callPackage ../development/python-modules/txgithub { }; + txi2p-tahoe = callPackage ../development/python-modules/txi2p-tahoe { }; + txredisapi = callPackage ../development/python-modules/txredisapi { }; txrequests = callPackage ../development/python-modules/txrequests { }; From 3d3db646809dc690ea676a5ce2baeae7167eb0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 8 Mar 2023 18:08:56 -0800 Subject: [PATCH 3/7] python310Packages.foolscap: 21.7.0 -> 23.3.0 --- .../python-modules/foolscap/default.nix | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 771feb3215fe..2da82762195b 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -1,46 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , mock , pyopenssl , pytestCheckHook +, pythonOlder , service-identity +, six , twisted +, txi2p-tahoe +, txtorcon }: buildPythonPackage rec { pname = "foolscap"; - version = "21.7.0"; + version = "23.3.0"; + + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q="; + hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; }; - patches = [ - (fetchpatch { - name = "fix-tests-with-twisted-22.10.0.patch"; - url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch"; - hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc="; - }) - ]; - propagatedBuildInputs = [ - mock + six twisted pyopenssl - service-identity - ]; + ] ++ twisted.optional-dependencies.tls; + + passthru.optional-dependencies = { + i2p = [ txi2p-tahoe ]; + tor = [ txtorcon ]; + }; nativeCheckInputs = [ + mock pytestCheckHook - ]; - - disabledTestPaths = [ - # Not all dependencies are present - "src/foolscap/test/test_connection.py" - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "foolscap" ]; From 60cbfe9c8d4e5fed610e295b51ada9ae6b9aded9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 18:41:47 +0100 Subject: [PATCH 4/7] python310Packages.google-cloud-bigtable: 2.15.0 -> 2.17.0 Changelog: https://github.com/googleapis/python-bigtable/blob/v2.17.0/CHANGELOG.md --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index f92580db80b9..660dd96cfe8a 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.15.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao="; + hash = "sha256-wysLs0seCRDadYj9aRowebq6+kMi7RZp/DITC4lqsVY="; }; propagatedBuildInputs = [ From 36bc24f3fbb9fc988adf767755b08d499cc33282 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 18:42:15 +0100 Subject: [PATCH 5/7] python310Packages.google-cloud-kms: 2.13.0 -> 2.15.0 Changelog: https://github.com/googleapis/python-kms/blob/v2.15.0/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 27a2e9e067dc..250305eea254 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.13.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0nOQnibi1T0JW9NQaKSrNCnfB5EgsnNYMVCEiUsPRdU="; + hash = "sha256-/tm08lOWjQMjV1IVov8cX0EJsKjwxMQD2NIcJnoHdVc="; }; propagatedBuildInputs = [ From f729bf8839df59960dacf0c7da4e95f568fce910 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 18:43:38 +0100 Subject: [PATCH 6/7] python310Packages.google-cloud-redis: 2.11.1 -> 2.12.0 Changelog: https://github.com/googleapis/python-redis/blob/v2.12.0/CHANGELOG.md --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 248fcb7140b7..147407a428ab 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.11.1"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM="; + hash = "sha256-0uhWndF50vKVUk71DwoInQORAiR5vQyNMMA+T2p69W4="; }; propagatedBuildInputs = [ From fed0c5b51e6dbb1c460a8b302139a46dcdeba9aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 18:45:35 +0100 Subject: [PATCH 7/7] python310Packages.google-cloud-compute: 1.8.0 -> 1.10.1 Changelog: https://github.com/googleapis/python-compute/blob/v1.10.1/CHANGELOG.md --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 19910f1167c0..b0314d615a99 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.8.0"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pnhXkYSXph7aIZJoI3tXTNIUkH44S22QDIGXUl9ceFU="; + hash = "sha256-/iUUTtBxBmiDIczIRuwbr/SLTs2hYKXSAbufmjFtMDU="; }; propagatedBuildInputs = [