public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sage: 8.8.beta6 -> 8.8.beta7

Browse Source
This commit is contained in:
Timo Kaufmann 2019-05-31 15:32:31 +02:00
parent 9f434d7080
commit c76e8fa86e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/math/sage/default.nix
View File

@ -130,7 +130,7 @@ let
singular = pkgs.singular.override { inherit flint; }; singular = pkgs.singular.override { inherit flint; };
# https://trac.sagemath.org/ticket/26625 # https://trac.sagemath.org/ticket/26625
maxima-ecl = pkgs.maxima-ecl-5_41; maxima-ecl = pkgs.maxima-ecl;
# *not* to confuse with the python package "pynac" # *not* to confuse with the python package "pynac"
pynac = pkgs.pynac.override { inherit singular flint; }; pynac = pkgs.pynac.override { inherit singular flint; };

13
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -10,14 +10,14 @@
# all get the same sources with the same patches applied. # all get the same sources with the same patches applied.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.8.beta6"; version = "8.8.beta7";
pname = "sage-src"; pname = "sage-src";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sagemath"; owner = "sagemath";
repo = "sage"; repo = "sage";
rev = version; rev = version;
sha256 = "0n0mpsxnl5kg02k0jlpd34vgk5f162pd3hd5jn821rphffsbzk5j"; sha256 = "08ss24xswnfcyncagqx3g7lvx536nk2qddq7nbpyvbgnc3z3i3r3";
}; };
# Patches needed because of particularities of nix or the way this is packaged. # Patches needed because of particularities of nix or the way this is packaged.
@ -61,7 +61,14 @@ stdenv.mkDerivation rec {
# Since sage unfortunately does not release bugfix releases, packagers must # Since sage unfortunately does not release bugfix releases, packagers must
# fix those bugs themselves. This is for critical bugfixes, where "critical" # fix those bugs themselves. This is for critical bugfixes, where "critical"
# == "causes (transient) doctest failures / somebody complained". # == "causes (transient) doctest failures / somebody complained".
bugfixPatches = [ ]; bugfixPatches = [
# https://trac.sagemath.org/ticket/28036
(fetchpatch {
name = "fix-infinite-loop.patch";
url = "https://git.sagemath.org/sage.git/patch/?id=4d1cf508f9fc19f73e2ec3c82258400009e27dcf";
sha256 = "0pdnzsmr3c38x2i4b2pj81lmqrw5bmd24n2gkmg7bpq5jmf7kpb4";
})
];
# Patches needed because of package updates. We could just pin the versions of # Patches needed because of package updates. We could just pin the versions of
# dependencies, but that would lead to rebuilds, confusion and the burdons of # dependencies, but that would lead to rebuilds, confusion and the burdons of

6
pkgs/top-level/all-packages.nix
View File

@ -22952,12 +22952,6 @@ in
ecl-fasl = true; ecl-fasl = true;
sbcl = null; sbcl = null;
}; };
# old version temporarily kept for sage
maxima-ecl-5_41 = callPackage ../applications/science/math/maxima/5.41.nix {
ecl = ecl_16_1_2;
ecl-fasl = true;
sbcl = null;
};
mxnet = callPackage ../applications/science/math/mxnet { mxnet = callPackage ../applications/science/math/mxnet {
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;