diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-06-16 18:15:38 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-06-16 19:33:11 +0200 |
| commit | 7146c8c75d5b389d648bfada1e1a59c302036dd5 (patch) | |
| tree | 6e0909cdc7b95a4a00e3f0c49513495758341138 /gnu/packages/machine-learning.scm | |
| parent | 4febc38d9f398a44e2f72eb6fa71145421c117a3 (diff) | |
| download | guix-7146c8c75d5b389d648bfada1e1a59c302036dd5.tar guix-7146c8c75d5b389d648bfada1e1a59c302036dd5.tar.gz | |
gnu: python-ipython: Use python-prompt-toolkit-2.
This prevents conflicting variants of python-prompt-toolkit from being
installed, which prevented jupyter from being installed.
* gnu/packages/python-xyz.scm (python-ipython)[propagated-inputs]: Replace
python-prompt-toolkit with python-prompt-toolkit-2.
(python-widgetsnbextension)[propagated-inputs]: Do not use
prompt-toolkit-2-instead-of-prompt-toolkit on python-ipykernel.
(python-ipywidgets)[propagated-inputs]: Do not use
prompt-toolkit-2-instead-of-prompt-toolkit on python-ipython.
(python-jupyter-console)[propagated-inputs]: Do not use
prompt-toolkit-2-instead-of-prompt-toolkit on python-ipykernel.
(prompt-toolkit-2-instead-of-prompt-toolkit): Remove variable.
* gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Do not
use prompt-toolkit-2-instead-of-prompt-toolkit on python-ipython.
Diffstat (limited to 'gnu/packages/machine-learning.scm')
| -rw-r--r-- | gnu/packages/machine-learning.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0e11da41ca..cc69aa3ec1 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1817,8 +1817,7 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) + `(("ipython" ,python-ipython) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) |