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

sage: 8.5.beta4 -> 8.5.beta5

Browse Source
This commit is contained in:
Timo Kaufmann 2018-11-27 18:26:16 +01:00
parent 2dd9a0ed72
commit 7ca2915a50
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ let
sage-env = callPackage ./sage-env.nix { sage-env = callPackage ./sage-env.nix {
sagelib = python.pkgs.sagelib; sagelib = python.pkgs.sagelib;
inherit env-locations; inherit env-locations;
inherit python rWrapper ecl singular palp flint pynac pythonEnv; inherit python ecl singular palp flint pynac pythonEnv;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
}; };
@ -124,18 +124,6 @@ let
ignoreCollisions = true; ignoreCollisions = true;
} // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible } // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible
# needs to be rWrapper, standard "R" doesn't include default packages
rWrapper = pkgs.rWrapper.override {
# https://trac.sagemath.org/ticket/25674
R = pkgs.R.overrideAttrs (attrs: rec {
name = "R-3.4.4";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";
};
});
};
arb = pkgs.arb.override { inherit flint; }; arb = pkgs.arb.override { inherit flint; };
singular = pkgs.singular.override { inherit flint; }; singular = pkgs.singular.override { inherit flint; };

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

@ -76,6 +76,7 @@ let
singular singular
giac giac
palp palp
# needs to be rWrapper since the default `R` doesn't include R's default libraries
rWrapper rWrapper
gfan gfan
cddlib cddlib

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

@ -9,14 +9,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.5.beta4"; version = "8.5.beta5";
name = "sage-src-${version}"; name = "sage-src-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sagemath"; owner = "sagemath";
repo = "sage"; repo = "sage";
rev = version; rev = version;
sha256 = "0x8zi5c1glw5h7231yxdyklmf1vgrvf0zvzwa4qwnm7x2nky62zf"; sha256 = "1jnlk4y7njkg095kd3rhsi5929k6q90lzgyb7pshsjz251866nyv";
}; };
# 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.
@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
); );
in [ in [
# New glpk version has new warnings, filter those out until upstream sage has found a solution # New glpk version has new warnings, filter those out until upstream sage has found a solution
# Should be fixed with glpk > 4.65.
# https://trac.sagemath.org/ticket/24824 # https://trac.sagemath.org/ticket/24824
./patches/pari-stackwarn.patch # not actually necessary since the pari upgrade, but necessary for the glpk patch to apply ./patches/pari-stackwarn.patch # not actually necessary since the pari upgrade, but necessary for the glpk patch to apply
(fetchpatch { (fetchpatch {
@ -78,14 +79,6 @@ stdenv.mkDerivation rec {
stripLen = 1; stripLen = 1;
}) })
# needed for ntl update
# https://trac.sagemath.org/ticket/25532
(fetchpatch {
name = "lcalc-c++11.patch";
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa";
sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb";
})
(fetchpatch { (fetchpatch {
name = "cython-0.29.patch"; name = "cython-0.29.patch";
url = "https://git.sagemath.org/sage.git/patch/?h=f77de1d0e7f90ee12761140500cb8cbbb789ab20"; url = "https://git.sagemath.org/sage.git/patch/?h=f77de1d0e7f90ee12761140500cb8cbbb789ab20";