diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2024-03-08 10:23:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 10:23:20 +0100 |
| commit | bf7ceec3fba774f34289d2da5f4fa6d62494d526 (patch) | |
| tree | 05980b43f58be40d70162ed4debcfdd82279c0f7 | |
| parent | f2b288b9e390062a6aecb720c2a15378b07a35ca (diff) | |
| parent | a2fe9a1f2d6fb33596e02960d0028787a15497d3 (diff) | |
Merge pull request #294240 from fabaff/cpyparsing-fix
python311Packages.cpyparsing: use cython_3, python311Packages.coconut: refactor
| -rw-r--r-- | pkgs/development/python-modules/coconut/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/python-modules/cpyparsing/default.nix | 10 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 3a00891e60dd2..19571b93ac1e1 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 ]; }; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index cd34ebf1da1f0..c475652799ea8 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 = [ |