TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: jupyter-guile-kernel: Update to f25fb90 and build with Guile 3.

Browse source 
* gnu/packages/guile-xyz.scm (jupyter-guile-kernel): Update
to f25fb90.  Re-indent package definition (using indent.el)
[phases]: Replace /home with /usr/local
[inputs]: Use GUILE-3.0 instead of GUILE-2.2, and GUILE-JSON-3 instead
of GUILE-JSON-1.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jesse Gibbons 2020-07-17 08:56:47 -06:00 committed by Ludovic Courtès
parent 3a27a3dc8f
commit c984b70ccb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/guile-xyz.scm
View file

@ -29,6 +29,7 @@
;;; Copyright © 2020 Julien Lepiler <julien@lepiller.eu> ;;; Copyright © 2020 Julien Lepiler <julien@lepiller.eu>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Masaya Tojo <masaya@tojo.tokyo> ;;; Copyright © 2020 Masaya Tojo <masaya@tojo.tokyo>
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -935,8 +936,8 @@ (define-public guile3.0-simple-zmq
(deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq))
(define-public jupyter-guile-kernel (define-public jupyter-guile-kernel
(let ((commit "a7db9245a886e104138474df46c3e88b95cff629") (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304")
(revision "1")) (revision "2"))
(package (package
(name "jupyter-guile-kernel") (name "jupyter-guile-kernel")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -949,7 +950,7 @@ (define-public jupyter-guile-kernel
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) "0zr1fasdb2yv9kn21yll993y9higqss4jnfs030ndhjb93raa9sr"))))
(build-system guile-build-system) (build-system guile-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -984,7 +985,7 @@ (define-public jupyter-guile-kernel
;; Fix hard-coded file name in the kernel. ;; Fix hard-coded file name in the kernel.
(substitute* (string-append dir "/kernel.json") (substitute* (string-append dir "/kernel.json")
(("/home/.*/guile-jupyter-kernel.scm") (("/usr/local/.*/guile-jupyter-kernel.scm")
(string-append out "/share/guile/site/" (string-append out "/share/guile/site/"
(target-guile-effective-version) (target-guile-effective-version)
"/guile-jupyter-kernel.scm")) "/guile-jupyter-kernel.scm"))
@ -1005,17 +1006,17 @@ (define-public jupyter-guile-kernel
effective effective
"/site-ccache\"")) "/site-ccache\""))
deps))) deps)))
(string-append "--no-auto-compile\"" (string-append "--no-auto-compile\""
(string-join -L ", \"-L\", " (string-join -L ", \"-L\", "
'prefix) 'prefix)
(string-join -C ", \"-C\", " (string-join -C ", \"-C\", "
'prefix) 'prefix)
", \"-s")))) ", \"-s"))))
#t)))))) #t))))))
(inputs (inputs
`(("openssl" ,openssl) `(("openssl" ,openssl)
("guile" ,guile-2.2) ("guile" ,guile-3.0)
("guile-json" ,guile-json-1) ("guile-json" ,guile-json-3)
("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