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

Merge pull request #174139 from collares/sage-kernelspec

Browse Source 
sage: fix passthru.kernelspec regression
This commit is contained in:
Timo Kaufmann 2022-05-26 21:06:26 +02:00 committed by GitHub
commit d6ed7b20f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,6 +172,6 @@ let
in
# A wrapper around sage that makes sure sage finds its docs (if they were build).
callPackage ./sage.nix {
inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs;
inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs;
inherit withDoc requireSageTests;
}

3
pkgs/applications/science/math/sage/sage.nix
View File

@ -2,6 +2,7 @@
, makeWrapper
, sage-tests
, sage-with-env
, jupyter-kernel-definition
, jupyter-kernel-specs
, sagedoc
, withDoc
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m
doc = sagedoc;
lib = sage-with-env.env.lib;
kernelspec = jupyter-kernel-specs.definition.sagemath;
kernelspec = jupyter-kernel-definition;
};
meta = with lib; {