nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: jupyter-guile-kernel: Add dependencies to the search path. 

This allows:

  guix environment --ad-hoc jupyter jupyter-guile-kernel \
    -- jupyter notebook

to work out-of-the-box.

* gnu/packages/guile.scm (jupyter-guile-kernel)[arguments]: In
'install-kernel' phase, add '-L' and '-C' flags to 'kernel.json'.
[propagated-inputs]: Remove.
[inputs]: Add GUILE-JSON and GUILE-SIMPLE-ZMQ.
This commit is contained in:
Ludovic Courtès 2018-09-11 15:10:46 +02:00 committed by Ludovic Courtès
parent 828fa94d7a
commit 8539eb5c46
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/guile.scm
View File

@ -2130,9 +2130,13 @@ messaging library.")
(add-after 'install 'install-kernel (add-after 'install 'install-kernel
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dir (string-append (json (assoc-ref inputs "guile-json"))
out "/share/jupyter/kernels/guile"))) (zmq (assoc-ref inputs "guile-simple-zmq"))
(deps (list json zmq))
(dir (string-append
out "/share/jupyter/kernels/guile"))
(effective (target-guile-effective-version)))
;; Install kernel. ;; Install kernel.
(install-file "src/kernel.json" dir) (install-file "src/kernel.json" dir)
@ -2146,13 +2150,30 @@ messaging library.")
(string-append "\"" (assoc-ref inputs "guile") (string-append "\"" (assoc-ref inputs "guile")
"/bin/guile\"")) "/bin/guile\""))
(("-s") (("-s")
(string-append "--no-auto-compile\", \"-s"))) ;; Add '-L' and '-C' flags so that the kernel
;; finds its dependencies.
(let ((-L (map (lambda (item)
(string-append "\"" item
"/share/guile/site/"
effective "\""))
deps))
(-C (map (lambda (item)
(string-append "\"" item
"/lib/guile/"
effective
"/site-ccache\""))
deps)))
(string-append "--no-auto-compile\""
(string-join -L ", \"-L\", "
'prefix)
(string-join -C ", \"-C\", "
'prefix)
", \"-s"))))
#t)))))) #t))))))
(inputs (inputs
`(("openssl" ,openssl) `(("openssl" ,openssl)
("guile" ,guile-2.2))) ("guile" ,guile-2.2)
(propagated-inputs ("guile-json" ,guile-json)
`(("guile-json" ,guile-json)
("guile-simple-zmq" ,guile-simple-zmq))) ("guile-simple-zmq" ,guile-simple-zmq)))
(synopsis "Guile kernel for the Jupyter Notebook") (synopsis "Guile kernel for the Jupyter Notebook")
(description (description