diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index d95fef43fad0..412009cc637a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -8,16 +8,17 @@ , geventhttpclient , git , glibcLocales +, gnupg , gpgme , mock -, pkgs , urllib3 , paramiko +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { - version = "0.20.45"; + version = "0.20.46"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cHEN2coqRCGQx+UGiS2wdMMYrHYuIh91KbjONIAgQbc="; + hash = "sha256-Tw6I//9dsVI9k9kvFSX+X6FhMY/7qtUCwbmzvnoGcXI="; }; LC_ALL = "en_US.UTF-8"; @@ -42,13 +43,28 @@ buildPythonPackage rec { git glibcLocales gpgme - pkgs.gnupg + gnupg mock paramiko + pytestCheckHook ]; doCheck = !stdenv.isDarwin; + disabledTests = [ + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0' + "test_no_decode_encode" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' + "test_cyrillic" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' + "test_commit_no_encode_decode" + ]; + + disabledTestPaths = [ + # missing test inputs + "dulwich/contrib/test_swift_smoke.py" + ]; + pythonImportsCheck = [ "dulwich" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd6534158ec3..3e732e442297 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2816,7 +2816,9 @@ in { dugong = callPackage ../development/python-modules/dugong { }; - dulwich = callPackage ../development/python-modules/dulwich { }; + dulwich = callPackage ../development/python-modules/dulwich { + inherit (pkgs) gnupg; + }; dunamai = callPackage ../development/python-modules/dunamai { };