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

sage: don't pin ntl

Browse Source 
Now possible because of the lcalc c++11 patch.
This commit is contained in:
Timo Kaufmann 2018-07-29 23:02:38 +02:00
parent e550e5d0c7
commit 834a24e0ff
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ let
pybrial = self.callPackage ./pybrial.nix {}; pybrial = self.callPackage ./pybrial.nix {};
sagelib = self.callPackage ./sagelib.nix { sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl pari eclib ntl arb; inherit flint ecl pari eclib arb;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
linbox = nixpkgs.linbox.override { withSage = true; }; linbox = nixpkgs.linbox.override { withSage = true; };
}; };
@ -45,13 +45,13 @@ let
}; };
sage-env = self.callPackage ./sage-env.nix { sage-env = self.callPackage ./sage-env.nix {
inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv giac ntl; inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
}; };
sage-with-env = self.callPackage ./sage-with-env.nix { sage-with-env = self.callPackage ./sage-with-env.nix {
inherit pari eclib pythonEnv ntl; inherit pari eclib pythonEnv;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular giac; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three; three = nodePackages_8_x.three;
}; };
@ -106,31 +106,20 @@ 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; }; arb = nixpkgs.arb.override { inherit flint; };
singular = nixpkgs.singular.override { inherit ntl flint; }; singular = nixpkgs.singular.override { inherit flint; };
# *not* to confuse with the python package "pynac" # *not* to confuse with the python package "pynac"
pynac = nixpkgs.pynac.override { inherit singular flint; }; pynac = nixpkgs.pynac.override { inherit singular flint; };
eclib = nixpkgs.eclib.override { inherit pari ntl; }; eclib = nixpkgs.eclib.override { inherit pari; };
# With openblas (64 bit), the tests fail the same way as when sage is build with # 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 # openblas instead of openblasCompat. Apparently other packages somehow use flints
# blas when it is available. Alternative would be to override flint to use # blas when it is available. Alternative would be to override flint to use
# openblasCompat. # openblasCompat.
flint = nixpkgs.flint.override { withBlas = false; inherit ntl; }; flint = nixpkgs.flint.override { withBlas = false; };
# Multiple palp dimensions need to be available and sage expects them all to be # Multiple palp dimensions need to be available and sage expects them all to be
# in the same folder. # in the same folder.

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

@ -110,6 +110,7 @@ stdenv.mkDerivation rec {
name = "pari-2.11.0.patch"; name = "pari-2.11.0.patch";
url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584"; url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584";
sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank"; sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank";
})
# ntl upgrade # ntl upgrade
(fetchpatch { (fetchpatch {