Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/pari/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ assert withThread -> libpthreadstubs != null;

stdenv.mkDerivation rec {
pname = "pari";
version = "2.15.5";
version = "2.17.1";

src = fetchurl {
urls = [
"https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"
# 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 = [
Expand Down
7 changes: 7 additions & 0 deletions pkgs/by-name/sa/sage/sage-src.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
15 changes: 9 additions & 6 deletions pkgs/development/python-modules/cysignals/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
lib,
autoreconfHook,
fetchPypi,
buildPythonPackage,
meson-python,
cython,
pariSupport ? true,
pari, # for interfacing with the PARI/GP signal handler
Expand All @@ -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" ];
Expand All @@ -45,8 +50,6 @@ buildPythonPackage rec {
pari
];

nativeBuildInputs = [ autoreconfHook ];

enableParallelBuilding = true;

passthru.tests = {
Expand Down