diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 20c40c2eee43..6e59073f1c13 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -8,21 +8,18 @@ fetchFromGitHub, gcc, pytestCheckHook, - pythonOlder, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "primer3"; version = "2.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "libnano"; repo = "primer3-py"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GrVYYjS/+LZScZETfk7YcSy2yrWc3SPumXvyQeEpFUg="; }; @@ -37,6 +34,7 @@ buildPythonPackage rec { click pytestCheckHook ]; + # We are not sure why exactly this is need. It seems `pytestCheckHook` # doesn't find extension modules installed in $out/${python.sitePackages}, # and the tests rely upon them. This was initially reported upstream at @@ -51,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Oligo analysis and primer design"; homepage = "https://github.com/libnano/primer3-py"; - changelog = "https://github.com/libnano/primer3-py/blob/${src.tag}/CHANGES"; + changelog = "https://github.com/libnano/primer3-py/blob/${finalAttrs.src.tag}/CHANGES"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 2e34422404f8..5db33be5ab0b 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -30,7 +30,7 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "weasyprint"; version = "66.0"; pyproject = true; @@ -40,7 +40,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kozea"; repo = "WeasyPrint"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wmEDVEbikBpOQ5394IBPWQRjWZOLfMzEGxTtq4tt2Tw="; }; @@ -97,21 +97,23 @@ buildPythonPackage rec { "test_visibility_3" "test_visibility_4" "test_woff_simple" + # AssertionError + "test_2d_transform" ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; # Set env variable explicitly for Darwin, but allow overriding when invoking directly - makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${FONTCONFIG_FILE}" ]; + makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${finalAttrs.FONTCONFIG_FILE}" ]; pythonImportsCheck = [ "weasyprint" ]; meta = { - changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/${src.tag}"; + changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/${finalAttrs.src.tag}"; description = "Converts web documents to PDF"; - mainProgram = "weasyprint"; homepage = "https://weasyprint.org/"; license = lib.licenses.bsd3; + mainProgram = "weasyprint"; teams = [ lib.teams.apm ]; }; -} +})