Merge pull request #116365 from omasanori/sage-9.3

sage: 9.2 -> 9.3
This commit is contained in:
Michael Raskin
2021-04-25 21:17:32 +00:00
committed by GitHub
22 changed files with 654 additions and 465 deletions
@@ -27,6 +27,10 @@ let
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
};
sage_docbuild = self.callPackage ./sage_docbuild.nix {
inherit sage-src;
};
};
};
@@ -46,14 +50,16 @@ let
logo64 = "${sage-src}/doc/common/themes/sage/static/sageicon.png";
};
three = callPackage ./threejs-sage.nix { };
# A bash script setting various environment variables to tell sage where
# the files its looking fore are located. Also see `sage-env`.
env-locations = callPackage ./env-locations.nix {
inherit pari_data;
inherit singular maxima-ecl;
inherit three;
ecl = maxima-ecl.ecl;
cysignals = python3.pkgs.cysignals;
three = nodePackages.three;
mathjax = nodePackages.mathjax;
};
@@ -61,6 +67,7 @@ let
# the env-locations file.
sage-env = callPackage ./sage-env.nix {
sagelib = python3.pkgs.sagelib;
sage_docbuild = python3.pkgs.sage_docbuild;
inherit env-locations;
inherit python3 singular palp flint pynac pythonEnv maxima-ecl;
ecl = maxima-ecl.ecl;
@@ -78,8 +85,8 @@ let
inherit python3 pythonEnv;
inherit sage-env;
inherit pynac singular maxima-ecl;
inherit three;
pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config
three = nodePackages.three;
};
# Doesn't actually build anything, just runs sages testsuite. This is a
@@ -94,6 +101,7 @@ let
pythonRuntimeDeps = with python3.pkgs; [
sagelib
sage_docbuild
cvxopt
networkx
service-identity