swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

sage: import pari 2.15.1 update patch

Browse source
This commit is contained in:
Mauricio Collares 2022-11-17 20:19:36 -03:00
parent 081289609e
commit 3b258a60a6
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py
index 86b89632a5..ca8a43b248 100644
--- a/src/sage/geometry/polyhedron/backend_normaliz.py
+++ b/src/sage/geometry/polyhedron/backend_normaliz.py
@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds
1.732050807568878?
sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists
sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field
- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]]
+ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]]
"""
from sage.rings.qqbar import number_field_elements_from_algebraics
numbers = []
diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py
index d2b20f1891..6c31efe239 100644
--- a/src/sage/lfunctions/pari.py
+++ b/src/sage/lfunctions/pari.py
@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents):
0.0374412812685155
sage: lfun_eta_quotient([6],[4])
- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1]
+ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1]
sage: lfun_eta_quotient([2,1,4], [5,-2,-2])
Traceback (most recent call last):

16
pkgs/applications/science/math/sage/sage-src.nix
View file

@ -147,6 +147,22 @@ stdenv.mkDerivation rec {
sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U=";
})
# https://trac.sagemath.org/ticket/34537
(fetchSageDiff {
name = "pari-2.15.1-upgrade.patch";
squashed = true;
base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1
rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a";
sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc=";
excludes = ["build/*"
"src/sage/geometry/polyhedron/base_number_field.py"
"src/sage/geometry/polyhedron/backend_normaliz.py"
"src/sage/lfunctions/pari.py"];
})
# Some files were excluded from the above patch due to
# conflicts. The patch below contains rebased versions.
./patches/pari-2.15.1-upgrade-rebased.patch
# Sage uses mixed integer programs (MIPs) to find edge disjoint
# spanning trees. For some reason, aarch64 glpk takes much longer
# than x86_64 glpk to solve such MIPs. Since the MIP formulation