From 87972648f112d2dd3d5c10f2019a2dda9b859fcd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 24 Mar 2026 23:39:06 +0000 Subject: [PATCH 1/2] python3Packages.xmlsec: cleanup --- .../python-modules/xmlsec/default.nix | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 40ad5d477d7f..805d457758ea 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -1,27 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, - hypothesis, + fetchFromGitHub, + + # build-system + pkgconfig, + setuptools-scm, + + # nativeBuildInputs + pkg-config, + # pkgconfig, + + # buildInputs libtool, libxml2, libxslt, - lxml, - pkg-config, - pkgconfig, - pytestCheckHook, - setuptools-scm, xmlsec, + + # dependencies + lxml, + + # tests + hypothesis, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmlsec"; version = "1.3.17"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-8/rJrmefZlhZJcwAxfaDmuNsHQMVdhlXHe4YrMBbnAE="; + src = fetchFromGitHub { + owner = "xmlsec"; + repo = "python-xmlsec"; + tag = finalAttrs.version; + hash = "sha256-p3V75DLUI2PKdharP3/0HrKOgma9Kh3lAOZLRAQjo80="; }; postPatch = '' @@ -29,25 +42,27 @@ buildPythonPackage rec { --replace-fail "setuptools==" "setuptools>=" ''; - build-system = [ setuptools-scm ]; + build-system = [ + pkgconfig + setuptools-scm + ]; nativeBuildInputs = [ pkg-config - pkgconfig ]; buildInputs = [ - xmlsec - libxslt - libxml2 libtool + libxml2 + libxslt + xmlsec ]; - propagatedBuildInputs = [ lxml ]; + dependencies = [ lxml ]; nativeCheckInputs = [ - pytestCheckHook hypothesis + pytestCheckHook ]; disabledTestPaths = [ @@ -59,9 +74,9 @@ buildPythonPackage rec { meta = { description = "Python bindings for the XML Security Library"; - homepage = "https://github.com/mehcode/python-xmlsec"; - changelog = "https://github.com/xmlsec/python-xmlsec/releases/tag/${version}"; + homepage = "https://github.com/xmlsec/python-xmlsec"; + changelog = "https://github.com/xmlsec/python-xmlsec/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; }; -} +}) From f16c4dad24118c9c411dd4e04e2ebb3d56ec1bcc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 24 Mar 2026 23:40:39 +0000 Subject: [PATCH 2/2] python3Packages.xmlsec: skip failing test on x86_64-darwin --- pkgs/development/python-modules/xmlsec/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 805d457758ea..e1178ff3058f 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -70,6 +71,11 @@ buildPythonPackage (finalAttrs: { "tests/test_doc_examples.py" ]; + disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: memory leak detected + "test_reinitialize_module" + ]; + pythonImportsCheck = [ "xmlsec" ]; meta = {