diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
| commit | 24d4f2cd52fc44f375e60ab4c90e159193689d72 (patch) | |
| tree | 113c1984373abdd81ca189e25fa76396a55706bc /pkgs/applications/science/math | |
| parent | 4cfc319ea877f057cb7ad0c455c6af52e72bc557 (diff) | |
| parent | 993400aeecf5ce185586dded2cebccebd628ec93 (diff) | |
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval): pkgs/development/python-modules/apsw/default.nix pkgs/development/python-modules/mido/default.nix pkgs/development/python-modules/pytest-bdd/default.nix pkgs/development/python-modules/sparse/default.nix
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/sage/python-modules/sage-setup.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sagelib.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix index a96f7ccd5d4c0..e1c497678d50b 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , sage-src -, cython_3 +, cython , jinja2 , pkgconfig # the python module, not the pkg-config alias }: @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sage-setup"; src = sage-src; - nativeBuildInputs = [ cython_3 ]; + nativeBuildInputs = [ cython ]; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ jinja2 ]; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index b67b74e3a0f23..0a2bd8011b0bd 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -48,7 +48,7 @@ , cvxopt , cypari2 , cysignals -, cython_3 +, cython , fpylll , gmpy2 , importlib-metadata @@ -153,7 +153,7 @@ buildPythonPackage rec { cvxopt cypari2 cysignals - cython_3 + cython fpylll gmpy2 importlib-metadata |