From 824d91a532d084fd6cdae333ae9f7a765d7c746c Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 23 Jan 2024 16:34:33 +0100 Subject: [PATCH] Revert "python311Packages.cysignals: revert to cython 0.29 for the moment" This reverts commit 1f173b827206716931a879bff5bb8b42e28ae79e. --- .../python-modules/cysignals/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index b64d3f8d7174..fe0ca2e17a09 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,9 +1,8 @@ { lib , autoreconfHook -, fetchpatch , fetchPypi , buildPythonPackage -, cython +, cython_3 , pariSupport ? true, pari # for interfacing with the PARI/GP signal handler }: @@ -19,14 +18,6 @@ buildPythonPackage rec { hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM="; }; - patches = [ - # https://github.com/sagemath/cysignals/pull/193 - (fetchpatch { - url = "https://github.com/sagemath/cysignals/commit/474179c87ab0ff562fdfd2471b02797e4bdd3148.diff"; - sha256 = "sha256-qEAmf4kU+QDI/JPFNjQMZIjMBk8dnaLmOpagIBMsh7w="; - }) - ]; - # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ @@ -43,7 +34,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - cython + cython_3 ] ++ lib.optionals pariSupport [ # When cysignals is built with pari, including cysignals into the # buildInputs of another python package will cause cython to link against