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

sage: unpin nodePackage version

Browse Source
This commit is contained in:
Jörg Thalheim 2018-11-16 15:32:39 +00:00
parent e81b1a06be
commit 131f2e93b6
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
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

@ -3,7 +3,7 @@
}: }:
let let
inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x; inherit (nixpkgs) fetchpatch 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 = nixpkgs.python2.override { python = nixpkgs.python2.override {
@ -26,7 +26,7 @@ let
}; };
sagenb = self.callPackage ./sagenb.nix { sagenb = self.callPackage ./sagenb.nix {
mathjax = nodePackages_8_x.mathjax; mathjax = nodePackages.mathjax;
}; };
sagedoc = self.callPackage ./sagedoc.nix { sagedoc = self.callPackage ./sagedoc.nix {
@ -36,8 +36,8 @@ let
env-locations = self.callPackage ./env-locations.nix { env-locations = self.callPackage ./env-locations.nix {
inherit pari_data ecl; inherit pari_data ecl;
inherit singular; inherit singular;
three = nodePackages_8_x.three; three = nodePackages.three;
mathjax = nodePackages_8_x.mathjax; mathjax = nodePackages.mathjax;
}; };
sage-env = self.callPackage ./sage-env.nix { sage-env = self.callPackage ./sage-env.nix {
@ -49,7 +49,7 @@ let
inherit pythonEnv; inherit pythonEnv;
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;
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.three;
}; };
sage = self.callPackage ./sage.nix { }; sage = self.callPackage ./sage.nix { };