From 97bc2824dce24e31df459b20921688faf79f6e79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:08:31 +0200 Subject: [PATCH 1/4] python310Packages.enaml: add changelog to meta --- pkgs/development/python-modules/enaml/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index e53b38d04e91..9bf3fe1b56a5 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -53,8 +53,9 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; meta = with lib; { - homepage = "https://github.com/nucleic/enaml"; description = "Declarative User Interfaces for Python"; + homepage = "https://github.com/nucleic/enaml"; + changelog = "https://github.com/nucleic/enaml/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ raboof ]; }; From e34a17ca0a5295b5448882c6ec28130c7c24a544 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:10:57 +0200 Subject: [PATCH 2/4] python310Packages.enaml: add pegen - update ordering --- .../python-modules/enaml/default.nix | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 9bf3fe1b56a5..cdbe4ab05912 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -1,14 +1,15 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, setuptools-scm , atom -, ply -, kiwisolver -, qtpy -, sip_4 -, cppy +, buildPythonPackage , bytecode +, cppy +, fetchFromGitHub +, kiwisolver +, pegen +, ply +, qtpy +, setuptools-scm +, sip_4 }: buildPythonPackage rec { @@ -22,6 +23,24 @@ buildPythonPackage rec { hash = "sha256-0W5FWGS4vu5+O6/C4El60QDsRNj+P4xGQ62NdkfJd5I="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + atom + bytecode + cppy + kiwisolver + pegen + ply + qtpy + sip_4 + ]; + + # qt bindings cannot be found during tests doCheck = false; @@ -40,18 +59,6 @@ buildPythonPackage rec { "enaml.workbench" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - atom - ply - kiwisolver - qtpy - sip_4 - cppy - bytecode - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = with lib; { description = "Declarative User Interfaces for Python"; homepage = "https://github.com/nucleic/enaml"; From 5171e6a356467585a40d8e1b09ae983ab9bb001d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:16:25 +0200 Subject: [PATCH 3/4] python310Packages.enaml: disable on unsupported Python releases - add format --- pkgs/development/python-modules/enaml/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index cdbe4ab05912..6d6d596e80b4 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -8,13 +8,18 @@ , pegen , ply , qtpy +, setuptools , setuptools-scm +, pythonOlder , sip_4 }: buildPythonPackage rec { pname = "enaml"; version = "0.16.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nucleic"; @@ -26,6 +31,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -40,7 +46,6 @@ buildPythonPackage rec { sip_4 ]; - # qt bindings cannot be found during tests doCheck = false; From 7d9fe0a83587bfb7ac0932a1ab662fac496f83c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:31:31 +0200 Subject: [PATCH 4/4] python310Packages.pegen: init at 0.2.0 --- .../python-modules/pegen/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pegen/default.nix diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix new file mode 100644 index 000000000000..bc88e02a642e --- /dev/null +++ b/pkgs/development/python-modules/pegen/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pegen"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "we-like-parsers"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pegen" + ]; + + meta = with lib; { + description = "Library to generate PEG parsers"; + homepage = "https://github.com/we-like-parsers/pegen"; + changelog = "https://github.com/we-like-parsers/pegen/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a784017465c..f6af5c709edb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7191,6 +7191,8 @@ self: super: with self; { peaqevcore = callPackage ../development/python-modules/peaqevcore { }; + pegen = callPackage ../development/python-modules/pegen { }; + pebble = callPackage ../development/python-modules/pebble { }; pecan = callPackage ../development/python-modules/pecan { };