git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54202 from timokau/sage-8.6

sage: 8.5 -> 8.6

commit73368f468a0f1514c5eaf0974266b98be26540c0 authorTimo Kaufmann <timokau@zoho.com> dateThu 17 Jan 2019, 21:12 (8 years ago) parent2195c59471ba67
7 files changed+17−91
pkgs/applications/science/math/sage/env-locations.nix+2−2 pkgs/applications/science/math/sage/patches/dont-test-guess-gaproot.patch−13 pkgs/applications/science/math/sage/sage-env.nix+5−7 pkgs/applications/science/math/sage/sage-src.nix+6−22 pkgs/applications/science/math/sage/sage-with-env.nix+2−4 pkgs/applications/science/math/sage/sagelib.nix+2−2 pkgs/top-level/all-packages.nix−41
pkgs/applications/science/math/sage/env-locations.nix+2−2
@@ -7,7 +7,7 @@
77, graphs
88, elliptic_curves
99, polytopes_db
10−, gap-libgap-compatible
10+, gap
1111, ecl
1212, combinatorial_designs
1313, jmol
@@ -35,7 +35,7 @@ writeTextFile rec {
3535 export GRAPHS_DATA_DIR='${graphs}/share/graphs'
3636 export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
3737 export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
38− export GAP_ROOT_DIR='${gap-libgap-compatible}/share/gap/build-dir'
38+ export GAP_ROOT_DIR='${gap}/share/gap/build-dir'
3939 export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
4040 export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
4141 export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
pkgs/applications/science/math/sage/patches/dont-test-guess-gaproot.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
2−index 5ff67107c1..1318df86fd 100644
3−--- a/src/sage/libs/gap/util.pyx
4−+++ b/src/sage/libs/gap/util.pyx
5−@@ -165,7 +165,7 @@ def _guess_gap_root():
6− EXAMPLES::
7−
8− sage: from sage.libs.gap.util import _guess_gap_root
9−- sage: _guess_gap_root()
10−+ sage: _guess_gap_root() # not tested (not necessary on nixos)
11− The gap-4.5.5.spkg (or later) seems to be not installed!
12− ...
13− """
pkgs/applications/science/math/sage/sage-env.nix+5−7
@@ -14,8 +14,7 @@
1414, python3
1515, pkg-config
1616, pari
17−, gap-libgap-compatible
18−, libgap
17+, gap
1918, ecl
2019, maxima-ecl
2120, singular
@@ -70,8 +69,7 @@ let
7069 binutils.bintools
7170 pkg-config
7271 pari
73− gap-libgap-compatible
74− libgap
72+ gap
7573 ecl
7674 maxima-ecl
7775 singular
@@ -118,7 +116,7 @@ writeTextFile rec {
118116
119117 # set dependent vars, like JUPYTER_CONFIG_DIR
120118 source "${sagelib.src}/src/bin/sage-env"
121− export PATH="${runtimepath}:$orig_path" # sage-env messes with PATH
119+ export PATH="$RUNTIMEPATH_PREFIX:${runtimepath}:$orig_path" # sage-env messes with PATH
122120
123121 export SAGE_LOGS="$TMPDIR/sage-logs"
124122 export SAGE_DOC="''${SAGE_DOC_OVERRIDE:-doc-placeholder}"
@@ -133,7 +131,7 @@ writeTextFile rec {
133131 export LDFLAGS='${
134132 lib.concatStringsSep " " (map (pkg: "-L${pkg}/lib") [
135133 flint
136− libgap
134+ gap
137135 glpk
138136 gmp
139137 mpfr
@@ -153,7 +151,7 @@ writeTextFile rec {
153151 gmp.dev
154152 glpk
155153 flint
156− libgap
154+ gap
157155 pynac
158156 mpfr.dev
159157 ])
pkgs/applications/science/math/sage/sage-src.nix+6−22
@@ -9,14 +9,14 @@
99# all get the same sources with the same patches applied.
1010
1111stdenv.mkDerivation rec {
12− version = "8.5";
12+ version = "8.6";
1313 name = "sage-src-${version}";
1414
1515 src = fetchFromGitHub {
1616 owner = "sagemath";
1717 repo = "sage";
1818 rev = version;
19− sha256 = "08mb9626phsls2phdzqxsnp2df5pn5qr72m0mm4nncby26pwn19c";
19+ sha256 = "1vs3pbgbqpg0qnwr018bqsdmm7crgjp310cx8zwh7za3mv1cw5j3";
2020 };
2121
2222 # Patches needed because of particularities of nix or the way this is packaged.
@@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
4646 # tests) are also run. That is necessary to test dochtml individually. See
4747 # https://trac.sagemath.org/ticket/26110 for an upstream discussion.
4848 ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
49−
50− ./patches/dont-test-guess-gaproot.patch
5149 ];
5250
5351 # Patches needed because of package updates. We could just pin the versions of
@@ -60,12 +58,13 @@ stdenv.mkDerivation rec {
6058 # Fetch a diff between `base` and `rev` on sage's git server.
6159 # Used to fetch trac tickets by setting the `base` to the last release and the
6260 # `rev` to the last commit of the ticket.
63− fetchSageDiff = { base, rev, ...}@args: (
61+ fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
6462 fetchpatch ({
65− url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
63+ inherit name;
64+ url = "https://git.sagemath.org/sage.git/rawdiff?id2=${base}&id=${rev}";
6665 # We don't care about sage's own build system (which builds all its dependencies).
6766 # Exclude build system changes to avoid conflicts.
68− excludes = [ "build/*" ];
67+ excludes = [ "/build/*" ];
6968 } // builtins.removeAttrs args [ "rev" "base" ])
7069 );
7170 in [
@@ -82,21 +81,6 @@ stdenv.mkDerivation rec {
8281 # https://trac.sagemath.org/ticket/26315
8382 ./patches/giac-1.5.0.patch
8483
85− # https://trac.sagemath.org/ticket/26326
86− # needs to be split because there is a merge commit in between
87− (fetchSageDiff {
88− name = "networkx-2.2-1.patch";
89− base = "8.4";
90− rev = "68f5ad068184745b38ba6716bf967c8c956c52c5";
91− sha256 = "112b5ywdqgyzgvql2jj5ss8la9i8rgnrzs8vigsfzg4shrcgh9p6";
92− })
93− (fetchSageDiff {
94− name = "networkx-2.2-2.patch";
95− base = "626485bbe5f33bf143d6dfba4de9c242f757f59b~1";
96− rev = "db10d327ade93711da735a599a67580524e6f7b4";
97− sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
98− })
99−
10084 # https://trac.sagemath.org/ticket/26442
10185 (fetchSageDiff {
10286 name = "cypari2-2.0.3.patch";
pkgs/applications/science/math/sage/sage-with-env.nix+2−4
@@ -6,8 +6,7 @@
66, pkg-config
77, three
88, singular
9−, libgap
10−, gap-libgap-compatible
9+, gap
1110, giac
1211, maxima-ecl
1312, pari
@@ -35,8 +34,7 @@ let
3534 three
3635 pynac
3736 giac
38− libgap
39− gap-libgap-compatible
37+ gap
4038 pari
4139 gmp
4240 gfan
pkgs/applications/science/math/sage/sagelib.nix+2−2
@@ -20,7 +20,7 @@
2020, jinja2
2121, lcalc
2222, lrcalc
23−, libgap
23+, gap
2424, linbox
2525, m4ri
2626, m4rie
@@ -88,7 +88,7 @@ buildPythonPackage rec {
8888 glpk
8989 gsl
9090 lcalc
91− libgap
91+ gap
9292 libmpc
9393 linbox
9494 lrcalc
pkgs/top-level/all-packages.nix−41
@@ -10822,47 +10822,6 @@ in
1082210822
1082310823 libgadu = callPackage ../development/libraries/libgadu { };
1082410824
10825− # Deprecated since gap itself now ships with a library component. This is
10826− # still necessary for sage 8.5 but will be removed once we switch to sage
10827− # 8.6.
10828− gap-libgap-compatible = let
10829− version = "4r8p6";
10830− pkgVer = "2016_11_12-14_25";
10831− in
10832− (gap.override { packageSet = "minimal"; }).overrideAttrs (oldAttrs: {
10833− name = "libgap-${oldAttrs.pname}-${version}";
10834− inherit version;
10835− src = fetchurl {
10836− url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2";
10837− sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b";
10838− };
10839− # libgap targets not yet available for 4r8p6
10840− installPhase = ''
10841− mkdir -p "$out/bin" "$out/share/gap/"
10842−
10843− mkdir -p "$out/share/gap"
10844− echo "Copying files to target directory"
10845− cp -ar . "$out/share/gap/build-dir"
10846−
10847− makeWrapper "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" \
10848− --set GAP_DIR $out/share/gap/build-dir
10849− '';
10850− patches = [
10851− # don't install any packages by default (needed for interop with libgap, probably obsolete with 4r10
10852− (fetchpatch {
10853− url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/nodefaultpackages.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
10854− sha256 = "1xwj766m3axrxbkyx13hy3q8s2wkqxy3m6mgpwq3c3n4vk3v416v";
10855− })
10856−
10857− # fix infinite loop in writeandcheck() when writing an error message fails.
10858− (fetchpatch {
10859− url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
10860− sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1";
10861− })
10862− ];
10863− });
10864− libgap = callPackage ../development/libraries/libgap { };
10865−
1086610825 libgda = callPackage ../development/libraries/libgda { };
1086710826
1086810827 libgdamm = callPackage ../development/libraries/libgdamm { };