Merge pull request #220259 from dotlambda/foolscap-23.3.0

python310Packages.foolscap: 21.7.0 -> 23.3.0

authored by Robert Scott and committed by GitHub 5106aa20 3eb3c94f

+71 -20
+19 -20
pkgs/development/python-modules/foolscap/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , fetchpatch 5 4 , mock 6 5 , pyopenssl 7 6 , pytestCheckHook 7 + , pythonOlder 8 8 , service-identity 9 + , six 9 10 , twisted 11 + , txi2p-tahoe 12 + , txtorcon 10 13 }: 11 14 12 15 buildPythonPackage rec { 13 16 pname = "foolscap"; 14 - version = "21.7.0"; 17 + version = "23.3.0"; 18 + 19 + disabled = pythonOlder "3.7"; 20 + 21 + format = "setuptools"; 15 22 16 23 src = fetchPypi { 17 24 inherit pname version; 18 - sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q="; 25 + hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU="; 19 26 }; 20 27 21 - patches = [ 22 - (fetchpatch { 23 - name = "fix-tests-with-twisted-22.10.0.patch"; 24 - url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch"; 25 - hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc="; 26 - }) 27 - ]; 28 - 29 28 propagatedBuildInputs = [ 30 - mock 29 + six 31 30 twisted 32 31 pyopenssl 33 - service-identity 34 - ]; 32 + ] ++ twisted.optional-dependencies.tls; 33 + 34 + passthru.optional-dependencies = { 35 + i2p = [ txi2p-tahoe ]; 36 + tor = [ txtorcon ]; 37 + }; 35 38 36 39 nativeCheckInputs = [ 40 + mock 37 41 pytestCheckHook 38 - ]; 39 - 40 - disabledTestPaths = [ 41 - # Not all dependencies are present 42 - "src/foolscap/test/test_connection.py" 43 - ]; 42 + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); 44 43 45 44 pythonImportsCheck = [ "foolscap" ]; 46 45
+50
pkgs/development/python-modules/txi2p-tahoe/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , setuptools 5 + , setuptools-scm 6 + , parsley 7 + , twisted 8 + , python 9 + }: 10 + 11 + buildPythonPackage rec { 12 + pname = "txi2p-tahoe"; 13 + version = "0.3.7"; 14 + 15 + format = "pyproject"; 16 + 17 + src = fetchFromGitHub { 18 + owner = "tahoe-lafs"; 19 + repo = "txi2p"; 20 + rev = "refs/tags/${version}"; 21 + hash = "sha256-u/IOhxK9jWC/tTKKLsc4PexbCuki+yEtMNw7LuQKmuk="; 22 + }; 23 + 24 + nativeBuildInputs = [ 25 + setuptools 26 + setuptools-scm 27 + ]; 28 + 29 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 30 + 31 + propagatedBuildInputs = [ 32 + parsley 33 + twisted 34 + ]; 35 + 36 + pythonImportsCheck = [ "txi2p" ]; 37 + 38 + checkPhase = '' 39 + runHook preCheck 40 + ${python.interpreter} -m twisted.trial txi2p 41 + runHook postCheck 42 + ''; 43 + 44 + meta = { 45 + description = "I2P bindings for Twisted"; 46 + homepage = "https://github.com/tahoe-lafs/txi2p"; 47 + license = lib.licenses.isc; 48 + maintainers = with lib.maintainers; [ dotlambda ]; 49 + }; 50 + }
+2
pkgs/top-level/python-packages.nix
··· 11910 11910 11911 11911 txgithub = callPackage ../development/python-modules/txgithub { }; 11912 11912 11913 + txi2p-tahoe = callPackage ../development/python-modules/txi2p-tahoe { }; 11914 + 11913 11915 txredisapi = callPackage ../development/python-modules/txredisapi { }; 11914 11916 11915 11917 txrequests = callPackage ../development/python-modules/txrequests { };