mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
sage: replace JUPYTER_PATH patch by upstream patch
The patch was replaced by a better upstream patch that doesn't mvoe the jupyter dir to the user's home.
This commit is contained in:
parent
398dad270a
commit
70ba695777
|
@ -0,0 +1,31 @@
|
||||||
|
diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py
|
||||||
|
index aa23c8405d..8a87de0591 100644
|
||||||
|
--- a/src/sage/repl/ipython_kernel/install.py
|
||||||
|
+++ b/src/sage/repl/ipython_kernel/install.py
|
||||||
|
@@ -112,7 +112,7 @@ class SageKernelSpec(object):
|
||||||
|
EXAMPLES::
|
||||||
|
|
||||||
|
sage: from sage.repl.ipython_kernel.install import SageKernelSpec
|
||||||
|
- sage: spec = SageKernelSpec()
|
||||||
|
+ sage: spec = SageKernelSpec(prefix = tmp_dir())
|
||||||
|
sage: spec.use_local_mathjax()
|
||||||
|
sage: mathjax = os.path.join(spec.nbextensions_dir, 'mathjax')
|
||||||
|
sage: os.path.isdir(mathjax)
|
||||||
|
@@ -129,7 +129,7 @@ class SageKernelSpec(object):
|
||||||
|
EXAMPLES::
|
||||||
|
|
||||||
|
sage: from sage.repl.ipython_kernel.install import SageKernelSpec
|
||||||
|
- sage: spec = SageKernelSpec()
|
||||||
|
+ sage: spec = SageKernelSpec(prefix = tmp_dir())
|
||||||
|
sage: spec.use_local_jsmol()
|
||||||
|
sage: jsmol = os.path.join(spec.nbextensions_dir, 'jsmol')
|
||||||
|
sage: os.path.isdir(jsmol)
|
||||||
|
@@ -146,7 +146,7 @@ class SageKernelSpec(object):
|
||||||
|
EXAMPLES::
|
||||||
|
|
||||||
|
sage: from sage.repl.ipython_kernel.install import SageKernelSpec
|
||||||
|
- sage: spec = SageKernelSpec()
|
||||||
|
+ sage: spec = SageKernelSpec(prefix = tmp_dir())
|
||||||
|
sage: spec.use_local_threejs()
|
||||||
|
sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs')
|
||||||
|
sage: os.path.isdir(threejs)
|
|
@ -27,11 +27,14 @@ stdenv.mkDerivation rec {
|
||||||
})
|
})
|
||||||
|
|
||||||
# https://trac.sagemath.org/ticket/25328
|
# https://trac.sagemath.org/ticket/25328
|
||||||
|
# https://trac.sagemath.org/ticket/25546
|
||||||
|
# https://trac.sagemath.org/ticket/25722
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "respect-jupyter-path.patch";
|
name = "install-jupyter-kernel-in-correct-prefix.patch";
|
||||||
url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=029123097d79f2c67bca2d725c470ef667a88ca2";
|
url = "https://git.sagemath.org/sage.git/patch?id=72167b98e3f64326df6b2c78785df25539472fcc";
|
||||||
sha256 = "0qw9p541ip0kn2gfvn4i05a06p50f3q46847gqfjjgzxhn62znfw";
|
sha256 = "0pscnjhm7r2yr2rxnv4kkkq626vwaja720lixa3m3w9rwlxll5a7";
|
||||||
})
|
})
|
||||||
|
./patches/test-in-tmpdir.patch
|
||||||
|
|
||||||
# https://trac.sagemath.org/ticket/25358
|
# https://trac.sagemath.org/ticket/25358
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
|
|
Loading…
Reference in a new issue