From b5319b27ead90f40f27f6ef4ab42c4c7a3cfc3f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 14:00:00 +0000 Subject: [PATCH 1/2] python312Packages.pypugjs: 5.10.1 -> 5.12.0 --- pkgs/development/python-modules/pypugjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 455677a38166..316c2ea55a7b 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pypugjs"; - version = "5.10.1"; + version = "5.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "kakulukia"; repo = "pypugjs"; tag = "v${version}"; - hash = "sha256-W+EVNxT2OimNENHe4lJDn6Wm1EbBysGuCD3/Wkdew/U="; + hash = "sha256-JHZzyEilCjpZFIrl5kk1oJ4C/vgQTfVoRRGBK+DuHAE="; }; propagatedBuildInputs = [ From f38c6ad3afb7542c1d87f7989415c1dfb9c3c745 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 27 Apr 2025 17:30:18 +0200 Subject: [PATCH 2/2] python312Packages.pypugjs: modernize --- .../python-modules/pypugjs/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 316c2ea55a7b..46a40dfe6673 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, jinja2, mako, + poetry-core, pyramid, pyramid-mako, pytestCheckHook, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pypugjs"; version = "5.12.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kakulukia"; @@ -25,11 +26,19 @@ buildPythonPackage rec { hash = "sha256-JHZzyEilCjpZFIrl5kk1oJ4C/vgQTfVoRRGBK+DuHAE="; }; - propagatedBuildInputs = [ + build-system = [ + poetry-core + ]; + + dependencies = [ six charset-normalizer ]; + pythonRelaxDeps = [ + "charset-normalizer" + ]; + nativeCheckInputs = [ django jinja2 @@ -42,6 +51,10 @@ buildPythonPackage rec { pytestCheckFlags = [ "pypugjs/testsuite" ]; + pythonImportsCheck = [ + "pypugjs" + ]; + meta = with lib; { description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates"; mainProgram = "pypugjs";