Move the 3 lisp libraries that are not in lisp-xyz.scm with the others.
* gnu/packages/machine-learning.scm (sbcl-cl-libsvm-format, cl-libsvm-format,
ecl-cl-libsvm-format, sbcl-cl-online-learning, cl-online-learning,
ecl-cl-online-learning, sbcl-cl-random-forest, cl-random-forest,
ecl-cl-random-forest): Move to ...
* gnu/packages/lisp-xyz.scm (sbcl-cl-libsvm-format, cl-libsvm-format,
ecl-cl-libsvm-format, sbcl-cl-online-learning, cl-online-learning,
ecl-cl-online-learning, sbcl-cl-random-forest, cl-random-forest,
ecl-cl-random-forest): ... here.
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.
* gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Pin
implicit python-prompt-toolkit dependency to version 2.
* gnu/packages/python-xyz.scm (python-widgetsnbextension)[propagated-inputs]:
Pin implicit python-prompt-toolkit dependency to version 2.
(python-ipywidgets)[propagated-inputs]: Pin implicit python-prompt-toolkit
dependency to version 2.
(python-jupyter-console)[propagated-inputs]: Pin explicit
python-prompt-toolkit dependency to version 2.
(python-prompt-toolkit): Update to version 3.0.5.
[propagated-inputs]: Remove PYTHON-SIX and PYTHON-PYGMENTS.
[home-page]: Adjust to current.
(python-prompt-toolkit-2): New variable.
(prompt-toolkit-2-instead-of-prompt-toolkit): New variable.
(python2-prompt-toolkit): Keep at version 2.
(python-prompt-toolkit-1): Inherit from version 2.
Signed-off-by: Marius Bakke <marius@gnu.org>
* gnu/packages/machine-learning.scm (tensorflow)[arguments]: Also import
python-version from python-build-system. Adjust 'python3.7-compatibility
to also add python-3.8 compatibility. Adjust 'install-python to not
hardcode the python version.
* gnu/packages/machine-learning.scm (kaldi-gstreamer-server): Update to
0-2.f68cab4.
[inputs]: Replace python-2 with python-wrapper, python2-pygobject with
python-pygobject, python2-pyyaml with python-pyyaml, and python2-tornado with
python-tornado; remove python2-ws4py-for-kaldi-gstreamer-server and
python2-futures.
This is a follow-up to commit 546893c2965c8114e4d7cfe1de46c46664ec4b9e.
* gnu/packages/machine-learning.scm (python-scikit-learn)[properties]: New field.
(python2-scikit-learn)[version, source]: New fields.
* gnu/packages/machine-learning.scm (grpc)[outputs]: Add static.
[arguments]: Copy configure-flags from cmake-build-system. Add custom
phases 'configure-shared, 'install-shared-libraries and 'move-static-libs
to build shared libs and move static libs to their own output.
(tensorflow)[native-inputs]: Add grpc:static.
* gnu/local.mk: Include lisp-xyz.scm.
* gnu/packages/lisp-xyz.scm: New file.
* gnu/packages/lisp.scm: Move all lisp libraries to lisp-xyz.scm, uglify-js to
javascript.scm and stumpwm to wm.scm.
* gnu/packages/javascript.scm: Add uglify-js.
* gnu/packages/wm.scm: Add stumpwm.
* gnu/packages/bioinformatics.scm: Find uglify-js in javascript.scm.
* gnu/packages/machine-learning.scm: Depend on lisp-xyz.scm instead of lisp.scm.
* gnu/packages/web.scm: Find uglify-js in javascript.scm.
* gnu/packages/web-browsers.scm: Depend on lisp-xyz.scm instead of lisp.scm.
* guix/build-system/minify.scm (default-uglify-js): Find uglify-js in
javascript module instead of lisp.
* gnu/local.mk: Include lisp-xyz.scm.
* gnu/packages/lisp-xyz.scm: New file.
* gnu/packages/lisp.scm: Move all lisp libraries to lisp-xyz.scm, uglify-js to
javascript.scm and stumpwm to wm.scm.
* gnu/packages/javascript.scm: Add uglify-js.
* gnu/packages/wm.scm: Add stumpwm.
* gnu/packages/bioinformatics.scm: Find uglify-js in javascript.scm.
* gnu/packages/machine-learning.scm: Depend on lisp-xyz.scm instead of lisp.scm.
* gnu/packages/web.scm: Find uglify-js in javascript.scm.
* gnu/packages/web-browsers.scm: Depend on lisp-xyz.scm instead of lisp.scm.
* guix/build-system/minify.scm (default-uglify-js): Find uglify-js in
javascript module instead of lisp.
* gnu/local.mk: Include lisp-xyz.scm.
* gnu/packages/lisp-xyz.scm: New file.
* gnu/packages/lisp.scm: Move all lisp libraries to lisp-xyz.scm, uglify-js to
javascript.scm and stumpwm to wm.scm.
* gnu/packages/javascript.scm: Add uglify-js.
* gnu/packages/wm.scm: Add stumpwm.
* gnu/packages/bioinformatics.scm: Find uglify-js in javascript.scm.
* gnu/packages/machine-learning.scm: Depend on lisp-xyz.scm instead of lisp.scm.
* gnu/packages/web.scm: Find uglify-js in javascript.scm.
* gnu/packages/web-browsers.scm: Depend on lisp-xyz.scm instead of lisp.scm.
Ludovic Courtès
Guillaume Le Vaillant
Efraim Flashner
Ricardo Wurmus
Tobias Geerinckx-Rice
Edouard Klein
Marius Bakke
Konrad Hinsen
Roel Janssen
Vagrant Cascadian
Brett Gilio
Pierre Neidhardt
Giacomo Leidi