From 5c0f7fc6c1f853d076b9c413bc91bb4a970be64a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Aug 2023 00:32:02 +0000 Subject: [PATCH 1/3] python310Packages.pystache: 0.6.0 -> 0.6.4 --- pkgs/development/python-modules/pystache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 4c408d3ad601..eea136f0a5c2 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pystache"; - version = "0.6.0"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "93bf92b2149a4c4b58d12142e2c4c6dd5c08d89e4c95afccd4b6efe2ee1d470d"; + sha256 = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c="; }; LC_ALL = "en_US.UTF-8"; From 41edb36674f8fc44b0adc72dae678fa6cb0ab88d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Aug 2023 10:27:49 +0200 Subject: [PATCH 2/3] python310Packages.pystache: add format - disable on unsupported Python releases --- .../python-modules/pystache/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index eea136f0a5c2..3586be89a08c 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -1,27 +1,37 @@ -{ lib, buildPythonPackage, unittestCheckHook, fetchPypi, isPy3k, glibcLocales }: +{ lib +, buildPythonPackage +, unittestCheckHook +, fetchPypi +, pythonOlder +, glibcLocales +}: buildPythonPackage rec { pname = "pystache"; version = "0.6.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c="; + hash = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c="; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; + buildInputs = [ + glibcLocales + ]; - # SyntaxError Python 3 - # https://github.com/defunkt/pystache/issues/181 - doCheck = !isPy3k; - - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; meta = with lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; homepage = "https://github.com/defunkt/pystache"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 57c56874739923c8f915b1ceda44251730166743 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Aug 2023 10:29:22 +0200 Subject: [PATCH 3/3] python310Packages.pystache: add pythonImportsCheck --- pkgs/development/python-modules/pystache/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 3586be89a08c..19d9b2cdf490 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { unittestCheckHook ]; + pythonImportsCheck = [ + "pystache" + ]; + meta = with lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; homepage = "https://github.com/defunkt/pystache";