From 3b1b4fda0e3d59cd7585b1697aa6d039df1307fb Mon Sep 17 00:00:00 2001
From: Masaya Tojo <masaya@tojo.tokyo>
Date: Wed, 15 Sep 2021 11:11:15 +0900
Subject: jupyter-acl2-kernel: Use acl2-kernel-for-guix.

---
 tojo-tokyo/packages/acl2.scm | 119 +++++++++++++------------------------------
 1 file changed, 35 insertions(+), 84 deletions(-)

(limited to 'tojo-tokyo/packages/acl2.scm')

diff --git a/tojo-tokyo/packages/acl2.scm b/tojo-tokyo/packages/acl2.scm
index d39a04c..1a4904b 100644
--- a/tojo-tokyo/packages/acl2.scm
+++ b/tojo-tokyo/packages/acl2.scm
@@ -113,94 +113,45 @@
                    license:expat
                    license:gpl2+))))
 
-(define-public python-regex-for-acl2-kernel
-  (package
-   (inherit python-regex)
-   (name "python-regex")
-   (version "2021.4.4")
-   (source (origin
-            (method url-fetch)
-            (uri (pypi-uri "regex" version))
-            (sha256
-             (base32
-              "1yws1kqvw4krmdi519iry5jl1i2ihnr5n45wwkbljb4lkczkvfjj"))))))
-
-(define-public python-ipython-for-acl2-kernel
+(define-public jupyter-acl2-kernel
   (package
-    (inherit python-ipython)
-    (name "python-ipython")
-    (version "7.15.0")
+    (name "jupyter-acl2-kernel")
+    (version "0.2.8")
+    ;; XXX: Using a modified versions of the dependent packages for use with Guix.
+    ;; Commit: https://github.com/tojoqk/acl2-kernel/commit/9c36a01f46f58628585e87101db9da61cab42891
     (source (origin
               (method url-fetch)
-              (uri (pypi-uri "ipython" version))
+              (uri
+               (string-append "http://files.tojo.tokyo/acl2-kernel-for-guix/acl2-kernel-for-guix-"
+                              version
+                              ".tar.gz"))
               (sha256
                (base32
-                "03hxazxq75z2ljsxmj6ffp534iy6hbff26mfsc69csl1g4w47w8f"))))))
-
-(define-public python-ipykernel-for-acl2-kernel
-  (package
-    (inherit python-ipykernel)
-    (propagated-inputs
-     `(("python-ipython" ,python-ipython-for-acl2-kernel)
-       ("python-tornado" ,python-tornado-6)
-       ("python-traitlets" ,python-traitlets)
-       ;; imported at runtime during connect
-       ("python-jupyter-client" ,python-jupyter-client)))))
-
-(define-public python-notebook-for-acl2-kernel
-  (package
-    (inherit python-notebook)
+                "0ljg4bjafvfgqx7cwc026yw3w15k3yj7bilbl6sjk6cpdhpkbaa6"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-kernel
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (setenv "HOME" "/tmp")
+             (invoke "python3" "-m" "acl2_kernel.install"
+                     (string-append "--acl2=" (string-append (assoc-ref inputs "acl2")
+                                                             "/bin/acl2")))
+             (let ((kernel-src "/tmp/.local/share/jupyter/kernels/acl2/kernel.json")
+                   (kernel-dst (string-append (assoc-ref outputs "out")
+                                              "/share/jupyter/kernels/acl2")))
+               (install-file kernel-src kernel-dst)))))))
     (propagated-inputs
-     `(("python-argon2-cffi" ,python-argon2-cffi)
-       ("python-ipykernel" ,python-ipykernel-for-acl2-kernel)
-       ("python-ipython-genutils" ,python-ipython-genutils)
-       ("python-jinja2" ,python-jinja2)
+     `(("python-ipykernel" ,python-ipykernel)
+       ("python-ipython" ,python-ipython)
        ("python-jupyter-client" ,python-jupyter-client)
-       ("python-jupyter-core" ,python-jupyter-core)
-       ("python-nbconvert" ,python-nbconvert)
-       ("python-nbformat" ,python-nbformat)
-       ("python-prometheus-client" ,python-prometheus-client)
-       ("python-pyzmq" ,python-pyzmq)
-       ("python-send2trash" ,python-send2trash)
-       ("python-terminado" ,python-terminado)
-       ("python-tornado" ,python-tornado-6)
-       ("python-traitlets" ,python-traitlets)))))
-
-(define-public jupyter-acl2-kernel
-  (package
-   (name "jupyter-acl2-kernel")
-   (version "0.2.8")
-   (source
-    (origin
-     (method url-fetch)
-     (uri (pypi-uri "acl2-kernel" version))
-     (sha256
-      (base32
-       "1g7j84w19kf3lfy8r4zbs3l3qr60ij5m4vfinbhf1crgm4whqarl"))))
-   (build-system python-build-system)
-   (arguments
-    `(#:tests? #f
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'install 'install-kernel
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            (setenv "HOME" "/tmp")
-            (invoke "python3" "-m" "acl2_kernel.install"
-                    (string-append "--acl2=" (string-append (assoc-ref inputs "acl2")
-                                                            "/bin/acl2")))
-            (let ((kernel-src "/tmp/.local/share/jupyter/kernels/acl2/kernel.json")
-                  (kernel-dst (string-append (assoc-ref outputs "out")
-                                             "/share/jupyter/kernels/acl2")))
-              (install-file kernel-src kernel-dst)))))))
-   (propagated-inputs
-    `(("python-ipykernel" ,python-ipykernel-for-acl2-kernel)
-      ("python-ipython" ,python-ipython-for-acl2-kernel)
-      ("python-jupyter-client" ,python-jupyter-client)
-      ("python-pexpect" ,python-pexpect)
-      ("python-regex" ,python-regex-for-acl2-kernel)
-      ("python-notebook" ,python-notebook-for-acl2-kernel)
-      ("acl2" ,acl2)))
-   (home-page "https://github.com/tani/acl2-kernel")
-   (synopsis "Jupyter Kernel for ACL2")
-   (description "Jupyter Kernel for ACL2")
-   (license license:bsd-3)))
+       ("python-pexpect" ,python-pexpect)
+       ("python-regex" ,python-regex)
+       ("python-notebook" ,python-notebook)
+       ("acl2" ,acl2)))
+    (home-page "https://github.com/tani/acl2-kernel")
+    (synopsis "Jupyter Kernel for ACL2")
+    (description "Jupyter Kernel for ACL2")
+    (license license:bsd-3)))
-- 
cgit v1.2.3