tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
0
fork
atom
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
0
fork
atom
overview
issues
pulls
pipelines
sage: import pari 2.15.1 update patch
Mauricio Collares
3 years ago
3b258a60
08128960
+42
2 changed files
expand all
collapse all
unified
split
pkgs
applications
science
math
sage
patches
pari-2.15.1-upgrade-rebased.patch
sage-src.nix
+26
pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch
reviewed
···
1
1
+
diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py
2
2
+
index 86b89632a5..ca8a43b248 100644
3
3
+
--- a/src/sage/geometry/polyhedron/backend_normaliz.py
4
4
+
+++ b/src/sage/geometry/polyhedron/backend_normaliz.py
5
5
+
@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds
6
6
+
1.732050807568878?
7
7
+
sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists
8
8
+
sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field
9
9
+
- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]]
10
10
+
+ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]]
11
11
+
"""
12
12
+
from sage.rings.qqbar import number_field_elements_from_algebraics
13
13
+
numbers = []
14
14
+
diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py
15
15
+
index d2b20f1891..6c31efe239 100644
16
16
+
--- a/src/sage/lfunctions/pari.py
17
17
+
+++ b/src/sage/lfunctions/pari.py
18
18
+
@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents):
19
19
+
0.0374412812685155
20
20
+
21
21
+
sage: lfun_eta_quotient([6],[4])
22
22
+
- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1]
23
23
+
+ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1]
24
24
+
25
25
+
sage: lfun_eta_quotient([2,1,4], [5,-2,-2])
26
26
+
Traceback (most recent call last):
+16
pkgs/applications/science/math/sage/sage-src.nix
reviewed
···
147
147
sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U=";
148
148
})
149
149
150
150
+
# https://trac.sagemath.org/ticket/34537
151
151
+
(fetchSageDiff {
152
152
+
name = "pari-2.15.1-upgrade.patch";
153
153
+
squashed = true;
154
154
+
base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1
155
155
+
rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a";
156
156
+
sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc=";
157
157
+
excludes = ["build/*"
158
158
+
"src/sage/geometry/polyhedron/base_number_field.py"
159
159
+
"src/sage/geometry/polyhedron/backend_normaliz.py"
160
160
+
"src/sage/lfunctions/pari.py"];
161
161
+
})
162
162
+
# Some files were excluded from the above patch due to
163
163
+
# conflicts. The patch below contains rebased versions.
164
164
+
./patches/pari-2.15.1-upgrade-rebased.patch
165
165
+
150
166
# Sage uses mixed integer programs (MIPs) to find edge disjoint
151
167
# spanning trees. For some reason, aarch64 glpk takes much longer
152
168
# than x86_64 glpk to solve such MIPs. Since the MIP formulation