git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #114881 from collares/sage-dependencies

sage dependency updates

commita72148f3bc821d9c1456dd4d8f2840c9d27f8431 authorGuillaume Girol <symphorien@users.noreply.github.com> dateThu 11 Mar 2021, 17:52 (6 years ago) parent902a4793a09354
12 files changed+165−174
pkgs/applications/science/math/giac/default.nix+27−16 pkgs/applications/science/math/palp/default.nix+3−3 pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch−29 pkgs/applications/science/math/sage/patches/pillow-update.patch−39 pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch−36 pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch−13 pkgs/applications/science/math/sage/sage-src.nix+70−32 pkgs/development/libraries/arb/default.nix+10−3 pkgs/development/libraries/science/math/rankwidth/default.nix+3−3 pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch+39 pkgs/development/libraries/science/math/sympow/default.nix+2 pkgs/development/python-modules/cysignals/default.nix+11
pkgs/applications/science/math/giac/default.nix+27−16
@@ -2,32 +2,44 @@
22, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
33, readline, gettext, libpng, libao, gfortran, perl
44, enableGUI ? false, libGL, libGLU, xorg, fltk
5+, enableMicroPy ? false, python3
56}:
67
78assert (!blas.isILP64) && (!lapack.isILP64);
89
910stdenv.mkDerivation rec {
1011 pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
11− version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade
12+ version = "1.6.0-47"; # TODO try to remove preCheck phase on upgrade
1213
1314 src = fetchurl {
1415 url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
15− sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv";
16+ sha256 = "sha256-c5A9/I6L/o3Y3dxEPoTKpw/fJqYMr6euLldaQ1HWT5c=";
1617 };
1718
18− patches = lib.optionals (!enableGUI) [
19− # when enableGui is false, giac is compiled without fltk. That means some
20− # outputs differ in the make check. Patch around this:
19+ patches = [
2120 (fetchpatch {
22− url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
21+ name = "pari_2_11.patch";
22+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";
23+ sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";
24+ })
25+ ] ++ lib.optionals (!enableGUI) [
26+ # when enableGui is false, giac is compiled without fltk. That
27+ # means some outputs differ in the make check. Patch around this:
28+ (fetchpatch {
29+ name = "nofltk-check.patch";
30+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
2331 sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
2432 })
2533 ];
2634
2735 postPatch = ''
28− for i in doc/*/Makefile*; do
36+ for i in doc/*/Makefile* micropython*/xcas/Makefile*; do
2937 substituteInPlace "$i" --replace "/bin/cp" "cp";
3038 done;
39+ '' +
40+ # workaround for 1.6.0-47, should not be necessary in future versions
41+ lib.optionalString (!enableMicroPy) ''
42+ sed -i -e 's/micropython-[0-9.]* //' Makefile*
3143 '';
3244
3345 nativeBuildInputs = [
@@ -44,7 +56,7 @@ stdenv.mkDerivation rec {
4456 lapack blas
4557 ] ++ lib.optionals enableGUI [
4658 libGL libGLU fltk xorg.libX11
47− ];
59+ ] ++ lib.optional enableMicroPy python3;
4860
4961 /* fixes:
5062 configure:16211: checking for main in -lntl
@@ -58,13 +70,12 @@ stdenv.mkDerivation rec {
5870 outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc";
5971
6072 doCheck = true;
61− preCheck = ''
62− # One test in this file fails. That test just tests a part of the pari
63− # interface that isn't actually used in giac. Of course it would be better
64− # to only remove that one test, but that would require a patch.
65− # Removing the whole test set should be good enough for now.
66− # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326
67− echo > check/chk_fhan11
73+ preCheck = lib.optionalString (!enableGUI) ''
74+ # even with the nofltk patch, some changes in src/misc.cc (grep
75+ # for HAVE_LIBFLTK) made it so that giac behaves differently
76+ # when fltk is disabled. disable these tests for now.
77+ echo > check/chk_fhan2
78+ echo > check/chk_fhan9
6879 '';
6980
7081 enableParallelBuilding = true;
@@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
7586 "--enable-ao" "--enable-ecm" "--enable-glpk"
7687 ] ++ lib.optionals enableGUI [
7788 "--enable-gui" "--with-x"
78− ];
89+ ] ++ lib.optional (!enableMicroPy) "--disable-micropy";
7990
8091 postInstall = ''
8192 # example Makefiles contain the full path to some commands
pkgs/applications/science/math/palp/default.nix+3−3
@@ -10,11 +10,11 @@ let
1010in
1111stdenv.mkDerivation rec {
1212 pname = "palp";
13− version = "2.11";
13+ version = "2.20";
1414
1515 src = fetchurl {
16− url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz";
17− sha256 = "00jpm73fw9jjq58z6rysr1mwv489j6rpfqqlhm9ab0dln4kyhh05";
16+ url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/${pname}-${version}.tar.gz";
17+ sha256 = "1q1cl3vpdir16szy0jcadysydcrjp48hqxyx42kr8g9digkqjgkj";
1818 };
1919
2020 hardeningDisable = [
pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patchdeleted−29
@@ -1,29 +0,0 @@
1−diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
2−index 88a33b0349..b3321f0bec 100644
3−--- a/src/sage/interfaces/singular.py
4−+++ b/src/sage/interfaces/singular.py
5−@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect):
6− """
7− Send an interrupt to Singular. If needed, additional
8− semi-colons are sent until we get back at the prompt.
9−-
10−- TESTS:
11−-
12−- The following works without restarting Singular::
13−-
14−- sage: a = singular(1)
15−- sage: _ = singular._expect.sendline('1+') # unfinished input
16−- sage: try:
17−- ....: alarm(0.5)
18−- ....: singular._expect_expr('>') # interrupt this
19−- ....: except KeyboardInterrupt:
20−- ....: pass
21−- Control-C pressed. Interrupting Singular. Please wait a few seconds...
22−-
23−- We can still access a::
24−-
25−- sage: 2*a
26−- 2
27− """
28− # Work around for Singular bug
29− # http://www.singular.uni-kl.de:8002/trac/ticket/727
pkgs/applications/science/math/sage/patches/pillow-update.patchdeleted−39
@@ -1,39 +0,0 @@
1−diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py
2−index d7d00b0..cd1607a 100644
3−--- a/src/sage/repl/image.py
4−+++ b/src/sage/repl/image.py
5−@@ -77,7 +77,7 @@ class Image(SageObject):
6−
7− - ``size`` -- 2-tuple, containing (width, height) in pixels.
8−
9−- - ``color`` -- string or tuple of numeric. What colour to use
10−+ - ``color`` -- string, numeric or tuple of numeric. What colour to use
11− for the image. Default is black. If given, this should be a
12− a tuple with one value per band. When creating RGB images,
13− you can also use colour strings as supported by the
14−@@ -91,9 +91,15 @@ class Image(SageObject):
15− EXAMPLES::
16−
17− sage: from sage.repl.image import Image
18−- sage: Image('P', (16, 16), (13,))
19−+ sage: Image('P', (16, 16), 13)
20− 16x16px 8-bit Color image
21− """
22−+ # pillow does not support Sage integers as color
23−+ from sage.rings.integer import Integer
24−+ if isinstance(color, Integer):
25−+ color = int(color)
26−+ elif isinstance(color, tuple):
27−+ color = tuple(int(i) if isinstance(i, Integer) else i for i in color)
28− self._pil = PIL.Image.new(mode, size, color)
29−
30− @property
31−@@ -233,7 +239,7 @@ class Image(SageObject):
32− EXAMPLES::
33−
34− sage: from sage.repl.image import Image
35−- sage: img = Image('P', (12, 34), (13,))
36−+ sage: img = Image('P', (12, 34), 13)
37− sage: filename = tmp_filename(ext='.png')
38− sage: img.save(filename)
39− sage: with open(filename, 'rb') as f:
pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patchdeleted−36
@@ -1,36 +0,0 @@
1−diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
2−index cb3667659e..867f547d71 100644
3−--- a/src/sage/doctest/forker.py
4−+++ b/src/sage/doctest/forker.py
5−@@ -200,6 +200,15 @@ def init_sage(controller=None):
6− from sage.cpython._py2_random import Random
7− sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random
8−
9−+ # IPython's pretty printer sorts the repr of dicts by their keys by default
10−+ # (or their keys' str() if they are not otherwise orderable). However, it
11−+ # disables this for CPython 3.6+ opting to instead display dicts' "natural"
12−+ # insertion order, which is preserved in those versions).
13−+ # However, this order is random in some instances.
14−+ # Also modifications of code may affect the order.
15−+ # So here we fore sorted dict printing.
16−+ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
17−+
18− if controller is None:
19− import sage.repl.ipython_kernel.all_jupyter
20− else:
21−@@ -222,15 +231,6 @@ def init_sage(controller=None):
22− from sage.repl.rich_output.backend_doctest import BackendDoctest
23− dm.switch_backend(BackendDoctest())
24−
25−- # IPython's pretty printer sorts the repr of dicts by their keys by default
26−- # (or their keys' str() if they are not otherwise orderable). However, it
27−- # disables this for CPython 3.6+ opting to instead display dicts' "natural"
28−- # insertion order, which is preserved in those versions).
29−- # However, this order is random in some instances.
30−- # Also modifications of code may affect the order.
31−- # So here we fore sorted dict printing.
32−- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
33−-
34− # Switch on extra debugging
35− from sage.structure.debug_options import debug
36− debug.refine_category_hash_check = True
pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx
2−index 9041238f1d..469befbc66 100644
3−--- a/src/sage/interfaces/sagespawn.pyx
4−+++ b/src/sage/interfaces/sagespawn.pyx
5−@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess):
6− Check that the process eventually dies after calling
7− ``terminate_async``::
8−
9−- sage: s.ptyproc.terminate_async(interval=0.2)
10−+ sage: s.ptyproc.terminate_async(interval=float(0.2))
11− sage: while True:
12− ....: try:
13− ....: os.kill(s.pid, 0)
pkgs/applications/science/math/sage/sage-src.nix+70−32
@@ -9,6 +9,20 @@
99# This is done because multiple derivations rely on these sources and they should
1010# all get the same sources with the same patches applied.
1111
12+let
13+ # Fetch a diff between `base` and `rev` on sage's git server.
14+ # Used to fetch trac tickets by setting the `base` to the last release and the
15+ # `rev` to the last commit of the ticket.
16+ fetchSageDiff = { base, name, rev, sha256, ...}@args: (
17+ fetchpatch ({
18+ inherit name sha256;
19+ url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
20+ # We don't care about sage's own build system (which builds all its dependencies).
21+ # Exclude build system changes to avoid conflicts.
22+ excludes = [ "build/*" ];
23+ } // builtins.removeAttrs args [ "rev" "base" "sha256" ])
24+ );
25+in
1226stdenv.mkDerivation rec {
1327 version = "9.2";
1428 pname = "sage-src";
@@ -40,17 +54,13 @@ stdenv.mkDerivation rec {
4054 # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
4155 ./patches/sphinx-docbuild-subprocesses.patch
4256
43− # Sage's workaround to pretty print dicts (in
44− # src/sage/doctest/forker.py:init_sage) runs too late (after
45− # controller.load_environment(), which imports sage.all.*) to to
46− # affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer.
47− # Due to the sandpiles module being lazily loaded, this only
48− # affects the first run (subsequent runs read from an import cache
49− # at ~/.sage/cache and are not affected), which is probably why
50− # other distributions don't hit this bug. This breaks two sandpile
51− # tests, so do the workaround a little bit earlier.
52− # https://trac.sagemath.org/ticket/31053
53− ./patches/register-pretty-printer-earlier.patch
57+ # Register sorted dict pprinter earlier (https://trac.sagemath.org/ticket/31053)
58+ (fetchSageDiff {
59+ base = "9.3.beta4";
60+ name = "register-pretty-printer-earlier.patch";
61+ rev = "d658230ce06ca19f4a3b3a4576297ee82f2d2151";
62+ sha256 = "sha256-9mPUV7K5PoLDH2vVaYaOfvDLDpmxU0Aj7m/eaXYotDs=";
63+ })
5464 ];
5565
5666 # Since sage unfortunately does not release bugfix releases, packagers must
@@ -63,17 +73,20 @@ stdenv.mkDerivation rec {
6373
6474 # fix intermittent errors in Sage 9.2's psage.py (this patch is
6575 # already included in Sage 9.3): https://trac.sagemath.org/ticket/30730
66− (fetchpatch {
76+ (fetchSageDiff {
77+ base = "9.2.rc2";
6778 name = "fix-psage-is-locked.patch";
68− url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9";
79+ rev = "75df605f216ddc7b6ca719be942d666b241520e9";
6980 sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q";
7081 })
7182
7283 # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052
73− ./patches/sagespawn-implicit-casting.patch
74−
75− # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945)
76− ./patches/disable-pexpect-intermittent-failure.patch
84+ (fetchSageDiff {
85+ base = "9.2";
86+ name = "sagespawn-implicit-casting.patch";
87+ rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6";
88+ sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0=";
89+ })
7790 ];
7891
7992 # Patches needed because of package updates. We could just pin the versions of
@@ -82,20 +95,7 @@ stdenv.mkDerivation rec {
8295 # compatible with never dependency versions when possible. All these changes
8396 # should come from or be proposed to upstream. This list will probably never
8497 # be empty since dependencies update all the time.
85− packageUpgradePatches = let
86− # Fetch a diff between `base` and `rev` on sage's git server.
87− # Used to fetch trac tickets by setting the `base` to the last release and the
88− # `rev` to the last commit of the ticket.
89− fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
90− fetchpatch ({
91− inherit name;
92− url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
93− # We don't care about sage's own build system (which builds all its dependencies).
94− # Exclude build system changes to avoid conflicts.
95− excludes = [ "build/*" ];
96− } // builtins.removeAttrs args [ "rev" "base" ])
97− );
98− in [
98+ packageUpgradePatches = [
9999 # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
100100 # now set the cache dir to be withing the .sage directory. This is not
101101 # strictly necessary, but keeps us from littering in the user's HOME.
@@ -105,7 +105,20 @@ stdenv.mkDerivation rec {
105105 ./patches/ignore-cmp-deprecation.patch
106106
107107 # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971)
108− ./patches/pillow-update.patch
108+ (fetchSageDiff {
109+ base = "9.3.beta2";
110+ name = "pillow-8.0.1-update.patch";
111+ rev = "f05f2d0aac9c4b5abe68105cee2cc7f2c8461847";
112+ sha256 = "sha256-uY2UlgSd5hhOUUukB4Xc3Gjy0/e7p/qyq9jdvz10IOs=";
113+ })
114+
115+ # don't use deprecated numpy type aliases (https://trac.sagemath.org/ticket/31364)
116+ (fetchSageDiff {
117+ base = "9.3.beta7";
118+ name = "dont-use-deprecated-numpy-type-aliases.patch";
119+ rev = "dfdef60515d4a4269e82d91280f76a7fdf10bf97";
120+ sha256 = "sha256-77/3LkT5J7DQN8IPlGJKB6ZcJPaF7xwje06JNns+0AE=";
121+ })
109122
110123 # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
111124 ./patches/sympy-1.7-update.patch
@@ -115,6 +128,31 @@ stdenv.mkDerivation rec {
115128
116129 # updated eclib output has punctuation changes and tidier whitespace
117130 ./patches/eclib-20210223-test-formatting.patch
131+
132+ # upgrade arb to 2.18.1 (https://trac.sagemath.org/ticket/28623)
133+ (fetchSageDiff {
134+ base = "9.3.beta3";
135+ name = "arb-2.18.1-update.patch";
136+ rev = "0c9c4ed35c2eaf34ae0d19387c07b7f460e4abce";
137+ sha256 = "sha256-CjOJIsyyVCziAfvE6pWSihPO35IZMcY2/taXAsqhPLY=";
138+ })
139+
140+ # giac 1.6.0-47 update (https://trac.sagemath.org/ticket/30537)
141+ (fetchSageDiff {
142+ base = "9.3.beta7";
143+ name = "giac-1.6.0-47-update.patch";
144+ rev = "f05720bf63dfaf33a4e3b6d3ed2c2c0ec46b5d31";
145+ sha256 = "sha256-gDUq+84eXd5GxLBWUSI61GMJpBF2KX4LBVOt3mS1NF8=";
146+ })
147+
148+ # Make gcd/lcm interact better with pari and gmpy2 (https://trac.sagemath.org/ticket/30849)
149+ # needed for pari 2.13.1 update, which we will do in the future
150+ (fetchSageDiff {
151+ base = "9.3.beta0";
152+ name = "make-gcd-lcm-interact-better-with-pari-and-gmpy2.patch";
153+ rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
154+ sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
155+ })
118156 ];
119157
120158 patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
pkgs/development/libraries/arb/default.nix+10−3
@@ -1,14 +1,21 @@
1−{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, mpir
5+, gmp
6+, mpfr
7+, flint
8+}:
29
310stdenv.mkDerivation rec {
411 pname = "arb";
5− version = "2.17.0";
12+ version = "2.19.0";
613
714 src = fetchFromGitHub {
815 owner = "fredrik-johansson";
916 repo = pname;
1017 rev = version;
11− sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
18+ sha256 = "sha256-J/LQVZ8gmssazE7ru89EtvW6cVjaLEHgUHuwjW1nuOE=";
1219 };
1320
1421 buildInputs = [ mpir gmp mpfr flint ];
pkgs/development/libraries/science/math/rankwidth/default.nix+3−3
@@ -4,18 +4,18 @@
44
55stdenv.mkDerivation rec {
66 pname = "rankwidth";
7− version = "0.7";
7+ version = "0.9";
88
99 src = fetchurl {
1010 url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
11− sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
11+ sha256 = "sha256-weA1Bv4lzfy0KMBR/Fay0q/7Wwb7o/LOdWYxRmvvtEE=";
1212 };
1313
1414 configureFlags = [
1515 "--enable-executable=no" # no igraph dependency
1616 ];
1717
18− # check phase is empty for now (as of version 0.7)
18+ # check phase is empty for now (as of version 0.9)
1919 doCheck = true;
2020
2121 meta = with lib; {
pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patchnew file+39
@@ -0,0 +1,39 @@
1+commit 433a8b99da9d71e96434bd421c2468cbda29d37c
2+Author: Mauricio Collares <mauricio@collares.org>
3+Date: Tue Mar 2 22:07:11 2021 -0300
4+
5+ trim logfile information from pari 2.13 output
6+
7+ Pari (since commit 609fb01faf827d91dfa9136849a647a3bbfe8036) prints
8+ extra logfile information such as
9+
10+ [logfile is "/tmp/nix-shell.2BquN9/home/.sympow/datafiles/P02HM.txt"]
11+
12+ which messes up sympow's parsing. This commit reuses the same trimming
13+ mechanism already in sympow to trim this new message.
14+
15+diff --git a/Configure b/Configure
16+index 1ef9756..776bec2 100755
17+--- a/Configure
18++++ b/Configure
19+@@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE
20+ echo " \$(MKDIR) -p datafiles" >> $FILE
21+ echo " \$(TOUCH) datafiles/param_data" >> $FILE
22+ echo " \$(SH) armd.sh" >> $FILE
23+-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE
24++echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE
25+ echo "sympow.1: sympow" >> $FILE
26+ echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE
27+ echo "clean:" >> $FILE
28+diff --git a/generate.c b/generate.c
29+index dbb811f..783320c 100644
30+--- a/generate.c
31++++ b/generate.c
32+@@ -148,6 +148,7 @@ static void trimit(char *A)
33+ " -e '"
34+ "/^\?/d" ";"
35+ "/^(/d" ";"
36++ "/logfile /d" ";"
37+ "/Warning:/d" ";"
38+ "/^About to find TOO_BIG/d" ";"
39+ "/^Now working backwards/d" ";"
pkgs/development/libraries/science/math/sympow/default.nix+2
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
2020 sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl";
2121 };
2222
23+ patches = [ ./clean-extra-logfile-output-from-pari.patch ];
24+
2325 postUnpack = ''
2426 patchShebangs .
2527 '';
pkgs/development/python-modules/cysignals/default.nix+11
@@ -1,4 +1,5 @@
11{ lib
2+, fetchpatch
23, fetchPypi
34, buildPythonPackage
45, cython
@@ -16,6 +17,16 @@ buildPythonPackage rec {
1617 sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1";
1718 };
1819
20+ patches = [
21+ # fixes intermittent crashes in Sage tests (including in interfaces/singular.py)
22+ # will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127
23+ (fetchpatch {
24+ name = "fix-verify_exc_value.patch";
25+ url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch";
26+ sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs=";
27+ })
28+ ];
29+
1930 # explicit check:
2031 # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
2132 hardeningDisable = [