From a94b8f63a81d050dd6c28926af466a2f87af1c2a Mon Sep 17 00:00:00 2001 From: Masaya Tojo Date: Wed, 8 Sep 2021 19:48:55 +0900 Subject: acl2: Update. --- tojo-tokyo/packages/acl2-kernel.scm | 89 ------------------------------- tojo-tokyo/packages/acl2.scm | 102 +++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 90 deletions(-) (limited to 'tojo-tokyo') diff --git a/tojo-tokyo/packages/acl2-kernel.scm b/tojo-tokyo/packages/acl2-kernel.scm index 2bba970..e69de29 100644 --- a/tojo-tokyo/packages/acl2-kernel.scm +++ b/tojo-tokyo/packages/acl2-kernel.scm @@ -1,89 +0,0 @@ -(define-module (tojo-tokyo packages acl2-kernel) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages python-web) - #:use-module (gnu packages python-crypto) - #:use-module (gnu packages monitoring) - #:use-module (guix build-system python) - #:use-module ((guix licenses) #:prefix license:)) - -(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 - (package - (inherit python-ipython) - (name "python-ipython") - (version "7.15.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "ipython" version)) - (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) - (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-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 python-acl2-kernel - (package - (name "python-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)) - (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))) - (home-page "https://github.com/tani/acl2-kernel") - (synopsis "Jupyter Kernel for ACL2") - (description "Jupyter Kernel for ACL2") - (license license:bsd-3))) diff --git a/tojo-tokyo/packages/acl2.scm b/tojo-tokyo/packages/acl2.scm index b7f229b..9b7c6e4 100644 --- a/tojo-tokyo/packages/acl2.scm +++ b/tojo-tokyo/packages/acl2.scm @@ -28,7 +28,15 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages admin) #:use-module (gnu packages check) - #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + + ;; For ACL2 Kernel + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages monitoring) + #:use-module (guix build-system python)) (define-public acl2 (package @@ -103,3 +111,95 @@ (license (list license:bsd-3 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 + (package + (inherit python-ipython) + (name "python-ipython") + (version "7.15.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "ipython" version)) + (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) + (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-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 python-acl2-kernel + (package + (name "python-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))) -- cgit v1.2.3