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

sage: don't fix node version

Browse Source
This commit is contained in:
Timo Kaufmann 2018-11-24 20:47:03 +01:00
parent e28a8ed287
commit a0723f1285
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
# is always preferred, see `sage-src.nix` for that. # is always preferred, see `sage-src.nix` for that.
let let
inherit (pkgs) fetchurl symlinkJoin callPackage nodePackages_8_x; inherit (pkgs) fetchurl symlinkJoin callPackage nodePackages;
# https://trac.sagemath.org/ticket/15980 for tracking of python3 support # https://trac.sagemath.org/ticket/15980 for tracking of python3 support
python = pkgs.python2.override { python = pkgs.python2.override {
@ -24,7 +24,7 @@ let
flask-openid = self.callPackage ./flask-openid.nix {}; flask-openid = self.callPackage ./flask-openid.nix {};
python-openid = self.callPackage ./python-openid.nix {}; python-openid = self.callPackage ./python-openid.nix {};
sagenb = self.callPackage ./sagenb.nix { sagenb = self.callPackage ./sagenb.nix {
mathjax = nodePackages_8_x.mathjax; mathjax = nodePackages.mathjax;
}; };
# Package with a cyclic dependency with sage # Package with a cyclic dependency with sage
@ -45,8 +45,8 @@ let
inherit pari_data ecl; inherit pari_data ecl;
inherit singular; inherit singular;
cysignals = python.pkgs.cysignals; cysignals = python.pkgs.cysignals;
three = nodePackages_8_x.three; three = nodePackages.three;
mathjax = nodePackages_8_x.mathjax; mathjax = nodePackages.mathjax;
}; };
# The shell file that gets sourced on every sage start. Will also source # The shell file that gets sourced on every sage start. Will also source
@ -70,7 +70,7 @@ let
inherit sage-env; inherit sage-env;
inherit pynac singular; inherit pynac singular;
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three; three = nodePackages.three;
}; };
# Doesn't actually build anything, just runs sages testsuite. This is a # Doesn't actually build anything, just runs sages testsuite. This is a