From 94b96b2a4c4ab66b0cffbf91097cb9d3e659e8f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Mar 2024 09:32:18 +0100 Subject: [PATCH 1/2] python311Packages.cpyparsing: use cython_3 --- pkgs/development/python-modules/cpyparsing/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index cd34ebf1da1f..c475652799ea 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub -, cython +, cython_3 , pexpect , python , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "cpyparsing"; version = "2.4.7.2.3.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "evhub"; - repo = pname; + repo = "cpyparsing"; rev = "refs/tags/v${version}"; hash = "sha256-vnzZdJ7pZz1QxlTqw5UKjxB4GVcXuCfKWX4lu3ORWas="; }; nativeBuildInputs = [ - cython + cython_3 + setuptools ]; nativeCheckInputs = [ From a2fe9a1f2d6fb33596e02960d0028787a15497d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Mar 2024 09:33:54 +0100 Subject: [PATCH 2/2] python311Packages.coconut: refactor - add missing inputs --- pkgs/development/python-modules/coconut/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 3a00891e60dd..19571b93ac1e 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -1,4 +1,6 @@ { lib +, anyio +, async-generator , buildPythonPackage , fetchFromGitHub , cpyparsing @@ -30,6 +32,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + anyio + async-generator cpyparsing ipykernel mypy @@ -50,11 +54,14 @@ buildPythonPackage rec { "coconut/tests/constants_test.py" ]; - pythonImportsCheck = [ "coconut" ]; + pythonImportsCheck = [ + "coconut" + ]; meta = with lib; { - homepage = "http://coconut-lang.org/"; description = "Simple, elegant, Pythonic functional programming"; + homepage = "http://coconut-lang.org/"; + changelog = "https://github.com/evhub/coconut/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fabianhjr ]; };