From e69d0a0aa3bf12c5ed2790df1e6bf25eeb53202d Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 5 Mar 2021 12:19:49 -0300 Subject: [PATCH 1/2] cython: backport Cython 3.0 trashcan support --- pkgs/development/python-modules/Cython/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 64f5bb3ab65..8204984b151 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -49,6 +49,15 @@ in buildPythonPackage rec { url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch"; sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy"; }) + + # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. + # it does not affect Python code unless the code explicitly uses the feature. + # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) + (fetchpatch { + name = "trashcan.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cython/patches/trashcan.patch?id=4569a839f070a1a38d5dbce2a4d19233d25aeed2"; + sha256 = "sha256-+pOF1XNTEtNseLpqPzrc1Jfwt5hGx7doUoccIhNneYY="; + }) ]; checkPhase = '' From 7d1d7848e9f5e47081c71692687ec18e6d9501fc Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 5 Mar 2021 13:27:07 -0300 Subject: [PATCH 2/2] cython: 0.29.21 -> 0.29.22 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 8204984b151..c09f1586fd6 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.21"; + version = "0.29.22"; src = fetchPypi { inherit pname version; - sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5"; + sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY="; }; nativeBuildInputs = [