[bug#42461] [PATCH 0/2] gnu: fix guile-based Jupyter kernels

[bug#42461] [PATCH 0/2] gnu: fix guile-based Jupyter kernels

[Jesse Gibbons]

The following patch series fixes our guile-based Jupyter kernels. In 
particular, it points guix-Jupyter to the kernel's correct directory, 
and updates jupyter-guile-kernel's commit and dependencies. If applied, 
we can close bug #42385.

-Jesse

[bug#42461] [PATCH 1/2] gnu: guix-jupyter: Correct kernel search location.

[Jesse Gibbons]

gnu/packages/package-management.scm: guix-jupyter:
[phases]: Use guile 3.0 instead of 2.2.
---
gnu/packages/package-management.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 6e86305504..68a2e6e203 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -982,7 +983,7 @@ environments.")
"-s")
"\",\n\t\t\""))
(("guix-jupyter-kernel.scm")
- (string-append out "/share/guile/site/2.2/"
+ (string-append out "/share/guile/site/3.0/"
"guix-jupyter-kernel.scm")))
#t))))))
(native-inputs

[bug#42461] [PATCH 2/2] gnu: jupyter-guile-kernel: Fix build.

[Jesse Gibbons]

* gnu/packages/guile-xyz.scm: jupyter-guile-kernel:
Update commit.
Update revision.
Re-indent package definition (using indent.el)
[phases]: Replace /home with /usr/local
[inputs]: Update guile.
Update guile-json.
---
gnu/packages/guile-xyz.scm | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)

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

[bug#42461] [PATCH 0/2] gnu: fix guile-based Jupyter kernels

[Ludovic Courtès]

Hi,

Jesse Gibbons <jgibbons2357@gmail.com> skribis:

> The following patch series fixes our guile-based Jupyter kernels. In
> particular, it points guix-Jupyter to the kernel's correct directory,
> and updates jupyter-guile-kernel's commit and dependencies. If
> applied, we can close bug #42385.

These patches got mangled too; could you resend them as attachments to
42461@debbugs.gnu.org ?

TIA!

Ludo’.

[bug#42461] gnu: fix guile-based Jupyter kernels

[Jesse Gibbons]

[-- Attachment #1: Type: text/plain, Size: 103 bytes --]

I guess my patches got mangled... attached are the patches that fix the 
guile-based Jupyter kernels.


[-- Attachment #2: 0001-gnu-guix-jupyter-Correct-kernel-search-location.patch --]
[-- Type: text/x-patch, Size: 1353 bytes --]

From de36cd52a2f71ab3420841be505ee7d72f2a72ea Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
Date: Wed, 15 Jul 2020 23:08:36 -0600
Subject: [PATCH 1/2] gnu: guix-jupyter: Correct kernel search location.

gnu/packages/package-management.scm: guix-jupyter:
[phases]: Use guile 3.0 instead of 2.2.
---
 gnu/packages/package-management.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6e86305504..68a2e6e203 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -982,7 +983,7 @@ environments.")
                          "-s")
                    "\",\n\t\t\""))
                  (("guix-jupyter-kernel.scm")
-                  (string-append out "/share/guile/site/2.2/"
+                  (string-append out "/share/guile/site/3.0/"
                                  "guix-jupyter-kernel.scm")))
                #t))))))
     (native-inputs
-- 
2.27.0


[-- Attachment #3: 0002-gnu-jupyter-guile-kernel-Fix-build.patch --]
[-- Type: text/x-patch, Size: 3823 bytes --]

From 9f995d253eb58f8ffe9129ed2c0999be2888185a Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
Date: Fri, 17 Jul 2020 08:56:47 -0600
Subject: [PATCH 2/2] gnu: jupyter-guile-kernel: Fix build.

* gnu/packages/guile-xyz.scm: jupyter-guile-kernel:
Update commit.
Update revision.
Re-indent package definition (using indent.el)
[phases]: Replace /home with /usr/local
[inputs]: Update guile.
          Update guile-json.
---
 gnu/packages/guile-xyz.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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

bug#42461: gnu: fix guile-based Jupyter kernels

[Ludovic Courtès]

Hi!

Jesse Gibbons <jgibbons2357@gmail.com> skribis:

>>From de36cd52a2f71ab3420841be505ee7d72f2a72ea Mon Sep 17 00:00:00 2001
> From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
> Date: Wed, 15 Jul 2020 23:08:36 -0600
> Subject: [PATCH 1/2] gnu: guix-jupyter: Correct kernel search location.
>
> gnu/packages/package-management.scm: guix-jupyter:
> [phases]: Use guile 3.0 instead of 2.2.

[...]

>>From 9f995d253eb58f8ffe9129ed2c0999be2888185a Mon Sep 17 00:00:00 2001
> From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
> Date: Fri, 17 Jul 2020 08:56:47 -0600
> Subject: [PATCH 2/2] gnu: jupyter-guile-kernel: Fix build.
>
> * gnu/packages/guile-xyz.scm: jupyter-guile-kernel:
> Update commit.
> Update revision.
> Re-indent package definition (using indent.el)
> [phases]: Replace /home with /usr/local
> [inputs]: Update guile.
>           Update guile-json.

I adjusted the commit log and applied.  Thank you!

Ludo’.