diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index d876875268b7..39f663cb50fd 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.5"; + version = "2.17.1"; src = fetchurl { urls = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-Dv3adRXZ2VT2MyTDSzTFYOYPc6gcOSSnEmCizJHV+YE="; + hash = "sha256-Z7pvMHEjNyUlhUHk8XS177xkxlrlEVut6e38RfH95dw="; }; buildInputs = [ diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index e34dc32019c5..16ff02bcafa5 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -82,6 +82,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/f10a6d04599795732c1d99e2da0a4839ccdcb4f5.diff"; hash = "sha256-xB0xg8dGLnSMdFK3/B5hkI9yzI5N3lUMhPZ89lDsp3s="; }) + + # https://github.com/sagemath/sage/pull/38749, to land in 10.6.beta6 + (fetchpatch { + name = "pari-2.17.1-update.patch"; + url = "https://github.com/sagemath/sage/compare/10.6.beta2...26f411e5939718d4439325ff669635e5a72d50e5.diff"; + hash = "sha256-Z4JwCuUDpqktAzNtVKRUbrJEh7TmCtFI7PJnOrcEbr4="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 9e90eaf38f19..df27cb4c17e9 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,8 +1,8 @@ { lib, - autoreconfHook, fetchPypi, buildPythonPackage, + meson-python, cython, pariSupport ? true, pari, # for interfacing with the PARI/GP signal handler @@ -15,14 +15,19 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.11.4"; - format = "setuptools"; + version = "1.12.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM="; + hash = "sha256-ifdibb8p21qz1u/xWomXj061GTwyDpCZvMFX2s3v0es="; }; + build-system = [ + cython + meson-python + ]; + # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ "fortify" ]; @@ -45,8 +50,6 @@ buildPythonPackage rec { pari ]; - nativeBuildInputs = [ autoreconfHook ]; - enableParallelBuilding = true; passthru.tests = {