diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-06-30 22:30:30 +0200 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2018-06-30 22:30:30 +0200 |
| commit | 70ba6957773d1a6650610d4167edd200c2382879 (patch) | |
| tree | e28d384e31a935246a4cbd875b01ed9d230702a2 /pkgs/applications/science/math/sage | |
| parent | 398dad270a0f23fd6e96c26b5f13805e16fbb66f (diff) | |
| download | nixlib-70ba6957773d1a6650610d4167edd200c2382879.tar nixlib-70ba6957773d1a6650610d4167edd200c2382879.tar.gz nixlib-70ba6957773d1a6650610d4167edd200c2382879.tar.bz2 nixlib-70ba6957773d1a6650610d4167edd200c2382879.tar.lz nixlib-70ba6957773d1a6650610d4167edd200c2382879.tar.xz nixlib-70ba6957773d1a6650610d4167edd200c2382879.tar.zst nixlib-70ba6957773d1a6650610d4167edd200c2382879.zip | |
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.
Diffstat (limited to 'pkgs/applications/science/math/sage')
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch | 31 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 9 |
2 files changed, 37 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch b/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch new file mode 100644 index 000000000000..febab3702771 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch @@ -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) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 448cdd21605e..244a6ea72673 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -27,11 +27,14 @@ stdenv.mkDerivation rec { }) # https://trac.sagemath.org/ticket/25328 + # https://trac.sagemath.org/ticket/25546 + # https://trac.sagemath.org/ticket/25722 (fetchpatch { - name = "respect-jupyter-path.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=029123097d79f2c67bca2d725c470ef667a88ca2"; - sha256 = "0qw9p541ip0kn2gfvn4i05a06p50f3q46847gqfjjgzxhn62znfw"; + name = "install-jupyter-kernel-in-correct-prefix.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=72167b98e3f64326df6b2c78785df25539472fcc"; + sha256 = "0pscnjhm7r2yr2rxnv4kkkq626vwaja720lixa3m3w9rwlxll5a7"; }) + ./patches/test-in-tmpdir.patch # https://trac.sagemath.org/ticket/25358 (fetchpatch { |