sage: 8.5.beta3 -> 8.5.beta4
This commit is contained in:
parent
2a87caa892
commit
90cebaf828
@ -0,0 +1,19 @@
|
||||
diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
|
||||
index bdde6aa60f..50459534f8 100644
|
||||
--- a/src/sage/libs/gap/util.pyx
|
||||
+++ b/src/sage/libs/gap/util.pyx
|
||||
@@ -165,14 +165,6 @@ def gap_root():
|
||||
sage: from sage.libs.gap.util import gap_root
|
||||
sage: gap_root() # random output
|
||||
'/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
|
||||
-
|
||||
- If GAP_ROOT_DIR is undefined or pointing to the wrong location,
|
||||
- fall back code should be used to determine gapdir::
|
||||
-
|
||||
- sage: import os
|
||||
- sage: os.system("GAP_ROOT_DIR=/not_a_path sage -c \"sage.libs.gap.util.gap_root()\"")
|
||||
- The gap-4.5.5.spkg (or later) seems to be not installed!
|
||||
- ...
|
||||
"""
|
||||
import os.path
|
||||
if os.path.exists(GAP_ROOT_DIR):
|
@ -9,14 +9,14 @@
|
||||
# all get the same sources with the same patches applied.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.5.beta3";
|
||||
version = "8.5.beta4";
|
||||
name = "sage-src-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagemath";
|
||||
repo = "sage";
|
||||
rev = version;
|
||||
sha256 = "1nhhx576188q87ma7yygp1mgqs2mcjk89cy4dqibzbv0vmhasz3c";
|
||||
sha256 = "0x8zi5c1glw5h7231yxdyklmf1vgrvf0zvzwa4qwnm7x2nky62zf";
|
||||
};
|
||||
|
||||
# Patches needed because of particularities of nix or the way this is packaged.
|
||||
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
||||
# tests) are also run. That is necessary to test dochtml individually. See
|
||||
# https://trac.sagemath.org/ticket/26110 for an upstream discussion.
|
||||
./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
|
||||
|
||||
./patches/no-invalid-gap-test.patch
|
||||
];
|
||||
|
||||
# Patches needed because of package updates. We could just pin the versions of
|
||||
|
Loading…
Reference in New Issue
Block a user