diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 05f3fba8021c..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; - hash = "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" ]; 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 ]; }; 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 = [ 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 = [ 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 7ae0a96005d6..1287f8a34310 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11939,6 +11939,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 { };