From d037fb9241a9991082594eb816c13b67fee53ef2 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 21 Mar 2026 07:42:29 +1100 Subject: [PATCH 1/3] python3Packages.escapism: fix build, use setuptools --- pkgs/development/python-modules/escapism/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 3c691359b3d5..93a8517d5baf 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -2,18 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "escapism"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "sha256-rdEw5IqFuxquo+dPsDH1AzxwVa7bOaMmX5I9X0DD+XQ="; }; + build-system = [ + setuptools + setuptools-scm + ]; + # No tests distributed doCheck = false; From 132b69fc495d49f9b2143fa51762fd33822c32bd Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 22 Mar 2026 12:40:44 +1100 Subject: [PATCH 2/3] python3Packages.escapism: enable tests --- pkgs/development/python-modules/escapism/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 93a8517d5baf..b06eea03edb9 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -4,6 +4,7 @@ fetchPypi, setuptools, setuptools-scm, + pytestCheckHook, }: buildPythonPackage rec { @@ -21,8 +22,9 @@ buildPythonPackage rec { setuptools-scm ]; - # No tests distributed - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = "Simple, generic API for escaping strings"; From b1dc13c3ead1d65adf322ab5e3fbf38712d6fde2 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 22 Mar 2026 12:43:47 +1100 Subject: [PATCH 3/3] python3Packages.escapism: use finalAttrs pattern --- pkgs/development/python-modules/escapism/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index b06eea03edb9..2f0bcbb386a7 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -7,14 +7,14 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "escapism"; version = "1.1.0"; pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "sha256-rdEw5IqFuxquo+dPsDH1AzxwVa7bOaMmX5I9X0DD+XQ="; + inherit (finalAttrs) pname version; + hash = "sha256-rdEw5IqFuxquo+dPsDH1AzxwVa7bOaMmX5I9X0DD+XQ="; }; build-system = [ @@ -32,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ bzizou ]; }; -} +})