From cc3b636db3186a0fedaded60218aa8aeb81f8fe8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Jan 2023 09:37:56 +0100 Subject: [PATCH 1/2] python3Packages.pscript: 0.7.6 -> 0.7.7 Signed-off-by: Matthias Beyer --- pkgs/development/python-modules/pscript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index fae2c8a42818..221e9979711d 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pscript"; - version = "0.7.6"; + version = "0.7.7"; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "flexxui"; repo = pname; rev = "v${version}"; - sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4"; + sha256 = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; checkInputs = [ From 42eaaafa63c963161f3210fa6c873d80886af254 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Jan 2023 10:19:58 +0100 Subject: [PATCH 2/2] python3Packages.pscript: add changelog to meta - add pythonImportsCheck - disable on unsupported Python releases - remove blank lines --- .../python-modules/pscript/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index 221e9979711d..0acafc40ad91 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , pytestCheckHook , nodejs +, pythonOlder }: buildPythonPackage rec { pname = "pscript"; version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "flexxui"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; + rev = "refs/tags/v${version}"; + hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; checkInputs = [ @@ -27,13 +30,15 @@ buildPythonPackage rec { rm -rf pscript_legacy ''; + pythonImportsCheck = [ + "pscript" + ]; + meta = with lib; { description = "Python to JavaScript compiler"; - license = licenses.bsd2; homepage = "https://pscript.readthedocs.io"; - maintainers = [ maintainers.matthiasbeyer ]; + changelog = "https://github.com/flexxui/pscript/blob/v${version}/docs/releasenotes.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthiasbeyer ]; }; } - - -