diff options
author | Timo Kaufmann <timokau@zoho.com> | 2018-07-08 23:07:41 +0200 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2018-07-18 14:58:38 +0200 |
commit | cad446513eb011f0ba88279c585d3678646fe0f3 (patch) | |
tree | 61b62be1d256091279e1aab17717c4f1f23a4bba /pkgs/applications/science/math | |
parent | 98792fe35152d3470929b40ad83359b605233a76 (diff) | |
download | nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.tar nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.tar.gz nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.tar.bz2 nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.tar.lz nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.tar.xz nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.tar.zst nixlib-cad446513eb011f0ba88279c585d3678646fe0f3.zip |
ntl: 9.11.0 -> 11.2.1
ntl hasn't been updated in a while. So I'm doing that and adding myself as the maintainer. I'm also adding some options and pinning the sage dependency, since it is unfortunately not compatible with the latest ntl yet. I've also enabled the tests, since they don't take terribly long and are worth the time in my opinion.
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/sage/default.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index afb230cf4287..1f540cc2b287 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -26,7 +26,7 @@ let pybrial = self.callPackage ./pybrial.nix {}; sagelib = self.callPackage ./sagelib.nix { - inherit flint ecl pari glpk eclib; + inherit flint ecl pari glpk eclib ntl arb; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; linbox = nixpkgs.linbox.override { withSage = true; }; }; @@ -47,13 +47,13 @@ let }; sage-env = self.callPackage ./sage-env.nix { - inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv; + inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv giac ntl; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; sage-with-env = self.callPackage ./sage-with-env.nix { - inherit pari eclib pythonEnv; - inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; + inherit pari eclib pythonEnv ntl; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular giac; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages_8_x.three; }; @@ -108,10 +108,23 @@ let }); }; + # https://trac.sagemath.org/ticket/25532 + ntl = nixpkgs.ntl.overrideAttrs (oldAttrs: rec { + name = "ntl-10.5.0"; + sourceRoot = "${name}/src"; + src = fetchurl { + url = "http://www.shoup.net/ntl/${name}.tar.gz"; + sha256 = "1lmldaldgfr2b2a6585m3np5ds8bq1bis2s1ajycjm49vp4kc2xr"; + }; + }); + + giac = nixpkgs.giac.override { inherit ntl; }; + arb = nixpkgs.arb.override { inherit flint; }; + # update causes issues # https://groups.google.com/forum/#!topic/sage-packaging/cS3v05Q0zso # https://trac.sagemath.org/ticket/24735 - singular = nixpkgs.singular.overrideAttrs (oldAttrs: { + singular = (nixpkgs.singular.override { inherit ntl flint; }).overrideAttrs (oldAttrs: { name = "singular-4.1.0p3"; src = fetchurl { url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-1-0/singular-4.1.0p3.tar.gz"; @@ -121,15 +134,15 @@ let # *not* to confuse with the python package "pynac" # https://trac.sagemath.org/ticket/24838 (depends on arb update) - pynac = nixpkgs.pynac.override { inherit singular; }; + pynac = nixpkgs.pynac.override { inherit singular flint; }; - eclib = nixpkgs.eclib.override { inherit pari; }; + eclib = nixpkgs.eclib.override { inherit pari ntl; }; # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use # openblasCompat. - flint = nixpkgs.flint.override { withBlas = false; }; + flint = nixpkgs.flint.override { withBlas = false; inherit ntl; }; # Multiple palp dimensions need to be available and sage expects them all to be # in the same folder. |