guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: Move most packages from guile.scm to new module.


From: guix-commits
Subject: 01/01: gnu: Move most packages from guile.scm to new module.
Date: Mon, 28 Jan 2019 09:01:10 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit 0791437f972caa7e48de91ad5cb150a614f617c2
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Jan 28 14:57:10 2019 +0100

    gnu: Move most packages from guile.scm to new module.
    
    * gnu/packages/guile.scm (artanis, guildhall, guile-aspell, guile-bash,
    guile-8sync, guile-daemon, guile-dsv, guile-fibers, guile-syntax-highlight,
    guile-sjson, guile-colorized, guile-pfds, guile-aa-tree, guile-simple-zmq,
    jupyter-guile-kernel, guile-sparql, guile-debbugs, guile-email,
    guile-debbugs-next, guile-newt, guile-mastodon, guile-parted, guile-xosd,
    guile-dbi, guile-dbd-sqlite3, guile-config, guile-hall, guile-ics, 
guile-wisp,
    guile-sly, g-wrap, guile-miniadapton, guile-reader, guile2.2-reader,
    guile-ncurses, guile-ncurses/gpm, guile-lib, guile2.0-lib, guile2.2-lib,
    guile-minikanren, guile2.0-minikanren, guile2.2-minikanren, guile-irregex,
    guile2.0-irregex, guile2.2-irregex, haunt, guile2.0-haunt, guile2.2-haunt,
    guile-redis, guile2.0-redis, guile2.2-redis, guile-commonmark,
    guile2.0-commonmark, guile2.2-commonmark, mcron, mcron2): Move these 
variables
    from here...
    * gnu/packages/guile-xyz.scm: ...to this new file.
    * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
    * gnu/installer.scm,
    gnu/packages/bioinformatics.scm,
    gnu/packages/ci.scm,
    gnu/packages/gtk.scm,
    gnu/packages/guile.scm,
    gnu/packages/mail.scm,
    gnu/packages/package-management.scm,
    gnu/packages/skribilo.scm,
    gnu/packages/web.scm,
    gnu/services/mcron.scm: Update module references.
---
 gnu/installer.scm                         |    1 +
 gnu/local.mk                              |    1 +
 gnu/packages/bioinformatics.scm           |    1 +
 gnu/packages/ci.scm                       |    1 +
 gnu/packages/gtk.scm                      |    1 +
 gnu/packages/{guile.scm => guile-xyz.scm} | 3190 ++++++++++++-----------------
 gnu/packages/guile.scm                    | 1784 +---------------
 gnu/packages/mail.scm                     |    1 +
 gnu/packages/package-management.scm       |    1 +
 gnu/packages/skribilo.scm                 |    1 +
 gnu/packages/web.scm                      |    1 +
 gnu/services/mcron.scm                    |    2 +-
 12 files changed, 1334 insertions(+), 3651 deletions(-)

diff --git a/gnu/installer.scm b/gnu/installer.scm
index 2ae139b..479d940 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages cryptsetup)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:autoload   (gnu packages gnupg) (guile-gcrypt)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages linux)
diff --git a/gnu/local.mk b/gnu/local.mk
index cb84fc0..629da48 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -220,6 +220,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gtk.scm                         \
   %D%/packages/guile.scm                       \
   %D%/packages/guile-wm.scm                    \
+  %D%/packages/guile-xyz.scm                   \
   %D%/packages/gv.scm                          \
   %D%/packages/gxmessage.scm                   \
   %D%/packages/hardware.scm                    \
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 37b0097..3ce4e32 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages graph)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index bd4a3d3..6533fb3 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages mail)
   #:use-module (gnu packages package-management)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 22dd549..ccb63e7 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -74,6 +74,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile-xyz.scm
similarity index 76%
copy from gnu/packages/guile.scm
copy to gnu/packages/guile-xyz.scm
index 1b1285d..93fa026 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -36,29 +36,26 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages guile)
+(define-module (gnu packages guile-xyz)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages aspell)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
-  #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages dbm)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages ed)
-  #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages hurd)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages multiprecision)
@@ -80,444 +77,9 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system guile)
-  #:use-module (guix build-system trivial)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
-  #:use-module ((srfi srfi-1) #:prefix srfi-1:))
-
-;;; Commentary:
-;;;
-;;; GNU Guile, and modules and extensions.
-;;;
-;;; Code:
-
-(define-public guile-1.8
-  (package
-   (name "guile")
-   (version "1.8.8")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnu/guile/guile-" version
-                                ".tar.gz"))
-            (sha256
-             (base32
-              "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3"))
-            (patches (search-patches "guile-1.8-cpp-4.5.patch"))))
-   (build-system gnu-build-system)
-   (arguments '(#:configure-flags '("--disable-error-on-warning")
-
-                ;; Insert a phase before `configure' to patch things up.
-                #:phases
-                (modify-phases %standard-phases
-                  (add-before 'configure 'patch-stuff
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      ;; Add a call to `lt_dladdsearchdir' so that
-                      ;; `libguile-readline.so' & co. are in the
-                      ;; loader's search path.
-                      (substitute* "libguile/dynl.c"
-                        (("lt_dlinit.*$" match)
-                         (format #f
-                                 "  ~a~%  lt_dladdsearchdir(\"~a/lib\");~%"
-                                 match
-                                 (assoc-ref outputs "out"))))
-
-                      ;; The usual /bin/sh...
-                      (substitute* "ice-9/popen.scm"
-                        (("/bin/sh") (which "sh")))
-                      #t)))))
-   (inputs `(("gawk" ,gawk)
-             ("readline" ,readline)))
-
-   ;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be
-   ;; propagated.
-   (propagated-inputs `(("gmp" ,gmp)
-                        ("libltdl" ,libltdl)))
-
-   ;; When cross-compiling, a native version of Guile itself is needed.
-   (self-native-input? #t)
-
-   (native-search-paths
-    (list (search-path-specification
-           (variable "GUILE_LOAD_PATH")
-           (files '("share/guile/site")))))
-
-   (synopsis "Scheme implementation intended especially for extensions")
-   (description
-    "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the
-official extension language of the GNU system.  It is an implementation of
-the Scheme language which can be easily embedded in other applications to
-provide a convenient means of extending the functionality of the application
-without requiring the source code to be rewritten.")
-   (home-page "https://www.gnu.org/software/guile/";)
-   (license license:lgpl2.0+)))
-
-(define-public guile-2.0
-  (package
-   (name "guile")
-   (version "2.0.14")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnu/guile/guile-" version
-                                ".tar.xz"))
-            (sha256
-             (base32
-              "10lxc6l5alf3lzbs3ihnbfy6dfcrsyf8667wa57f26vf4mk2ai78"))))
-   (build-system gnu-build-system)
-   (native-inputs `(("pkgconfig" ,pkg-config)))
-   (inputs `(("libffi" ,libffi)
-             ,@(libiconv-if-needed)
-
-             ;; We need Bash when cross-compiling because some of the scripts
-             ;; in bin/ refer to it.  Use 'bash-minimal' because we don't need
-             ;; an interactive Bash with Readline and all.
-             ,@(if (target-mingw?) '() `(("bash" ,bash-minimal)))))
-   (propagated-inputs
-    `( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
-       ;; reads `-lltdl -lunistring', adding them here will add the needed
-       ;; `-L' flags.  As for why the `.la' file lacks the `-L' flags, see
-       ;; <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903>.
-      ("libunistring" ,libunistring)
-
-      ;; Depend on LIBLTDL, not LIBTOOL.  That way, we avoid some the extra
-      ;; dependencies that LIBTOOL has, which is helpful during bootstrap.
-      ("libltdl" ,libltdl)
-
-      ;; The headers and/or `guile-2.0.pc' refer to these packages, so they
-      ;; must be propagated.
-      ("bdw-gc" ,libgc)
-      ("gmp" ,gmp)))
-
-   (self-native-input? #t)
-
-   (outputs '("out" "debug"))
-
-   (arguments
-    `(#:configure-flags '("--disable-static") ; saves 3 MiB
-      #:phases
-      (modify-phases %standard-phases
-        (add-before 'configure 'pre-configure
-          (lambda* (#:key inputs #:allow-other-keys)
-            ;; Tell (ice-9 popen) the file name of Bash.
-            (let ((bash (assoc-ref inputs "bash")))
-              (substitute* "module/ice-9/popen.scm"
-                ;; If bash is #f allow fallback for user to provide
-                ;; "bash" in PATH.  This happens when cross-building to
-                ;; MinGW for which we do not have Bash yet.
-                (("/bin/sh")
-                 ,@(if (target-mingw?)
-                       '((if bash
-                             (string-append bash "/bin/bash")
-                             "bash"))
-                       '((string-append bash "/bin/bash")))))
-              #t))))))
-
-   (native-search-paths
-    (list (search-path-specification
-           (variable "GUILE_LOAD_PATH")
-           (files '("share/guile/site/2.0")))
-          (search-path-specification
-           (variable "GUILE_LOAD_COMPILED_PATH")
-           (files '("lib/guile/2.0/site-ccache")))))
-
-   (synopsis "Scheme implementation intended especially for extensions")
-   (description
-    "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the
-official extension language of the GNU system.  It is an implementation of
-the Scheme language which can be easily embedded in other applications to
-provide a convenient means of extending the functionality of the application
-without requiring the source code to be rewritten.")
-   (home-page "https://www.gnu.org/software/guile/";)
-   (license license:lgpl3+)))
-
-(define-public guile-2.0.13
-  ;; For testing a "minimal" Guix
-  (hidden-package
-   (package (inherit guile-2.0)
-     (name "guile")
-     (version "2.0.13")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "mirror://gnu/guile/guile-" version
-                                   ".tar.xz"))
-               (sha256
-                (base32
-                 "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p")))))))
-
-(define-public guile-2.2
-  (package (inherit guile-2.0)
-    (name "guile")
-    (version "2.2.4")
-    (source (origin
-              (method url-fetch)
-
-              ;; Note: we are limited to one of the compression formats
-              ;; supported by the bootstrap binaries, so no lzip here.
-              (uri (string-append "mirror://gnu/guile/guile-" version
-                                  ".tar.xz"))
-              (sha256
-               (base32
-                "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))
-              (modules '((guix build utils)))
-
-              ;; Remove the pre-built object files.  Instead, build everything
-              ;; from source, at the expense of significantly longer build
-              ;; times (almost 3 hours on a 4-core Intel i5).
-              (snippet '(begin
-                          (for-each delete-file
-                                    (find-files "prebuilt" "\\.go$"))
-                          #t))))
-    (properties '((timeout . 72000)               ;20 hours
-                  (max-silent-time . 36000)))     ;10 hours (needed on ARM
-                                                  ;  when heavily loaded)
-    (native-search-paths
-     (list (search-path-specification
-            (variable "GUILE_LOAD_PATH")
-            (files '("share/guile/site/2.2")))
-           (search-path-specification
-            (variable "GUILE_LOAD_COMPILED_PATH")
-            (files '("lib/guile/2.2/site-ccache")))))
-
-    (arguments
-     (if (%current-target-system)
-         (substitute-keyword-arguments (package-arguments guile-2.0)
-           ((#:phases phases '%standard-phases)
-            `(modify-phases ,phases
-               (add-after 'unpack 'sacrifice-elisp-support
-                 (lambda _
-                   ;; Cross-compiling language/elisp/boot.el fails, so
-                   ;; sacrifice it.  See
-                   ;; 
<https://git.savannah.gnu.org/cgit/guile.git/commit/?h=stable-2.2&id=988aa29238fca862c7e2cb55f15762a69b4c16ce>
-                   ;; for the upstream fix.
-                   (substitute* "module/Makefile.in"
-                     (("language/elisp/boot\\.el")
-                      "\n"))
-                   #t))
-               ,@(if (hurd-target?)
-                     `((add-after 'unpack 'allow-madvise-ENOSYS
-                         (lambda _
-                           ;; Do not warn about ENOSYS on 'madvise'.  This is
-                           ;; what Guile commit
-                           ;; 45e4ace6603e00b297e6542362273041aebe7305 does.
-                           ;; TODO: Remove for Guile >= 2.2.5.
-                           (substitute* "libguile/vm.c"
-                             (("perror \\(\"madvise failed\"\\)")
-                              "if (errno != ENOSYS) perror (\"madvised 
failed\");"))
-                           #t)))
-                     '()))))
-         (package-arguments guile-2.0)))))
-
-(define-public guile-2.2/fixed
-  ;; A package of Guile 2.2 that's rarely changed.  It is the one used
-  ;; in the `base' module, and thus changing it entails a full rebuild.
-  (package
-    (inherit guile-2.2)
-    (properties '((hidden? . #t)            ;people should install 'guile-2.2'
-                  (timeout . 72000)             ;20 hours
-                  (max-silent-time . 36000))))) ;10 hours (needed on ARM
-                                                ;  when heavily loaded)
-
-(define-public guile-next
-  ;; This is the upcoming Guile 3.0, with JIT support.
-  (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779")
-        (revision "1"))
-    (package
-      (inherit guile-2.2)
-      (name "guile-next")
-      (version "2.9.1")
-      (source (origin
-                (inherit (package-source guile-2.2))
-                (uri (string-append "https://alpha.gnu.org/gnu/guile/guile-";
-                                    version ".tar.xz"))
-                (sha256
-                 (base32
-                  "0iba93yqn6mvgid0rfsrg4amym36pg9m8cqdplxsy222blrj9gh1"))))
-      (native-search-paths
-       (list (search-path-specification
-              (variable "GUILE_LOAD_PATH")
-              (files '("share/guile/site/3.0")))
-             (search-path-specification
-              (variable "GUILE_LOAD_COMPILED_PATH")
-              (files '("lib/guile/3.0/site-ccache"
-                       "share/guile/site/3.0")))))
-      (properties '((ftp-server . "alpha.gnu.org")
-                    (upstream-name . "guile"))))))
-
-(define (make-guile-readline guile)
-  (package
-    (name "guile-readline")
-    (version (package-version guile))
-    (source (package-source guile))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--disable-silent-rules")
-       #:phases (modify-phases %standard-phases
-                  (add-before 'build 'chdir
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (invoke "make" "-C" "libguile" "scmconfig.h")
-                      (invoke "make" "-C" "lib")
-                      (chdir "guile-readline")
-
-                      (substitute* "Makefile"
-                        (("../libguile/libguile-[[:graph:]]+\\.la")
-                         ;; Remove dependency on libguile-X.Y.la.
-                         "")
-                        (("^READLINE_LIBS = (.*)$" _ libs)
-                         ;; Link against the provided libguile.
-                         (string-append "READLINE_LIBS = "
-                                        "-lguile-$(GUILE_EFFECTIVE_VERSION) "
-                                        libs "\n"))
-                        (("\\$\\(top_builddir\\)/meta/build-env")
-                         ;; Use the provided Guile, not the one from
-                         ;; $(builddir).
-                         "")
-
-                        ;; Install modules to the 'site' directories.
-                        (("^moddir = .*$")
-                         "moddir = 
$(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n")
-                        (("^ccachedir = .*$")
-                         "ccachedir = 
$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache\n"))
-
-                      ;; Load 'guile-readline.so' from the right place.
-                      (substitute* "ice-9/readline.scm"
-                        (("load-extension \"guile-readline\"")
-                         (format #f "load-extension \
- (string-append ~s \"/lib/guile/\" (effective-version) 
\"/extensions/guile-readline\")"
-                                 (assoc-ref outputs "out"))))
-                      #t)))))
-    (home-page (package-home-page guile))
-    (native-inputs (package-native-inputs guile))
-    (inputs
-     `(,@(package-inputs guile)                   ;to placate 'configure'
-       ,@(package-propagated-inputs guile)
-       ("guile" ,guile)
-       ("readline" ,readline)))
-    (synopsis "Line editing support for GNU Guile")
-    (description
-     "This module provides line editing support via the Readline library for
address@hidden  Use the @code{(ice-9 readline)} module and call its
address@hidden procedure to enable it.")
-    (license license:gpl3+)))
-
-(define-public guile-readline
-  (make-guile-readline guile-2.2))
-
-(define (guile-variant-package-name prefix)
-  (lambda (name)
-    "Return NAME with PREFIX instead of \"guile-\", when applicable."
-    (if (string-prefix? "guile-" name)
-        (string-append prefix "-"
-                       (string-drop name
-                                    (string-length "guile-")))
-        name)))
-
-(define package-for-guile-2.2
-  ;; A procedure that rewrites the dependency tree of the given package to use
-  ;; GUILE-2.2 instead of GUILE-2.0.
-  (package-input-rewriting `((,guile-2.0 . ,guile-2.2))
-                           (guile-variant-package-name "guile2.2")))
-
-(define package-for-guile-2.0
-  ;; Likewise, but the other way around.  :-)
-  (package-input-rewriting `((,guile-2.2 . ,guile-2.0))
-                           (guile-variant-package-name "guile2.0")))
-
-(define-public guile-for-guile-emacs
-  (package (inherit guile-2.2)
-    (name "guile-for-guile-emacs")
-    (version "20150510.d8d9a8d")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "git://git.hcoop.net/git/bpt/guile.git")
-                    (commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17")))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0"))))
-    (arguments
-     `(;; Tests aren't passing for now.
-       ;; Obviously we should re-enable this!
-       #:tests? #f
-       ,@(package-arguments guile-2.2)))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("flex" ,flex)
-       ("texinfo" ,texinfo)
-       ("gettext" ,gettext-minimal)
-       ,@(package-native-inputs guile-2.2)))
-    ;; Same as in guile-2.0
-    (native-search-paths
-     (list (search-path-specification
-            (variable "GUILE_LOAD_PATH")
-            (files '("share/guile/site/2.0")))
-           (search-path-specification
-            (variable "GUILE_LOAD_COMPILED_PATH")
-            (files '("lib/guile/2.0/site-ccache"
-                     "share/guile/site/2.0")))))))
-
-;; There has not been any release yet.
-(define-public guildhall
-  (let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778")
-        (revision "1"))
-    (package
-      (name "guildhall")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/ijp/guildhall.git";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "115bym7bg66h3gs399yb2vkzc2ygriaqsn4zbrg8f054mgy8wzn1"))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           ;; Tests fail without this fix because they try to load the bash
-           ;; executable as a Scheme file.  See bug report at
-           ;; https://github.com/ijp/guildhall/issues/22
-           (add-after 'unpack 'fix-bug-22
-             (lambda _
-               (substitute* "Makefile.am"
-                 (("TESTS_ENVIRONMENT=.*")
-                  "AM_TESTS_ENVIRONMENT=srcdir=$(abs_top_srcdir)/tests/
-TEST_EXTENSIONS = .scm
-SCM_LOG_COMPILER= $(top_builddir)/env $(GUILE)
-AM_SCM_LOG_FLAGS =  --no-auto-compile -s")
-                 ;; FIXME: one of the database tests fails for unknown
-                 ;; reasons.  It does not fail when run outside of Guix.
-                 (("tests/database.scm") ""))
-               #t)))))
-      (inputs
-       `(("guile" ,guile-2.0)))
-      (native-inputs
-       `(("zip" ,zip) ; for tests
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("texinfo" ,texinfo)))
-      (synopsis "Package manager for Guile")
-      (description
-       "Guildhall is a package manager written for Guile Scheme.  A guild is
-an association of independent craftspeople.  A guildhall is where they meet.
-This Guildhall aims to make a virtual space for Guile wizards and journeyfolk
-to share code.
-
-On a practical level, Guildhall lets you share Scheme modules and programs
-over the internet, and install code that has been shared by others.  Guildhall
-can handle dependencies, so when a program requires several libraries, and
-each of those has further dependencies, all of the prerequisites for the
-program can be installed in one go.")
-      (home-page "https://github.com/ijp/guildhall";)
-      (license license:gpl3+))))
-
-
-;;;
-;;; Extensions.
-;;;
+  #:use-module ((srfi srfi-1) #:select (alist-delete)))
 
 (define-public artanis
   (let ((release "0.2.1")
@@ -606,674 +168,1061 @@ more.")
       (home-page "https://www.gnu.org/software/artanis/";)
       (license (list license:gpl3+ license:lgpl3+))))) ;dual license
 
-(define-public guile-reader
-  (package
-    (name "guile-reader")
-    (version "0.6.2")
-    (source  (origin
-               (method url-fetch)
-               (uri (string-append 
"mirror://savannah/guile-reader/guile-reader-"
-                                   version ".tar.gz"))
-               (sha256
-                (base32
-                 "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("pkgconfig" ,pkg-config)
-                     ("gperf" ,gperf-3.0)))
-    (inputs `(("guile" ,guile-2.2)))
-    (synopsis "Framework for building readers for GNU Guile")
-    (description
-     "Guile-Reader is a simple framework for building readers for GNU Guile.
-
-The idea is to make it easy to build procedures that extend Guile’s read
-procedure.  Readers supporting various syntax variants can easily be written,
-possibly by re-using existing “token readers” of a standard Scheme
-readers.  For example, it is used to implement Skribilo’s R5RS-derived
-document syntax.
-
-Guile-Reader’s approach is similar to Common Lisp’s “read table”, but
-hopefully more powerful and flexible (for instance, one may instantiate as
-many readers as needed).")
-    (home-page "https://www.nongnu.org/guile-reader/";)
-    (license license:gpl3+)))
+;; There has not been any release yet.
+(define-public guildhall
+  (let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778")
+        (revision "1"))
+    (package
+      (name "guildhall")
+      (version (string-append "0-" revision "." (string-take commit 9)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/ijp/guildhall.git";)
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "115bym7bg66h3gs399yb2vkzc2ygriaqsn4zbrg8f054mgy8wzn1"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           ;; Tests fail without this fix because they try to load the bash
+           ;; executable as a Scheme file.  See bug report at
+           ;; https://github.com/ijp/guildhall/issues/22
+           (add-after 'unpack 'fix-bug-22
+             (lambda _
+               (substitute* "Makefile.am"
+                 (("TESTS_ENVIRONMENT=.*")
+                  "AM_TESTS_ENVIRONMENT=srcdir=$(abs_top_srcdir)/tests/
+TEST_EXTENSIONS = .scm
+SCM_LOG_COMPILER= $(top_builddir)/env $(GUILE)
+AM_SCM_LOG_FLAGS =  --no-auto-compile -s")
+                 ;; FIXME: one of the database tests fails for unknown
+                 ;; reasons.  It does not fail when run outside of Guix.
+                 (("tests/database.scm") ""))
+               #t)))))
+      (inputs
+       `(("guile" ,guile-2.0)))
+      (native-inputs
+       `(("zip" ,zip) ; for tests
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("texinfo" ,texinfo)))
+      (synopsis "Package manager for Guile")
+      (description
+       "Guildhall is a package manager written for Guile Scheme.  A guild is
+an association of independent craftspeople.  A guildhall is where they meet.
+This Guildhall aims to make a virtual space for Guile wizards and journeyfolk
+to share code.
 
-(define-public guile2.0-reader
-  (package-for-guile-2.0 guile-reader))
-(define-public guile2.2-reader
-  (deprecated-package "guile2.2-reader" guile-reader))
+On a practical level, Guildhall lets you share Scheme modules and programs
+over the internet, and install code that has been shared by others.  Guildhall
+can handle dependencies, so when a program requires several libraries, and
+each of those has further dependencies, all of the prerequisites for the
+program can be installed in one go.")
+      (home-page "https://github.com/ijp/guildhall";)
+      (license license:gpl3+))))
 
-(define-public guile-ncurses
+(define-public guile-aspell
   (package
-    (name "guile-ncurses")
-    (version "2.2")
+    (name "guile-aspell")
+    (version "0.4")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f"))))
+              (method url-fetch)
+              (uri (string-append
+                    "http://lonelycactus.com/tarball/guile_aspell-";
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077"))))
     (build-system gnu-build-system)
-    (inputs `(("ncurses" ,ncurses)
-              ("guile" ,guile-2.2)))
-    (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments
-     '(#:configure-flags (list "--with-ncursesw"  ; Unicode support
-                               "--with-gnu-filesystem-hierarchy")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'fix-libguile-ncurses-file-name
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "make" "install"
-                     "-C" "src/ncurses"
-                     "-j" (number->string
-                           (parallel-job-count)))
-             (let* ((out   (assoc-ref outputs "out"))
-                    (dir   "src/ncurses")
-                    (files (find-files dir ".scm")))
-               (substitute* files
-                 (("\"libguile-ncurses\"")
-                  (format #f "\"~a/lib/guile/2.2/libguile-ncurses\""
-                          out)))
-               #t))))))
-    (home-page "https://www.gnu.org/software/guile-ncurses/";)
-    (synopsis "Guile bindings to ncurses")
-    (description
-     "guile-ncurses provides Guile language bindings for the ncurses
-library.")
-    (license license:lgpl3+)))
-
-(define-public guile-ncurses/gpm
-  (package
-    (inherit guile-ncurses)
-    (name "guile-ncurses-with-gpm")
-    (inputs `(("ncurses" ,ncurses/gpm)
-              ("guile" ,guile-2.2)))))
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'set-guilesitedir
+                    (lambda _
+                      (substitute* "Makefile.in"
+                        (("^guilesitedir =.*$")
+                         "guilesitedir = \
+$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      #t))
+                  (add-before 'build 'set-libaspell-file-name
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let ((aspell (assoc-ref inputs "aspell")))
+                        (substitute* "aspell.scm"
+                          (("\"libaspell\\.so\"")
+                           (string-append "\"" aspell
+                                          "/lib/libaspell\"")))
+                        #t))))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("guile" ,guile-2.2)
+              ("aspell" ,aspell)))
+    (home-page "https://github.com/spk121/guile-aspell";)
+    (synopsis "Spell-checking from Guile")
+    (description
+     "guile-aspell is a Guile Scheme library for comparing a string against a
+dictionary and suggesting spelling corrections.")
+    (license license:gpl3+)))
 
-(define-public mcron
+(define-public guile-bash
+  ;; This project is currently retired.  It was initially announced here:
+  ;; <https://lists.gnu.org/archive/html/guile-user/2015-02/msg00003.html>.
+  (let ((commit "1eabc563ca5692b3e08d84f1f0e6fd2283284469")
+        (revision "0"))
+    (package
+      (name "guile-bash")
+      (version (string-append "0.1.6-" revision "." (string-take commit 7)))
+      (home-page
+       
"https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git";)
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (commit commit)
+                      (url home-page)))
+                (sha256
+                 (base32
+                  "097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p"))
+                (file-name (string-append name "-" version "-checkout"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:configure-flags
+         ;; Add -I to match 'bash.pc' of Bash 4.4.
+         (list (string-append "CPPFLAGS=-I"
+                              (assoc-ref %build-inputs "bash:include")
+                              "/include/bash/include")
+
+               ;; The '.a' file is useless.
+               "--disable-static"
+
+               ;; Install 'lib/bash' as Bash 4.4 expects.
+               (string-append "--libdir=" (assoc-ref %outputs "out")
+                              "/lib/bash"))))
+      (native-inputs `(("pkg-config" ,pkg-config)
+                       ("autoconf" ,autoconf-wrapper)
+                       ("automake" ,automake)
+                       ("libtool" ,libtool)
+                       ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
+                       ("gettext" ,gettext-minimal)
+
+                       ;; Bash with loadable module support, for the test
+                       ;; suite.
+                       ("bash-full" ,bash)))
+      (inputs `(("guile" ,guile-2.0)
+                ("bash:include" ,bash "include")))
+      (synopsis "Extend Bash using Guile")
+      (description
+       "Guile-Bash provides a shared library and set of Guile modules,
+allowing you to extend Bash in Scheme.  Scheme interfaces allow you to access
+the following aspects of Bash:
+
address@hidden
address@hidden aliases;
address@hidden setting and getting Bash variables;
address@hidden creating dynamic variables;
address@hidden creating Bash functions with a Scheme implementation;
address@hidden reader macro for output capturing;
address@hidden reader macro for evaluating raw Bash commands.
address@hidden itemize
+
+To enable it, run:
+
address@hidden
+enable -f ~/.guix-profile/lib/bash/libguile-bash.so scm
address@hidden example
+
+and then run @command{scm example.scm}.")
+      (license license:gpl3+))))
+
+(define-public guile-8sync
   (package
-    (name "mcron")
-    (version "1.1.1")
+    (name "guile-8sync")
+    (version "0.4.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnu/mcron/mcron-"
-                                  version ".tar.gz"))
+              (uri (string-append "mirror://gnu/8sync/8sync-" version
+                                  ".tar.gz"))
               (sha256
                (base32
-                "1i9mcp6r6my61zfiydsm3n6my41mwvl7dfala4q29qx0zn1ynlm4"))))
+                "031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw"))))
     (build-system gnu-build-system)
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("automake" ,automake)
+                     ("guile" ,guile-2.2)
+                     ("pkg-config" ,pkg-config)
+                     ("texinfo" ,texinfo)))
     (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'set-timezone
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      ;; 'tests/job-specifier.scm' expects to be running in
-                      ;; UTC-2 or something.
-                      ;; FIXME: This issue is being investigated upstream, for
-                      ;; now we'll just skip the tests (see below):
-                      ;; 
<https://lists.gnu.org/archive/html/bug-mcron/2018-04/msg00005.html>.
-                      (let ((tzdata (assoc-ref inputs "tzdata")))
-                        (setenv "TZDIR"
-                                (string-append tzdata
-                                               "/share/zoneinfo"))
-                        (setenv "TZ" "UTC-2")
-                        #t)))
-                  (add-before 'check 'adjust-tests
+     `(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'setenv
                     (lambda _
-                      (substitute* "tests/job-specifier.scm"
-                        ;; (getpw) fails with "entry not found" in the build
-                        ;; environment, so pass an argument.
-                        (("\\(getpw\\)")
-                         "(getpwnam (getuid))")
-                        ;; The build environment lacks an entry for root in
-                        ;; /etc/passwd.
-                        (("\\(getpw 0\\)")
-                         "(getpwnam \"nobody\")")
-
-                        ;; FIXME: Skip the 4 faulty tests (see above).
-                        (("\\(test-equal \"next-year\"" all)
-                         (string-append "(test-skip 4)\n" all)))
+                      ;; quiet warnings
+                      (setenv "GUILE_AUTO_COMPILE" "0")
                       #t)))))
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("tzdata" ,tzdata-for-tests)))
-    (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2)))
-    (home-page "https://www.gnu.org/software/mcron/";)
-    (synopsis "Run jobs at scheduled times")
+    (home-page "https://gnu.org/s/8sync/";)
+    (synopsis "Asynchronous actor model library for Guile")
     (description
-     "GNU Mcron is a complete replacement for Vixie cron.  It is used to run
-tasks on a schedule, such as every hour or every Monday.  Mcron is written in
-Guile, so its configuration can be written in Scheme; the original cron
-format is also supported.")
-    (license license:gpl3+)))
+     "GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming
+library for GNU Guile based on the actor model.
 
-(define-public mcron2
-  ;; This was mthl's mcron development branch, and it became mcron 1.1.
-  (deprecated-package "mcron2" mcron))
+Note that 8sync is only available for Guile 2.2.")
+    (license license:lgpl3+)))
 
-(define-public guile-hall
+(define-public guile-daemon
   (package
-    (name "guile-hall")
-    (version "0.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.com/a-sassmannshausen/guile-hall";)
-             (commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b")))
-       (file-name "guile-hall-0.1.1-checkout")
-       (sha256
-        (base32
-         "03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1"))))
+    (name "guile-daemon")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/alezost/"; name
+                                  "/releases/download/v" version
+                                  "/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hh6gq6b6phpxm0b1dkxyzj3f4sxdf7dji63609lzypa5v1ad2gv"))))
     (build-system gnu-build-system)
-    (arguments
-     `(#:modules
-       ((ice-9 match)
-        (ice-9 ftw)
-        ,@%gnu-build-system-modules)
-       #:phases
-       (modify-phases
-           %standard-phases
-         (add-after
-             'install
-             'hall-wrap-binaries
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin/"))
-                    (site (string-append out "/share/guile/site")))
-               (match (scandir site)
-                 (("." ".." version)
-                  (let ((modules (string-append site "/" version))
-                        (compiled-modules
-                         (string-append
-                          out
-                          "/lib/guile/"
-                          version
-                          "/site-ccache")))
-                    (for-each
-                     (lambda (file)
-                       (wrap-program
-                           (string-append bin file)
-                         `("GUILE_LOAD_PATH" ":" prefix (,modules))
-                         `("GUILE_LOAD_COMPILED_PATH"
-                           ":"
-                           prefix
-                           (,compiled-modules))))
-                     ,(list 'list "hall"))
-                    #t)))))))))
     (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (propagated-inputs
-     `(("guile-config" ,guile-config)))
-    (synopsis "Guile project tooling")
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-2.2)))
+    (home-page "https://github.com/alezost/guile-daemon";)
+    (synopsis "Evaluate code in a running Guile process")
     (description
-     "Hall is a command-line application and a set of Guile libraries that
-allow you to quickly create and publish Guile projects.  It allows you to
-transparently support the GNU build system, manage a project hierarchy &
-provides tight coupling to Guix.")
-    (home-page
-     "https://gitlab.com/a-sassmannshausen/guile-hall";)
+     "Guile-Daemon is a small Guile program that loads your initial
+configuration file, and then reads and evaluates Guile expressions that
+you send to a FIFO file.")
     (license license:gpl3+)))
 
-(define-public guile-ics
+(define-public guile-dsv
   (package
-    (name "guile-ics")
-    (version "0.2.0")
+    (name "guile-dsv")
+    (version "0.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/artyom-poptsov/guile-ics";)
-                    (commit (string-append "v" version))))
+                    (url "https://github.com/artyom-poptsov/guile-dsv";)
+                    (commit "bdc5267d007478abc20ea96d7c459b7dd9560b3d")))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"))))
+                "1irw6mz8998nwyhzrw9g94jcz60b9zljgqfmipaz1ybn8579qjx0"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
+     `(("autoconf" ,autoconf)
        ("automake" ,automake)
-       ("texinfo" ,texinfo)
-       ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2) ("which" ,which)))
+       ("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
+    (inputs `(("guile" ,guile-2.2)))
     (propagated-inputs `(("guile-lib" ,guile-lib)))
-    (home-page "https://github.com/artyom-poptsov/guile-ics";)
-    (synopsis "Guile parser library for the iCalendar format")
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'set-guilesitedir
+                    (lambda _
+                      (substitute* "Makefile.in"
+                        (("^guilesitedir =.*$")
+                         "guilesitedir = \
+$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      (substitute* "modules/Makefile.in"
+                        (("^guilesitedir =.*$")
+                         "guilesitedir = \
+$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      (substitute* "modules/dsv/Makefile.in"
+                        (("^guilesitedir =.*$")
+                         "guilesitedir = \
+$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      #t)))))
+    (home-page "https://github.com/artyom-poptsov/guile-dsv";)
+    (synopsis "DSV module for Guile")
     (description
-     "Guile-ICS is an iCalendar (RFC5545) format parser library written in
-pure Scheme.  The library can be used to read and write iCalendar data.
-
-The library is shipped with documentation in Info format and usage examples.")
+     "Guile-DSV is a GNU Guile module for working with the
+delimiter-separated values (DSV) data format.  Guile-DSV supports the
+Unix-style DSV format and RFC 4180 format.")
     (license license:gpl3+)))
 
-(define-public guile-lib
+(define-public guile-fibers
   (package
-    (name "guile-lib")
-    (version "0.2.6.1")
+    (name "guile-fibers")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://savannah/guile-lib/guile-lib-"
+              (uri (string-append "https://wingolog.org/pub/fibers/fibers-";
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"))))
+                "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:make-flags
-       '("GUILE_AUTO_COMPILE=0")        ; to prevent guild errors
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-module-dir
-           (lambda _
-             (substitute* "src/Makefile.in"
-               (("^moddir = ([[:graph:]]+)")
-                "moddir = $(datadir)/guile/site/@address@hidden")
-               (("^godir = ([[:graph:]]+)")
-                "godir = \
-$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
-             #t)))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2)))
-    (home-page "https://www.nongnu.org/guile-lib/";)
-    (synopsis "Collection of useful Guile Scheme modules")
+     '(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'mode-guile-objects
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; .go files are installed to "lib/guile/X.Y/cache".
+                      ;; This phase moves them to "…/site-ccache".
+                      (let* ((out (assoc-ref outputs "out"))
+                             (lib (string-append out "/lib/guile"))
+                             (old (car (find-files lib "^ccache$"
+                                                   #:directories? #t)))
+                             (new (string-append (dirname old)
+                                                 "/site-ccache")))
+                        (rename-file old new)
+                        #t))))))
+    (native-inputs
+     `(("texinfo" ,texinfo)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-2.2)))
+    (synopsis "Lightweight concurrency facility for Guile")
     (description
-     "Guile-Lib is intended as an accumulation place for pure-scheme Guile
-modules, allowing for people to cooperate integrating their generic Guile
-modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN
-for Guile\".")
-
-    ;; The whole is under GPLv3+, but some modules are under laxer
-    ;; distribution terms such as LGPL and public domain.  See `COPYING' for
-    ;; details.
-    (license license:gpl3+)))
-
-(define-public guile2.0-lib
-  (package-for-guile-2.0 guile-lib))
+     "Fibers is a Guile library that implements a a lightweight concurrency
+facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is
+like a \"goroutine\" from the Go language: a lightweight thread-like
+abstraction.  Systems built with Fibers can scale up to millions of concurrent
+fibers, tens of thousands of concurrent socket connections, and many parallel
+cores.  The Fibers library also provides Concurrent ML-like channels for
+communication between fibers.
 
-(define-public guile2.2-lib
-  (deprecated-package "guile2.2-lib" guile-lib))
+Note that Fibers makes use of some Guile 2.1/2.2-specific features and
+is not available for Guile 2.0.")
+    (home-page "https://github.com/wingo/fibers";)
+    (license license:lgpl3+)))
 
-(define-public guile-json
+(define-public guile-syntax-highlight
   (package
-    (name "guile-json")
-    (version "1.2.0")
-    (home-page "https://github.com/aconchillo/guile-json";)
+    (name "guile-syntax-highlight")
+    (version "0.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.savannah.nongnu.org/releases/";
-                                  name "/" name "-" version ".tar.gz"))
+              (uri (string-append "https://files.dthompson.us/";
+                                  "guile-syntax-highlight/"
+                                  "guile-syntax-highlight-"
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "15gnb84d7hpazqhskkf3g9z4r6knw54wfj4ch5270kakz1lp70c9"))))
+                "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi"))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("guile" ,guile-2.2)))
-    (inputs `(("guile" ,guile-2.2)))
-    (synopsis "JSON module for Guile")
-    (description
-     "Guile-JSON supports parsing and building JSON documents according to the
-specification.  These are the main features:
-
address@hidden
address@hidden Strictly complies to @uref{http://json.org, specification}.
address@hidden Build JSON documents programmatically via macros.
address@hidden Unicode support for strings.
address@hidden Allows JSON pretty printing.
address@hidden itemize\n")
-
-    ;; Version 1.2.0 switched to GPLv3+ (from LGPLv3+).
-    (license license:gpl3+)))
-
-(define-public guile2.2-json
-  (deprecated-package "guile2.2-json" guile-json))
-
-(define-public guile2.0-json
-  (package-for-guile-2.0 guile-json))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-2.2)))
+    (synopsis "General-purpose syntax highlighter for GNU Guile")
+    (description "Guile-syntax-highlight is a general-purpose syntax
+highlighting library for GNU Guile.  It can parse code written in various
+programming languages into a simple s-expression that can be converted to
+HTML (via SXML) or any other format for rendering.")
+    (home-page "http://dthompson.us/projects/guile-syntax-highlight.html";)
+    (license license:lgpl3+)))
 
-(define-public guile-json-3
-  ;; This version is incompatible with 1.x; see the 'NEWS' file.
+(define-public guile-sjson
   (package
-    (inherit guile-json)
-    (name "guile-json")
-    (version "3.1.0")
+    (name "guile-sjson")
+    (version "0.2.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.savannah.nongnu.org/releases/";
-                                  name "/" name "-" version ".tar.gz"))
+              (uri (string-append "https://dustycloud.org/misc/sjson-"; version
+                                  ".tar.gz"))
               (sha256
                (base32
-                "1yfqscz74i4vxylabd3s9l0wbdp8bg9qxnv1ixdm3b1l7zdx00z3"))))))
+                "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-2.2)))
+    (home-page "https://gitlab.com/dustyweb/guile-sjson";)
+    (synopsis "S-expression based json reader/writer for Guile")
+    (description "guile-sjson is a json reader/writer for Guile.
+It has a nice, simple s-expression based syntax.")
+    (license license:lgpl3+)))
 
-(define-public guile-minikanren
+(define-public guile-colorized
   (package
-    (name "guile-minikanren")
-    (version "20150424.e844d85")
+    (name "guile-colorized")
+    (version "0.1")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/ijp/minikanren.git";)
-                    (commit "e844d85512f8c055d3f96143ee506007389a25e3")))
-              (file-name (string-append name "-" version "-checkout"))
+              (method url-fetch)
+              (uri (string-append 
"https://github.com/NalaGinrut/guile-colorized/";
+                                  "archive/v" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6"))))
+                "16xhc3an6aglnca8xl3mvgi8hsqzqn68vsl5ga4bz8bvbap5fn4p"))))
     (build-system guile-build-system)
     (native-inputs
      `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/ijp/minikanren";)
-    (synopsis "MiniKanren declarative logic system, packaged for Guile")
+    (home-page "https://github.com/NalaGinrut/guile-colorized";)
+    (synopsis "Colorized REPL for Guile")
     (description
-     "MiniKanren is a relational programming extension to the Scheme
-programming Language, written as a smaller version of Kanren suitable for
-pedagogical purposes.  It is featured in the book, The Reasoned Schemer,
-written by Dan Friedman, William Byrd, and Oleg Kiselyov.
-
-This is Ian Price's r6rs packaged version of miniKanren, which deviates
-slightly from miniKanren mainline.
-
-See http://minikanren.org/ for more on miniKanren generally.")
-    (license license:expat)))
-
-(define-public guile2.0-minikanren
-  (package-for-guile-2.0 guile-minikanren))
-
-(define-public guile2.2-minikanren
-  (deprecated-package "guile2.2-minikanren" guile-minikanren))
-
-(define-public guile-miniadapton
-  (let ((commit "1b5749422304567c96ac5367f2221dda9eff5880")
-        (revision "1"))
-    (package
-      (name "guile-miniadapton")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/fisherdj/miniAdapton.git";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "09q51zkw2fypad5xixskfzw2cjhjgs5cswdp3i7cpp651rb3zndh"))))
-      (build-system guile-build-system)
-      (native-inputs
-       `(("guile" ,guile-2.2)))
-      (home-page "https://github.com/fisherdj/miniAdapton";)
-      (synopsis "Minimal implementation of incremental computation in Guile
-Scheme")
-      (description "This package provides a complete Scheme implementation of
-miniAdapton, which implements the core functionality of the Adapton system for
-incremental computation (also known as self-adjusting computation).  Like
-Adapton, miniAdapton allows programmers to safely combine mutation and
-memoization.  miniAdapton is built on top of an even simpler system,
-microAdapton.  Both miniAdapton and microAdapton are designed to be easy to
-understand, extend, and port to host languages other than Scheme.")
-      (license license:expat))))
+     "Guile-colorized provides you with a colorized REPL for GNU Guile.")
+    (license license:gpl3+)))
 
-(define-public guile-irregex
+(define-public guile-pfds
   (package
-    (name "guile-irregex")
-    (version "0.9.6")
+    (name "guile-pfds")
+    (version "0.3")
+    (home-page "https://github.com/ijp/pfds";)
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://synthcode.com/scheme/irregex/irregex-";
-                    version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
               (sha256
                (base32
-                "1ia3m7dp3lcxa048q0gqbiwwsyvn99baw6xkhb4bhhzn4k7bwyqq"))))
+                "19y33wg94pf0n98dkfqd1zbw93fgky4sawxsxl6s3vyqwl0yi5vh"))
+              (file-name (string-append name "-" version "-checkout"))))
     (build-system guile-build-system)
     (arguments
-     '(#:phases (modify-phases %standard-phases
+     '(#:source-directory "src"
+       #:phases (modify-phases %standard-phases
                   (add-after 'unpack 'move-files-around
                     (lambda _
-                      ;; Move the relevant source files to src/ and create the
-                      ;; rx/ directory to match the expected module hierarchy.
-                      (mkdir-p "src/rx/source")
-                      (rename-file "irregex-guile.scm"
-                                   "src/rx/irregex.scm")
-                      (rename-file "irregex.scm"
-                                   "src/rx/source/irregex.scm")
-                      ;; Not really reachable via guile's packaging system,
-                      ;; but nice to have around.
-                      (rename-file "irregex-utils.scm"
-                                   "src/rx/source/irregex-utils.scm")
-                      #t)))
-       #:source-directory "src"))
+                      ;; Move files under a pfds/ directory to reflect the
+                      ;; module hierarchy.
+                      (mkdir-p "src/pfds")
+                      (for-each (lambda (file)
+                                  (rename-file file
+                                               (string-append "src/pfds/"
+                                                              file)))
+                                '("bbtrees.sls"
+                                  "deques"
+                                  "deques.sls"
+                                  "dlists.sls"
+                                  "fingertrees.sls"
+                                  "hamts.sls"
+                                  "heaps.sls"
+                                  "private"
+                                  "psqs.sls"
+                                  "queues"
+                                  "queues.sls"
+                                  "sequences.sls"
+                                  "sets.sls"))
+
+                      ;; In Guile <= 2.2.4, there's no way to tell 'guild
+                      ;; compile' to accept the ".sls" extension.  So...
+                      (for-each (lambda (file)
+                                  (rename-file file
+                                               (string-append
+                                                (string-drop-right file 4)
+                                                ".scm")))
+                                (find-files "." "\\.sls$"))
+                      #t)))))
     (native-inputs
      `(("guile" ,guile-2.2)))
-    (home-page "http://synthcode.com/scheme/irregex";)
-    (synopsis "S-expression based regular expressions")
+    (synopsis "Purely functional data structures for Guile")
     (description
-     "Irregex is an s-expression based alternative to your classic
-string-based regular expressions.  It implements SRFI 115 and is deeply
-inspired by the SCSH regular expression system.")
-    (license license:bsd-3)))
-
-(define-public guile2.0-irregex
-  (package-for-guile-2.0 guile-irregex))
-
-(define-public guile2.2-irregex
-  (deprecated-package "guile2.2-irregex" guile-irregex))
+     "This package provides purely functional data structures written in R6RS
+Scheme and compiled for Guile.  It has been tested with Racket, Guile 2,
+Vicare Scheme and IronScheme.  Right now it contains:
 
-;; There are two guile-gdbm packages, one using the FFI and one with
-;; direct C bindings, hence the verbose name.
address@hidden
address@hidden queues
address@hidden deques
address@hidden bbtrees
address@hidden sets
address@hidden dlists
address@hidden priority search queues (PSQs)
address@hidden finger trees
address@hidden sequences
address@hidden heaps
address@hidden hash array mapped tries (HAMTs).
address@hidden itemize\n")
+    (license license:bsd-3)))
 
-(define-public guile-gdbm-ffi
+(define-public guile-aa-tree
   (package
-    (name "guile-gdbm-ffi")
-    (version "20120209.fa1d5b6")
+    (name "guile-aa-tree")
+    (version "3.1.1")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/ijp/guile-gdbm.git";)
-                    (commit "fa1d5b6231d0e4d096687b378c025f2148c5f246")))
-              (file-name (string-append name "-" version "-checkout"))
-              (patches (search-patches
-                        "guile-gdbm-ffi-support-gdbm-1.14.patch"))
+              (method url-fetch)
+              (uri (string-append 
"mirror://savannah/guile-aa-tree/guile-aa-tree-"
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "1j8wrsw7v9w6qkl47xz0rdikg50v16nn6kbs3lgzcymjzpa7babj"))))
+                "0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh"))))
     (build-system guile-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'move-examples
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      ;; Move examples where they belong.
-                      (let* ((out (assoc-ref outputs "out"))
-                             (doc (string-append out "/share/doc/"
-                                                 (strip-store-file-name out)
-                                                 "/examples")))
-                        (copy-recursively "examples" doc)
-                        (delete-file-recursively "examples")
-                        #t)))
-                  (add-after 'unpack 'set-libgdbm-file-name
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "gdbm.scm"
-                        (("\\(dynamic-link \"libgdbm\"\\)")
-                         (format #f "(dynamic-link \"~a/lib/libgdbm.so\")"
-                                 (assoc-ref inputs "gdbm"))))
-                      #t)))))
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (inputs
-     `(("gdbm" ,gdbm)))
-    (home-page "https://github.com/ijp/guile-gdbm";)
-    (synopsis "Guile bindings to the GDBM library via Guile's FFI")
+    (native-inputs `(("guile" ,guile-2.2)))
+    ;; https://savannah.nongnu.org/projects/guile-aa-tree
+    (home-page "https://qlfiles.net/guile-aa-tree/";)
+    (synopsis "AA tree data structure for Guile")
     (description
-     "Guile bindings to the GDBM key-value storage system, using
-Guile's foreign function interface.")
+     "This package provides an implementation of @dfn{AA trees}, a
+self-balancing binary tree data structure, for Guile.  It ensure @math{O(log
+n)} worst case performance for core operations.  The module provides
+non-mutating insert, delete, and search operations, with support for
+convenient nested tree operations.")
     (license license:gpl3+)))
 
-(define-public guile2.0-gdbm-ffi
-  (package-for-guile-2.0 guile-gdbm-ffi))
+(define-public guile-simple-zmq
+  (let ((commit "68bedb6679716214fb9d3472da57544526f7a618")
+        (revision "3"))
+    (package
+      (name "guile-simple-zmq")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jerry40/guile-simple-zmq";)
+               (commit commit)))
+         (sha256
+          (base32
+           "1ad3xg69qqviy1f6dnlw0ysmfdbmp1jq65rfqb8nfd8dsrq2syli"))
+         (file-name (git-file-name name version))))
+      (build-system guile-build-system)
+      (arguments
+       `(#:source-directory "src"
+         #:phases (modify-phases %standard-phases
+                    (add-after 'unpack 'set-libzmq-file-name
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        (substitute* "src/simple-zmq.scm"
+                          (("\\(dynamic-link \"libzmq\"\\)")
+                           (format #f "(dynamic-link \"~a/lib/libzmq.so\")"
+                                   (assoc-ref inputs "zeromq"))))
+                        #t)))))
+      (native-inputs
+       `(("guile" ,guile-2.2)))
+      (inputs
+       `(("zeromq" ,zeromq)))
+      (home-page "https://github.com/jerry40/guile-simple-zmq";)
+      (synopsis "Guile wrapper over ZeroMQ library")
+      (description
+       "This package provides a Guile programming interface to the ZeroMQ
+messaging library.")
+      (license license:gpl3+))))
+
+(define-public jupyter-guile-kernel
+  (let ((commit "a7db9245a886e104138474df46c3e88b95cff629")
+        (revision "1"))
+    (package
+      (name "jupyter-guile-kernel")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jerry40/guile-kernel";)
+               (commit commit)))
+         (sha256
+          (base32
+           "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f"))))
+      (build-system guile-build-system)
+      (arguments
+       '(#:phases (modify-phases %standard-phases
+                    (add-after 'unpack 'set-openssl-file-name
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        ;; Record the absolute file name of the 'openssl'
+                        ;; command.
+                        (substitute* "src/hmac.scm"
+                          (("openssl")
+                           (string-append (assoc-ref inputs "openssl")
+                                          "/bin/openssl")))
+                        #t))
+
+                    ;; XXX: The code uses 'include' to include its own source
+                    ;; files, and "-L src" isn't enough in this case.
+                    (add-before 'build 'chdir
+                      (lambda _ (chdir "src") #t))
+                    (add-after 'build 'chdir-back
+                      (lambda _ (chdir "..") #t))
+
+                    (add-after 'install 'install-kernel
+                      (lambda* (#:key inputs outputs #:allow-other-keys)
+                        (let* ((out   (assoc-ref outputs "out"))
+                               (json  (assoc-ref inputs "guile-json"))
+                               (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-file "src/kernel.json" dir)
+
+                          ;; Fix hard-coded file name in the kernel.
+                          (substitute* (string-append dir "/kernel.json")
+                            (("/home/.*/guile-jupyter-kernel.scm")
+                             (string-append out "/share/guile/site/"
+                                            (target-guile-effective-version)
+                                            "/guile-jupyter-kernel.scm"))
+                            (("\"guile\"")
+                             (string-append "\"" (assoc-ref inputs "guile")
+                                            "/bin/guile\""))
+                            (("-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))))))
+      (inputs
+       `(("openssl" ,openssl)
+         ("guile" ,guile-2.2)
+         ("guile-json" ,guile-json)
+         ("guile-simple-zmq" ,guile-simple-zmq)))
+      (synopsis "Guile kernel for the Jupyter Notebook")
+      (description
+       "This package provides a Guile 2.x kernel for the Jupyter Notebook.  It
+allows users to interact with the Guile REPL through Jupyter.")
+      (home-page "https://github.com/jerry40/guile-kernel";)
+      (license license:gpl3+))))
 
-(define-public guile2.2-gdbm-ffi
-  (deprecated-package "guile2.2-gdbm-ffi" guile-gdbm-ffi))
+(define-public guile-sparql
+  (package
+   (name "guile-sparql")
+   (version "0.0.7")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "https://github.com/roelj/guile-sparql/releases/download/";
+                  version "/guile-sparql-" version ".tar.gz"))
+            (sha256
+             (base32 "1drnvhsgl0gc5crmb16yyw1j98nkhwwcgssv9vgm36ng43nnzffd"))))
+   (build-system gnu-build-system)
+   (arguments `(#:tests? #f)) ; There are no tests.
+   (native-inputs
+    `(("pkg-config" ,pkg-config)))
+   (inputs
+    `(("guile" ,guile-2.2)))
+   (home-page "https://github.com/roelj/guile-sparql";)
+   (synopsis "SPARQL module for Guile")
+   (description "This package provides the functionality to query a SPARQL
+endpoint.  Additionally, it provides an interface to write SPARQL queries
+using S-expressions.")
+   (license license:gpl3+)))
 
-(define-public guile-sqlite3
+(define-public guile-debbugs
   (package
-    (name "guile-sqlite3")
-    (version "0.1.0")
-    (home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git";)
+    (name "guile-debbugs")
+    (version "0.0.2")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-"
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp"))
-              (file-name (string-append name "-" version "-checkout"))))
+                "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i"))
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* "Makefile.in"
+                  (("^godir = (.*)/ccache" _ prefix)
+                   (string-append "godir = " prefix "/site-ccache"))))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
-    (inputs
      `(("guile" ,guile-2.2)
-       ("sqlite" ,sqlite)))
-    (synopsis "Access SQLite databases from Guile")
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://savannah.gnu.org/projects/guile-debbugs/";)
+    (synopsis "Guile interface to the Debbugs bug tracking service")
     (description
-     "This package provides Guile bindings to the SQLite database system.")
+     "This package provides a Guile library to communicate with a Debbugs bug
+tracker's SOAP service, such as @url{https://bugs.gnu.org}.";)
     (license license:gpl3+)))
 
-(define-public guile2.0-sqlite3
-  (package-for-guile-2.0 guile-sqlite3))
+(define-public guile-email
+  (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
+        (revision "1"))
+    (package
+      (name "guile-email")
+      (version (git-version "0.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.systemreboot.net/guile-email";)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)))
+      (inputs
+       `(("guile" ,guile-2.2)))
+      (home-page "https://git.systemreboot.net/guile-email";)
+      (synopsis "Guile email parser")
+      (description "This package provides an email parser written in pure
+Guile.")
+      (license license:agpl3+))))
+
+(define-public guile-debbugs-next
+  (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
+        (revision "1"))
+    (package (inherit guile-debbugs)
+      (name "guile-debbugs")
+      (version (git-version "0.0.3" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url 
"https://git.savannah.gnu.org/git/guile-debbugs.git";)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("texinfo" ,texinfo)))
+      (inputs
+       `(("guile" ,guile-2.2)
+         ("guile-email" ,guile-email))))))
 
-(define-public haunt
+;; There has not been any release yet.
+(define-public guile-newt
+  (let ((commit "80c1e9e71945f833386d1632b52573e59325804f")
+        (revision "4"))
+    (package
+      (name "guile-newt")
+      (version (string-append "0-" revision "." (string-take commit 9)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://gitlab.com/mothacehe/guile-newt";)
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:make-flags
+         '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
+      (inputs
+       `(("guile" ,guile-2.2)
+         ("newt" ,newt)))
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("pkg-config" ,pkg-config)))
+      (synopsis "Guile bindings to Newt")
+      (description
+       "This package provides bindings for Newt, a programming library for
+color text mode, widget based user interfaces.  The bindings are written in 
pure
+Scheme by using Guile’s foreign function interface.")
+      (home-page "https://gitlab.com/mothacehe/guile-newt";)
+      (license license:gpl3+))))
+
+(define-public guile-mastodon
   (package
-    (name "haunt")
-    (version "0.2.4")
+    (name "guile-mastodon")
+    (version "0.0.1")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://files.dthompson.us/haunt/haunt-";
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://framagit.org/prouby/guile-mastodon.git";)
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules ((ice-9 match) (ice-9 ftw)
-                  ,@%gnu-build-system-modules)
-       #:tests? #f ; test suite is non-deterministic :(
-       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'wrap-haunt
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      ;; Wrap the 'haunt' command to refer to the right
-                      ;; modules.
-                      (let* ((out  (assoc-ref outputs "out"))
-                             (bin  (string-append out "/bin"))
-                             (site (string-append
-                                    out "/share/guile/site"))
-                             (deps (list (assoc-ref inputs "guile-reader")
-                                         (assoc-ref inputs 
"guile-commonmark"))))
-                        (match (scandir site)
-                          (("." ".." version)
-                           (let ((modules (string-append site "/" version))
-                                 (compiled-modules (string-append
-                                                    out "/lib/guile/" version
-                                                    "/site-ccache")))
-                             (wrap-program (string-append bin "/haunt")
-                               `("GUILE_LOAD_PATH" ":" prefix
-                                 (,modules
-                                  ,@(map (lambda (dep)
-                                           (string-append dep
-                                                          "/share/guile/site/"
-                                                          version))
-                                         deps)))
-                               `("GUILE_LOAD_COMPILED_PATH" ":" prefix
-                                 (,compiled-modules
-                                  ,@(map (lambda (dep)
-                                           (string-append dep "/lib/guile/"
-                                                          version
-                                                          "/site-ccache"))
-                                         deps))))
-                             #t)))))))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (propagated-inputs
-     `(("guile-reader" ,guile-reader)
-       ("guile-commonmark" ,guile-commonmark)))
-    (synopsis "Functional static site generator")
-    (description "Haunt is a static site generator written in Guile
-Scheme.  Haunt features a functional build system and an extensible
-interface for reading articles in any format.")
-    (home-page "http://haunt.dthompson.us";)
-    (license license:gpl3+)))
-
-(define-public guile2.0-haunt
-  (package-for-guile-2.0
-   (package (inherit haunt) (name "guile2.0-haunt"))))
-(define-public guile2.2-haunt
-  (deprecated-package "guile2.2-haunt" haunt))
-
-(define-public guile-config
-  (package
-    (name "guile-config")
-    (version "0.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.com/a-sassmannshausen/guile-config";)
-             (commit "ce12de3f438c6b2b59c43ee21bcd58251835fdf3")))
-       (file-name "guile-config-0.3-checkout")
-       (sha256 (base32 
"02zbpin0r9m2vxmr7mv68v3xdn247dcck56kbzjn0gj4c2rhih85"))))
+                "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (synopsis
-     "Guile application configuration parsing library.")
-    (description
-     "Guile Config is a library providing a declarative approach to
-application configuration specification.  The library provides clean
-configuration declaration forms, and processors that take care of:
-configuration file creation; configuration file parsing; command-line
-parameter parsing using getopt-long; basic GNU command-line parameter
-generation (--help, --usage, --version); automatic output generation for the
-above command-line parameters.")
-    (home-page
-     "https://gitlab.com/a-sassmannshausen/guile-config";)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-2.2)
+       ("gnutls" ,gnutls)
+       ("guile-json" ,guile-json)))
+    (home-page "https://framagit.org/prouby/guile-mastodon";)
+    (synopsis "Guile Mastodon REST API module")
+    (description "This package provides Guile modules to access the
address@hidden://docs.joinmastodon.org/api/, REST API of Mastodon}, a federated
+microblogging service.")
     (license license:gpl3+)))
 
-(define-public guile-redis
+;; There has not been any release yet.
+(define-public guile-parted
+  (let ((commit "ea3f1a1f6844775fc59d3078d2a09c62ffb341b8")
+        (revision "0"))
+    (package
+      (name "guile-parted")
+      (version (string-append "0-" revision "." (string-take commit 9)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://gitlab.com/mothacehe/guile-parted";)
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:make-flags
+         '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
+      (inputs
+       `(("guile" ,guile-2.2)
+         ("parted" ,parted)))
+      (propagated-inputs
+       `(("guile-bytestructures" ,guile-bytestructures)))
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("pkg-config" ,pkg-config)))
+      (synopsis "Guile bindings to GNU Parted")
+      (description
+       "This package provides bindings for GNU Parted library, a C library
+allowing disk partition tables creation and manipulation. The bindings are
+written in pure Scheme by using Guile's foreign function interface.")
+      (home-page "https://gitlab.com/mothacehe/guile-parted";)
+      (license license:gpl3+))))
+
+(define-public guile-xosd
   (package
-    (name "guile-redis")
-    (version "1.0.0")
-    (home-page "https://github.com/aconchillo/guile-redis";)
+    (name "guile-xosd")
+    (version "0.2.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append home-page "/archive/" version ".tar.gz"))
+              (uri (string-append "https://github.com/alezost/"; name
+                                  "/releases/download/v" version
+                                  "/" name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1dp5fmqvma59pvp1nfpq6hqgbmjici8sd1y8llahl87fynw1dvr9"))))
+                "1ri5065c16kmgrf2pysn2ymxjqi5302lhpb07wkl1jr75ym8fn8p"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("guile" ,guile-2.2)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxinerama" ,libxinerama)
+       ("xosd" ,xosd)))
+    (home-page "https://github.com/alezost/guile-xosd";)
+    (synopsis "XOSD bindings for Guile")
+    (description
+     "Guile-XOSD provides Guile bindings for @code{libxosd},
address@hidden://sourceforge.net/projects/libxosd/, the X On Screen Display
+library}.")
+    (license license:gpl3+)))
+
+(define-public guile-dbi
+  (package
+    (name "guile-dbi")
+    (version "2.1.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://download.gna.org/guile-dbi/guile-dbi-";
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "116njrprhgrsv1qm904sp3b02rq01fx639r433d657gyhw3x159n"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags
+       (list (string-append
+              "--with-guile-site-dir=" %output "/share/guile/site/2.2"))
+       #:make-flags
+       (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:"
+                            (assoc-ref %build-inputs "guile-dbd-sqlite3") 
"/lib"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'patch-extension-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (dbi.scm (string-append
+                              out "/share/guile/site/2.2/dbi/dbi.scm"))
+                    (ext     (string-append out "/lib/libguile-dbi")))
+               (substitute* dbi.scm (("libguile-dbi") ext))
+               #t))))))
+    (inputs
+     `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3))) ; only shared library, no 
scheme files
+    (propagated-inputs
+     `(("guile" ,guile-2.2)))
+    (synopsis "Guile database abstraction layer")
+    (home-page "http://home.gna.org/guile-dbi/guile-dbi.html";)
+    (description
+     "guile-dbi is a library for Guile that provides a convenient interface to
+SQL databases.  Database programming with guile-dbi is generic in that the same
+programming interface is presented regardless of which database system is used.
+It currently supports MySQL, Postgres and SQLite3.")
+    (license license:gpl2+)))
+
+(define guile-dbi-bootstrap
+  (package
+    (inherit guile-dbi)
+    (name "guile-dbi-bootstrap")
+    (inputs '())
+    (arguments
+     (substitute-keyword-arguments (package-arguments guile-dbi)
+       ((#:make-flags _) '(list))))))
+
+(define-public guile-dbd-sqlite3
+  (package
+    (name "guile-dbd-sqlite3")
+    (version "2.1.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://download.gna.org/guile-dbi/guile-dbd-sqlite3-";
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0rg71jchxd2y8x496s8zmfmikr5g8zxi8zv2ar3f7a23pph92iw2"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) ; only required for 
headers
+    (inputs
+     `(("sqlite" ,sqlite)
+       ("zlib" ,(@ (gnu packages compression) zlib))))
+    (synopsis "Guile DBI driver for SQLite")
+    (home-page "https://github.com/jkalbhenn/guile-dbd-sqlite3";)
+    (description
+     "guile-dbi is a library for Guile that provides a convenient interface to
+SQL databases.  This package implements the interface for SQLite.")
+    (license license:gpl2+)))
+
+(define-public guile-config
+  (package
+    (name "guile-config")
+    (version "0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/a-sassmannshausen/guile-config";)
+             (commit "ce12de3f438c6b2b59c43ee21bcd58251835fdf3")))
+       (file-name "guile-config-0.3-checkout")
+       (sha256 (base32 
"02zbpin0r9m2vxmr7mv68v3xdn247dcck56kbzjn0gj4c2rhih85"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
-       ("guile" ,guile-2.2)))
-    (synopsis "Redis client library for Guile")
-    (description "Guile-redis provides a Scheme interface to the Redis
-key-value cache and store.")
-    (license license:lgpl3+)))
+       ("texinfo" ,texinfo)))
+    (inputs `(("guile" ,guile-2.2)))
+    (synopsis
+     "Guile application configuration parsing library.")
+    (description
+     "Guile Config is a library providing a declarative approach to
+application configuration specification.  The library provides clean
+configuration declaration forms, and processors that take care of:
+configuration file creation; configuration file parsing; command-line
+parameter parsing using getopt-long; basic GNU command-line parameter
+generation (--help, --usage, --version); automatic output generation for the
+above command-line parameters.")
+    (home-page
+     "https://gitlab.com/a-sassmannshausen/guile-config";)
+    (license license:gpl3+)))
 
-(define-public guile2.0-redis
-  (package-for-guile-2.0 guile-redis))
+(define-public guile-hall
+  (package
+    (name "guile-hall")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/a-sassmannshausen/guile-hall";)
+             (commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b")))
+       (file-name "guile-hall-0.1.1-checkout")
+       (sha256
+        (base32
+         "03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:modules
+       ((ice-9 match)
+        (ice-9 ftw)
+        ,@%gnu-build-system-modules)
+       #:phases
+       (modify-phases
+           %standard-phases
+         (add-after
+             'install
+             'hall-wrap-binaries
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin/"))
+                    (site (string-append out "/share/guile/site")))
+               (match (scandir site)
+                 (("." ".." version)
+                  (let ((modules (string-append site "/" version))
+                        (compiled-modules
+                         (string-append
+                          out
+                          "/lib/guile/"
+                          version
+                          "/site-ccache")))
+                    (for-each
+                     (lambda (file)
+                       (wrap-program
+                           (string-append bin file)
+                         `("GUILE_LOAD_PATH" ":" prefix (,modules))
+                         `("GUILE_LOAD_COMPILED_PATH"
+                           ":"
+                           prefix
+                           (,compiled-modules))))
+                     ,(list 'list "hall"))
+                    #t)))))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
+    (inputs `(("guile" ,guile-2.2)))
+    (propagated-inputs
+     `(("guile-config" ,guile-config)))
+    (synopsis "Guile project tooling")
+    (description
+     "Hall is a command-line application and a set of Guile libraries that
+allow you to quickly create and publish Guile projects.  It allows you to
+transparently support the GNU build system, manage a project hierarchy &
+provides tight coupling to Guix.")
+    (home-page
+     "https://gitlab.com/a-sassmannshausen/guile-hall";)
+    (license license:gpl3+)))
 
-(define-public guile2.2-redis
-  (deprecated-package "guile2.2-redis" guile-redis))
+(define-public guile-ics
+  (package
+    (name "guile-ics")
+    (version "0.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/artyom-poptsov/guile-ics";)
+                    (commit (string-append "v" version))))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+               (base32
+                "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf-wrapper)
+       ("automake" ,automake)
+       ("texinfo" ,texinfo)
+       ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs `(("guile" ,guile-2.2) ("which" ,which)))
+    (propagated-inputs `(("guile-lib" ,guile-lib)))
+    (home-page "https://github.com/artyom-poptsov/guile-ics";)
+    (synopsis "Guile parser library for the iCalendar format")
+    (description
+     "Guile-ICS is an iCalendar (RFC5545) format parser library written in
+pure Scheme.  The library can be used to read and write iCalendar data.
+
+The library is shipped with documentation in Info format and usage examples.")
+    (license license:gpl3+)))
 
 (define-public guile-wisp
   (package
@@ -1431,975 +1380,462 @@ provides access to that interface and its types from 
the Scheme level.")
     (home-page "https://www.nongnu.org/g-wrap/index.html";)
     (license license:lgpl2.1+)))
 
-(define-public guile-dbi
-  (package
-    (name "guile-dbi")
-    (version "2.1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://download.gna.org/guile-dbi/guile-dbi-";
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "116njrprhgrsv1qm904sp3b02rq01fx639r433d657gyhw3x159n"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags
-       (list (string-append
-              "--with-guile-site-dir=" %output "/share/guile/site/2.2"))
-       #:make-flags
-       (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:"
-                            (assoc-ref %build-inputs "guile-dbd-sqlite3") 
"/lib"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'patch-extension-path
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref outputs "out"))
-                    (dbi.scm (string-append
-                              out "/share/guile/site/2.2/dbi/dbi.scm"))
-                    (ext     (string-append out "/lib/libguile-dbi")))
-               (substitute* dbi.scm (("libguile-dbi") ext))
-               #t))))))
-    (inputs
-     `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3))) ; only shared library, no 
scheme files
-    (propagated-inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "Guile database abstraction layer")
-    (home-page "http://home.gna.org/guile-dbi/guile-dbi.html";)
+(define-public guile-miniadapton
+  (let ((commit "1b5749422304567c96ac5367f2221dda9eff5880")
+        (revision "1"))
+    (package
+      (name "guile-miniadapton")
+      (version (string-append "0-" revision "." (string-take commit 9)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/fisherdj/miniAdapton.git";)
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "09q51zkw2fypad5xixskfzw2cjhjgs5cswdp3i7cpp651rb3zndh"))))
+      (build-system guile-build-system)
+      (native-inputs
+       `(("guile" ,guile-2.2)))
+      (home-page "https://github.com/fisherdj/miniAdapton";)
+      (synopsis "Minimal implementation of incremental computation in Guile
+Scheme")
+      (description "This package provides a complete Scheme implementation of
+miniAdapton, which implements the core functionality of the Adapton system for
+incremental computation (also known as self-adjusting computation).  Like
+Adapton, miniAdapton allows programmers to safely combine mutation and
+memoization.  miniAdapton is built on top of an even simpler system,
+microAdapton.  Both miniAdapton and microAdapton are designed to be easy to
+understand, extend, and port to host languages other than Scheme.")
+      (license license:expat))))
+
+(define-public guile-reader
+  (package
+    (name "guile-reader")
+    (version "0.6.2")
+    (source  (origin
+               (method url-fetch)
+               (uri (string-append 
"mirror://savannah/guile-reader/guile-reader-"
+                                   version ".tar.gz"))
+               (sha256
+                (base32
+                 "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkgconfig" ,pkg-config)
+                     ("gperf" ,gperf-3.0)))
+    (inputs `(("guile" ,guile-2.2)))
+    (synopsis "Framework for building readers for GNU Guile")
     (description
-     "guile-dbi is a library for Guile that provides a convenient interface to
-SQL databases.  Database programming with guile-dbi is generic in that the same
-programming interface is presented regardless of which database system is used.
-It currently supports MySQL, Postgres and SQLite3.")
-    (license license:gpl2+)))
+     "Guile-Reader is a simple framework for building readers for GNU Guile.
 
-(define guile-dbi-bootstrap
+The idea is to make it easy to build procedures that extend Guile’s read
+procedure.  Readers supporting various syntax variants can easily be written,
+possibly by re-using existing “token readers” of a standard Scheme
+readers.  For example, it is used to implement Skribilo’s R5RS-derived
+document syntax.
+
+Guile-Reader’s approach is similar to Common Lisp’s “read table”, but
+hopefully more powerful and flexible (for instance, one may instantiate as
+many readers as needed).")
+    (home-page "https://www.nongnu.org/guile-reader/";)
+    (license license:gpl3+)))
+
+(define-public guile2.2-reader
+  (deprecated-package "guile2.2-reader" guile-reader))
+
+(define-public guile-ncurses
   (package
-    (inherit guile-dbi)
-    (name "guile-dbi-bootstrap")
-    (inputs '())
+    (name "guile-ncurses")
+    (version "2.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f"))))
+    (build-system gnu-build-system)
+    (inputs `(("ncurses" ,ncurses)
+              ("guile" ,guile-2.2)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments
-     (substitute-keyword-arguments (package-arguments guile-dbi)
-       ((#:make-flags _) '(list))))))
+     '(#:configure-flags (list "--with-ncursesw"  ; Unicode support
+                               "--with-gnu-filesystem-hierarchy")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-libguile-ncurses-file-name
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "make" "install"
+                     "-C" "src/ncurses"
+                     "-j" (number->string
+                           (parallel-job-count)))
+             (let* ((out   (assoc-ref outputs "out"))
+                    (dir   "src/ncurses")
+                    (files (find-files dir ".scm")))
+               (substitute* files
+                 (("\"libguile-ncurses\"")
+                  (format #f "\"~a/lib/guile/2.2/libguile-ncurses\""
+                          out)))
+               #t))))))
+    (home-page "https://www.gnu.org/software/guile-ncurses/";)
+    (synopsis "Guile bindings to ncurses")
+    (description
+     "guile-ncurses provides Guile language bindings for the ncurses
+library.")
+    (license license:lgpl3+)))
 
-(define-public guile-dbd-sqlite3
+(define-public guile-ncurses/gpm
   (package
-    (name "guile-dbd-sqlite3")
-    (version "2.1.6")
+    (inherit guile-ncurses)
+    (name "guile-ncurses-with-gpm")
+    (inputs `(("ncurses" ,ncurses/gpm)
+              ("guile" ,guile-2.2)))))
+
+(define-public guile-lib
+  (package
+    (name "guile-lib")
+    (version "0.2.6.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "http://download.gna.org/guile-dbi/guile-dbd-sqlite3-";
-                    version ".tar.gz"))
+              (uri (string-append "mirror://savannah/guile-lib/guile-lib-"
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "0rg71jchxd2y8x496s8zmfmikr5g8zxi8zv2ar3f7a23pph92iw2"))))
+                "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"))))
     (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) ; only required for 
headers
-    (inputs
-     `(("sqlite" ,sqlite)
-       ("zlib" ,(@ (gnu packages compression) zlib))))
-    (synopsis "Guile DBI driver for SQLite")
-    (home-page "https://github.com/jkalbhenn/guile-dbd-sqlite3";)
+    (arguments
+     '(#:make-flags
+       '("GUILE_AUTO_COMPILE=0")        ; to prevent guild errors
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-module-dir
+           (lambda _
+             (substitute* "src/Makefile.in"
+               (("^moddir = ([[:graph:]]+)")
+                "moddir = $(datadir)/guile/site/@address@hidden")
+               (("^godir = ([[:graph:]]+)")
+                "godir = \
+$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
+             #t)))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("guile" ,guile-2.2)))
+    (home-page "https://www.nongnu.org/guile-lib/";)
+    (synopsis "Collection of useful Guile Scheme modules")
     (description
-     "guile-dbi is a library for Guile that provides a convenient interface to
-SQL databases.  This package implements the interface for SQLite.")
-    (license license:gpl2+)))
+     "Guile-Lib is intended as an accumulation place for pure-scheme Guile
+modules, allowing for people to cooperate integrating their generic Guile
+modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN
+for Guile\".")
 
-(define-public guile-dsv
+    ;; The whole is under GPLv3+, but some modules are under laxer
+    ;; distribution terms such as LGPL and public domain.  See `COPYING' for
+    ;; details.
+    (license license:gpl3+)))
+
+(define-public guile2.0-lib
   (package
-    (name "guile-dsv")
-    (version "0.2.1")
+    (inherit guile-lib)
+    (name "guile2.0-lib")
+    (inputs `(("guile" ,guile-2.0)))))
+
+(define-public guile2.2-lib
+  (deprecated-package "guile2.2-lib" guile-lib))
+
+(define-public guile-minikanren
+  (package
+    (name "guile-minikanren")
+    (version "20150424.e844d85")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/artyom-poptsov/guile-dsv";)
-                    (commit "bdc5267d007478abc20ea96d7c459b7dd9560b3d")))
+                    (url "https://github.com/ijp/minikanren.git";)
+                    (commit "e844d85512f8c055d3f96143ee506007389a25e3")))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1irw6mz8998nwyhzrw9g94jcz60b9zljgqfmipaz1ybn8579qjx0"))))
-    (build-system gnu-build-system)
+                "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6"))))
+    (build-system guile-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (propagated-inputs `(("guile-lib" ,guile-lib)))
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'set-guilesitedir
-                    (lambda _
-                      (substitute* "Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      (substitute* "modules/Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      (substitute* "modules/dsv/Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      #t)))))
-    (home-page "https://github.com/artyom-poptsov/guile-dsv";)
-    (synopsis "DSV module for Guile")
+     `(("guile" ,guile-2.2)))
+    (home-page "https://github.com/ijp/minikanren";)
+    (synopsis "MiniKanren declarative logic system, packaged for Guile")
     (description
-     "Guile-DSV is a GNU Guile module for working with the
-delimiter-separated values (DSV) data format.  Guile-DSV supports the
-Unix-style DSV format and RFC 4180 format.")
-    (license license:gpl3+)))
+     "MiniKanren is a relational programming extension to the Scheme
+programming Language, written as a smaller version of Kanren suitable for
+pedagogical purposes.  It is featured in the book, The Reasoned Schemer,
+written by Dan Friedman, William Byrd, and Oleg Kiselyov.
 
-(define-public guile-xosd
+This is Ian Price's r6rs packaged version of miniKanren, which deviates
+slightly from miniKanren mainline.
+
+See http://minikanren.org/ for more on miniKanren generally.")
+    (license license:expat)))
+
+(define-public guile2.0-minikanren
   (package
-    (name "guile-xosd")
-    (version "0.2.1")
+    (inherit guile-minikanren)
+    (name "guile2.0-minikanren")
+    (native-inputs `(("guile" ,guile-2.0)))))
+
+(define-public guile2.2-minikanren
+  (deprecated-package "guile2.2-minikanren" guile-minikanren))
+
+(define-public guile-irregex
+  (package
+    (name "guile-irregex")
+    (version "0.9.6")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://github.com/alezost/"; name
-                                  "/releases/download/v" version
-                                  "/" name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1ri5065c16kmgrf2pysn2ymxjqi5302lhpb07wkl1jr75ym8fn8p"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxinerama" ,libxinerama)
-       ("xosd" ,xosd)))
-    (home-page "https://github.com/alezost/guile-xosd";)
-    (synopsis "XOSD bindings for Guile")
-    (description
-     "Guile-XOSD provides Guile bindings for @code{libxosd},
address@hidden://sourceforge.net/projects/libxosd/, the X On Screen Display
-library}.")
-    (license license:gpl3+)))
-
-(define-public guile-daemon
-  (package
-    (name "guile-daemon")
-    (version "0.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/alezost/"; name
-                                  "/releases/download/v" version
-                                  "/" name "-" version ".tar.gz"))
+              (uri (string-append
+                    "http://synthcode.com/scheme/irregex/irregex-";
+                    version ".tar.gz"))
               (sha256
                (base32
-                "0hh6gq6b6phpxm0b1dkxyzj3f4sxdf7dji63609lzypa5v1ad2gv"))))
-    (build-system gnu-build-system)
+                "1ia3m7dp3lcxa048q0gqbiwwsyvn99baw6xkhb4bhhzn4k7bwyqq"))))
+    (build-system guile-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'move-files-around
+                    (lambda _
+                      ;; Move the relevant source files to src/ and create the
+                      ;; rx/ directory to match the expected module hierarchy.
+                      (mkdir-p "src/rx/source")
+                      (rename-file "irregex-guile.scm"
+                                   "src/rx/irregex.scm")
+                      (rename-file "irregex.scm"
+                                   "src/rx/source/irregex.scm")
+                      ;; Not really reachable via guile's packaging system,
+                      ;; but nice to have around.
+                      (rename-file "irregex-utils.scm"
+                                   "src/rx/source/irregex-utils.scm")
+                      #t)))
+       #:source-directory "src"))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
      `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/alezost/guile-daemon";)
-    (synopsis "Evaluate code in a running Guile process")
+    (home-page "http://synthcode.com/scheme/irregex";)
+    (synopsis "S-expression based regular expressions")
     (description
-     "Guile-Daemon is a small Guile program that loads your initial
-configuration file, and then reads and evaluates Guile expressions that
-you send to a FIFO file.")
-    (license license:gpl3+)))
+     "Irregex is an s-expression based alternative to your classic
+string-based regular expressions.  It implements SRFI 115 and is deeply
+inspired by the SCSH regular expression system.")
+    (license license:bsd-3)))
 
-(define-public guile-commonmark
+(define-public guile2.0-irregex
   (package
-    (name "guile-commonmark")
-    (version "0.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/OrangeShark/"; name
-                                  "/releases/download/v" version
-                                  "/" name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0kzclwkfijj8xka3g9kfj53y67c34ndfy84swdbw3j7y962ndxq6"))
-              (modules '((guix build utils)))
-              (snippet
-               ;; Install .scm files in the right place (see
-               ;; <https://github.com/OrangeShark/guile-commonmark/issues/12>.)
-               '(begin
-                  (substitute* "Makefile.in"
-                    (("^moddir = \\$\\(datadir\\)/share")
-                     "moddir = $(datadir)"))
-                  #t))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (synopsis "CommonMark parser for Guile")
-    (description
-     "guile-commonmark is a library for parsing CommonMark, a fully specified
-variant of Markdown.  The library is written in Guile Scheme and is designed
-to transform a CommonMark document to SXML.  guile-commonmark tries to closely
-follow the @uref{http://commonmark.org/, CommonMark spec}, the main difference
-is no support for parsing block and inline level HTML.")
-    (home-page "https://github.com/OrangeShark/guile-commonmark";)
-    (license license:lgpl3+)))
+    (inherit guile-irregex)
+    (name "guile2.0-irregex")
+    (native-inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.0-commonmark
-  (package-for-guile-2.0 guile-commonmark))
-(define-public guile2.2-commonmark
-  (deprecated-package "guile2.2-commonmark" guile-commonmark))
+(define-public guile2.2-irregex
+  (deprecated-package "guile2.2-irregex" guile-irregex))
 
-(define-public guile-bytestructures
+(define-public haunt
   (package
-    (name "guile-bytestructures")
-    (version "1.0.5")
+    (name "haunt")
+    (version "0.2.4")
     (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://github.com/TaylanUB/scheme-bytestructures";
-                                  "/releases/download/v" version
-                                  "/bytestructures-" version ".tar.gz"))
+              (uri (string-append "https://files.dthompson.us/haunt/haunt-";
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "0ibk7fjwpb450lnrva4bx45sgln3pbyb645az4ansvh1spgani43"))))
+                "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:modules ((ice-9 match) (ice-9 ftw)
+                  ,@%gnu-build-system-modules)
+       #:tests? #f ; test suite is non-deterministic :(
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'wrap-haunt
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      ;; Wrap the 'haunt' command to refer to the right
+                      ;; modules.
+                      (let* ((out  (assoc-ref outputs "out"))
+                             (bin  (string-append out "/bin"))
+                             (site (string-append
+                                    out "/share/guile/site"))
+                             (deps (list (assoc-ref inputs "guile-reader")
+                                         (assoc-ref inputs 
"guile-commonmark"))))
+                        (match (scandir site)
+                          (("." ".." version)
+                           (let ((modules (string-append site "/" version))
+                                 (compiled-modules (string-append
+                                                    out "/lib/guile/" version
+                                                    "/site-ccache")))
+                             (wrap-program (string-append bin "/haunt")
+                               `("GUILE_LOAD_PATH" ":" prefix
+                                 (,modules
+                                  ,@(map (lambda (dep)
+                                           (string-append dep
+                                                          "/share/guile/site/"
+                                                          version))
+                                         deps)))
+                               `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+                                 (,compiled-modules
+                                  ,@(map (lambda (dep)
+                                           (string-append dep "/lib/guile/"
+                                                          version
+                                                          "/site-ccache"))
+                                         deps))))
+                             #t)))))))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
     (inputs
      `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/TaylanUB/scheme-bytestructures";)
-    (synopsis "Structured access to bytevector contents for Guile")
-    (description
-     "Guile bytestructures offers a system imitating the type system
-of the C programming language, to be used on bytevectors.  C's type
-system works on raw memory, and Guile works on bytevectors which are
-an abstraction over raw memory.  It's also more powerful than the C
-type system, elevating types to first-class status.")
+    (propagated-inputs
+     `(("guile-reader" ,guile-reader)
+       ("guile-commonmark" ,guile-commonmark)))
+    (synopsis "Functional static site generator")
+    (description "Haunt is a static site generator written in Guile
+Scheme.  Haunt features a functional build system and an extensible
+interface for reading articles in any format.")
+    (home-page "http://haunt.dthompson.us";)
     (license license:gpl3+)))
 
-(define-public guile2.0-bytestructures
-  (package-for-guile-2.0 guile-bytestructures))
+(define-public guile2.0-haunt
+  (package
+    (inherit haunt)
+    (name "guile2.0-haunt")
+    (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile-aspell
+(define-public guile2.2-haunt
+  (deprecated-package "guile2.2-haunt" haunt))
+
+(define-public guile-redis
   (package
-    (name "guile-aspell")
-    (version "0.4")
+    (name "guile-redis")
+    (version "1.0.0")
+    (home-page "https://github.com/aconchillo/guile-redis";)
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "http://lonelycactus.com/tarball/guile_aspell-";
-                    version ".tar.gz"))
+              (uri (string-append home-page "/archive/" version ".tar.gz"))
               (sha256
                (base32
-                "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'set-guilesitedir
-                    (lambda _
-                      (substitute* "Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      #t))
-                  (add-before 'build 'set-libaspell-file-name
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (let ((aspell (assoc-ref inputs "aspell")))
-                        (substitute* "aspell.scm"
-                          (("\"libaspell\\.so\"")
-                           (string-append "\"" aspell
-                                          "/lib/libaspell\"")))
-                        #t))))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2)
-              ("aspell" ,aspell)))
-    (home-page "https://github.com/spk121/guile-aspell";)
-    (synopsis "Spell-checking from Guile")
-    (description
-     "guile-aspell is a Guile Scheme library for comparing a string against a
-dictionary and suggesting spelling corrections.")
-    (license license:gpl3+)))
-
-(define-public guile-bash
-  ;; This project is currently retired.  It was initially announced here:
-  ;; <https://lists.gnu.org/archive/html/guile-user/2015-02/msg00003.html>.
-  (let ((commit "1eabc563ca5692b3e08d84f1f0e6fd2283284469")
-        (revision "0"))
-    (package
-      (name "guile-bash")
-      (version (string-append "0.1.6-" revision "." (string-take commit 7)))
-      (home-page
-       
"https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git";)
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (commit commit)
-                      (url home-page)))
-                (sha256
-                 (base32
-                  "097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p"))
-                (file-name (string-append name "-" version "-checkout"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:configure-flags
-         ;; Add -I to match 'bash.pc' of Bash 4.4.
-         (list (string-append "CPPFLAGS=-I"
-                              (assoc-ref %build-inputs "bash:include")
-                              "/include/bash/include")
-
-               ;; The '.a' file is useless.
-               "--disable-static"
-
-               ;; Install 'lib/bash' as Bash 4.4 expects.
-               (string-append "--libdir=" (assoc-ref %outputs "out")
-                              "/lib/bash"))))
-      (native-inputs `(("pkg-config" ,pkg-config)
-                       ("autoconf" ,autoconf-wrapper)
-                       ("automake" ,automake)
-                       ("libtool" ,libtool)
-                       ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
-                       ("gettext" ,gettext-minimal)
-
-                       ;; Bash with loadable module support, for the test
-                       ;; suite.
-                       ("bash-full" ,bash)))
-      (inputs `(("guile" ,guile-2.0)
-                ("bash:include" ,bash "include")))
-      (synopsis "Extend Bash using Guile")
-      (description
-       "Guile-Bash provides a shared library and set of Guile modules,
-allowing you to extend Bash in Scheme.  Scheme interfaces allow you to access
-the following aspects of Bash:
-
address@hidden
address@hidden aliases;
address@hidden setting and getting Bash variables;
address@hidden creating dynamic variables;
address@hidden creating Bash functions with a Scheme implementation;
address@hidden reader macro for output capturing;
address@hidden reader macro for evaluating raw Bash commands.
address@hidden itemize
-
-To enable it, run:
-
address@hidden
-enable -f ~/.guix-profile/lib/bash/libguile-bash.so scm
address@hidden example
-
-and then run @command{scm example.scm}.")
-      (license license:gpl3+))))
-
-(define-public guile-8sync
-  (package
-    (name "guile-8sync")
-    (version "0.4.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/8sync/8sync-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf)
-                     ("automake" ,automake)
-                     ("guile" ,guile-2.2)
-                     ("pkg-config" ,pkg-config)
-                     ("texinfo" ,texinfo)))
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'setenv
-                    (lambda _
-                      ;; quiet warnings
-                      (setenv "GUILE_AUTO_COMPILE" "0")
-                      #t)))))
-    (home-page "https://gnu.org/s/8sync/";)
-    (synopsis "Asynchronous actor model library for Guile")
-    (description
-     "GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming
-library for GNU Guile based on the actor model.
-
-Note that 8sync is only available for Guile 2.2.")
-    (license license:lgpl3+)))
-
-(define-public guile-fibers
-  (package
-    (name "guile-fibers")
-    (version "1.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://wingolog.org/pub/fibers/fibers-";
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-after 'install 'mode-guile-objects
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      ;; .go files are installed to "lib/guile/X.Y/cache".
-                      ;; This phase moves them to "…/site-ccache".
-                      (let* ((out (assoc-ref outputs "out"))
-                             (lib (string-append out "/lib/guile"))
-                             (old (car (find-files lib "^ccache$"
-                                                   #:directories? #t)))
-                             (new (string-append (dirname old)
-                                                 "/site-ccache")))
-                        (rename-file old new)
-                        #t))))))
-    (native-inputs
-     `(("texinfo" ,texinfo)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "Lightweight concurrency facility for Guile")
-    (description
-     "Fibers is a Guile library that implements a a lightweight concurrency
-facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is
-like a \"goroutine\" from the Go language: a lightweight thread-like
-abstraction.  Systems built with Fibers can scale up to millions of concurrent
-fibers, tens of thousands of concurrent socket connections, and many parallel
-cores.  The Fibers library also provides Concurrent ML-like channels for
-communication between fibers.
-
-Note that Fibers makes use of some Guile 2.1/2.2-specific features and
-is not available for Guile 2.0.")
-    (home-page "https://github.com/wingo/fibers";)
-    (license license:lgpl3+)))
-
-(define-public guile-git
-  (package
-    (name "guile-git")
-    (version "0.1.0")
-    (home-page "https://gitlab.com/guile-git/guile-git.git";)
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference (url home-page)
-                                  (commit (string-append "v" version))))
-              (sha256
-               (base32
-                "1z3awa3i5il08dl2swbnli2j7cawdpray11zx4844j27bxqddcs2"))
-              (file-name (git-file-name name version))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("texinfo" ,texinfo)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)
-       ("libgit2" ,libgit2)))
-    (propagated-inputs
-     `(("guile-bytestructures" ,guile-bytestructures)))
-    (synopsis "Guile bindings for libgit2")
-    (description
-     "This package provides Guile bindings to libgit2, a library to
-manipulate repositories of the Git version control system.")
-    (license license:gpl3+)))
-
-(define-public guile2.0-git
-  (package-for-guile-2.0 guile-git))
-
-(define-public guile-syntax-highlight
-  (package
-    (name "guile-syntax-highlight")
-    (version "0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://files.dthompson.us/";
-                                  "guile-syntax-highlight/"
-                                  "guile-syntax-highlight-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "General-purpose syntax highlighter for GNU Guile")
-    (description "Guile-syntax-highlight is a general-purpose syntax
-highlighting library for GNU Guile.  It can parse code written in various
-programming languages into a simple s-expression that can be converted to
-HTML (via SXML) or any other format for rendering.")
-    (home-page "http://dthompson.us/projects/guile-syntax-highlight.html";)
-    (license license:lgpl3+)))
-
-(define-public guile-sjson
-  (package
-    (name "guile-sjson")
-    (version "0.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://dustycloud.org/misc/sjson-"; version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3"))))
+                "1dp5fmqvma59pvp1nfpq6hqgbmjici8sd1y8llahl87fynw1dvr9"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "https://gitlab.com/dustyweb/guile-sjson";)
-    (synopsis "S-expression based json reader/writer for Guile")
-    (description "guile-sjson is a json reader/writer for Guile.
-It has a nice, simple s-expression based syntax.")
-    (license license:lgpl3+)))
-
-(define-public guile-colorized
-  (package
-    (name "guile-colorized")
-    (version "0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append 
"https://github.com/NalaGinrut/guile-colorized/";
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "16xhc3an6aglnca8xl3mvgi8hsqzqn68vsl5ga4bz8bvbap5fn4p"))))
-    (build-system guile-build-system)
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/NalaGinrut/guile-colorized";)
-    (synopsis "Colorized REPL for Guile")
-    (description
-     "Guile-colorized provides you with a colorized REPL for GNU Guile.")
-    (license license:gpl3+)))
-
-(define-public guile-pfds
-  (package
-    (name "guile-pfds")
-    (version "0.3")
-    (home-page "https://github.com/ijp/pfds";)
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
-              (sha256
-               (base32
-                "19y33wg94pf0n98dkfqd1zbw93fgky4sawxsxl6s3vyqwl0yi5vh"))
-              (file-name (string-append name "-" version "-checkout"))))
-    (build-system guile-build-system)
-    (arguments
-     '(#:source-directory "src"
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'move-files-around
-                    (lambda _
-                      ;; Move files under a pfds/ directory to reflect the
-                      ;; module hierarchy.
-                      (mkdir-p "src/pfds")
-                      (for-each (lambda (file)
-                                  (rename-file file
-                                               (string-append "src/pfds/"
-                                                              file)))
-                                '("bbtrees.sls"
-                                  "deques"
-                                  "deques.sls"
-                                  "dlists.sls"
-                                  "fingertrees.sls"
-                                  "hamts.sls"
-                                  "heaps.sls"
-                                  "private"
-                                  "psqs.sls"
-                                  "queues"
-                                  "queues.sls"
-                                  "sequences.sls"
-                                  "sets.sls"))
-
-                      ;; In Guile <= 2.2.4, there's no way to tell 'guild
-                      ;; compile' to accept the ".sls" extension.  So...
-                      (for-each (lambda (file)
-                                  (rename-file file
-                                               (string-append
-                                                (string-drop-right file 4)
-                                                ".scm")))
-                                (find-files "." "\\.sls$"))
-                      #t)))))
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "Purely functional data structures for Guile")
-    (description
-     "This package provides purely functional data structures written in R6RS
-Scheme and compiled for Guile.  It has been tested with Racket, Guile 2,
-Vicare Scheme and IronScheme.  Right now it contains:
-
address@hidden
address@hidden queues
address@hidden deques
address@hidden bbtrees
address@hidden sets
address@hidden dlists
address@hidden priority search queues (PSQs)
address@hidden finger trees
address@hidden sequences
address@hidden heaps
address@hidden hash array mapped tries (HAMTs).
address@hidden itemize\n")
-    (license license:bsd-3)))
-
-(define-public guile-aa-tree
-  (package
-    (name "guile-aa-tree")
-    (version "3.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append 
"mirror://savannah/guile-aa-tree/guile-aa-tree-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh"))))
-    (build-system guile-build-system)
-    (native-inputs `(("guile" ,guile-2.2)))
-    ;; https://savannah.nongnu.org/projects/guile-aa-tree
-    (home-page "https://qlfiles.net/guile-aa-tree/";)
-    (synopsis "AA tree data structure for Guile")
-    (description
-     "This package provides an implementation of @dfn{AA trees}, a
-self-balancing binary tree data structure, for Guile.  It ensure @math{O(log
-n)} worst case performance for core operations.  The module provides
-non-mutating insert, delete, and search operations, with support for
-convenient nested tree operations.")
-    (license license:gpl3+)))
-
-(define-public guile-simple-zmq
-  (let ((commit "68bedb6679716214fb9d3472da57544526f7a618")
-        (revision "3"))
-    (package
-      (name "guile-simple-zmq")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/jerry40/guile-simple-zmq";)
-               (commit commit)))
-         (sha256
-          (base32
-           "1ad3xg69qqviy1f6dnlw0ysmfdbmp1jq65rfqb8nfd8dsrq2syli"))
-         (file-name (git-file-name name version))))
-      (build-system guile-build-system)
-      (arguments
-       `(#:source-directory "src"
-         #:phases (modify-phases %standard-phases
-                    (add-after 'unpack 'set-libzmq-file-name
-                      (lambda* (#:key inputs #:allow-other-keys)
-                        (substitute* "src/simple-zmq.scm"
-                          (("\\(dynamic-link \"libzmq\"\\)")
-                           (format #f "(dynamic-link \"~a/lib/libzmq.so\")"
-                                   (assoc-ref inputs "zeromq"))))
-                        #t)))))
-      (native-inputs
-       `(("guile" ,guile-2.2)))
-      (inputs
-       `(("zeromq" ,zeromq)))
-      (home-page "https://github.com/jerry40/guile-simple-zmq";)
-      (synopsis "Guile wrapper over ZeroMQ library")
-      (description
-       "This package provides a Guile programming interface to the ZeroMQ
-messaging library.")
-      (license license:gpl3+))))
-
-(define-public jupyter-guile-kernel
-  (let ((commit "a7db9245a886e104138474df46c3e88b95cff629")
-        (revision "1"))
-    (package
-      (name "jupyter-guile-kernel")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/jerry40/guile-kernel";)
-               (commit commit)))
-         (sha256
-          (base32
-           "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f"))))
-      (build-system guile-build-system)
-      (arguments
-       '(#:phases (modify-phases %standard-phases
-                    (add-after 'unpack 'set-openssl-file-name
-                      (lambda* (#:key inputs #:allow-other-keys)
-                        ;; Record the absolute file name of the 'openssl'
-                        ;; command.
-                        (substitute* "src/hmac.scm"
-                          (("openssl")
-                           (string-append (assoc-ref inputs "openssl")
-                                          "/bin/openssl")))
-                        #t))
-
-                    ;; XXX: The code uses 'include' to include its own source
-                    ;; files, and "-L src" isn't enough in this case.
-                    (add-before 'build 'chdir
-                      (lambda _ (chdir "src") #t))
-                    (add-after 'build 'chdir-back
-                      (lambda _ (chdir "..") #t))
-
-                    (add-after 'install 'install-kernel
-                      (lambda* (#:key inputs outputs #:allow-other-keys)
-                        (let* ((out   (assoc-ref outputs "out"))
-                               (json  (assoc-ref inputs "guile-json"))
-                               (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-file "src/kernel.json" dir)
-
-                          ;; Fix hard-coded file name in the kernel.
-                          (substitute* (string-append dir "/kernel.json")
-                            (("/home/.*/guile-jupyter-kernel.scm")
-                             (string-append out "/share/guile/site/"
-                                            (target-guile-effective-version)
-                                            "/guile-jupyter-kernel.scm"))
-                            (("\"guile\"")
-                             (string-append "\"" (assoc-ref inputs "guile")
-                                            "/bin/guile\""))
-                            (("-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))))))
-      (inputs
-       `(("openssl" ,openssl)
-         ("guile" ,guile-2.2)
-         ("guile-json" ,guile-json)
-         ("guile-simple-zmq" ,guile-simple-zmq)))
-      (synopsis "Guile kernel for the Jupyter Notebook")
-      (description
-       "This package provides a Guile 2.x kernel for the Jupyter Notebook.  It
-allows users to interact with the Guile REPL through Jupyter.")
-      (home-page "https://github.com/jerry40/guile-kernel";)
-      (license license:gpl3+))))
-
-(define-public guile-sparql
-  (package
-   (name "guile-sparql")
-   (version "0.0.7")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append
-                  "https://github.com/roelj/guile-sparql/releases/download/";
-                  version "/guile-sparql-" version ".tar.gz"))
-            (sha256
-             (base32 "1drnvhsgl0gc5crmb16yyw1j98nkhwwcgssv9vgm36ng43nnzffd"))))
-   (build-system gnu-build-system)
-   (arguments `(#:tests? #f)) ; There are no tests.
-   (native-inputs
-    `(("pkg-config" ,pkg-config)))
-   (inputs
-    `(("guile" ,guile-2.2)))
-   (home-page "https://github.com/roelj/guile-sparql";)
-   (synopsis "SPARQL module for Guile")
-   (description "This package provides the functionality to query a SPARQL
-endpoint.  Additionally, it provides an interface to write SPARQL queries
-using S-expressions.")
-   (license license:gpl3+)))
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)
+       ("guile" ,guile-2.2)))
+    (synopsis "Redis client library for Guile")
+    (description "Guile-redis provides a Scheme interface to the Redis
+key-value cache and store.")
+    (license license:lgpl3+)))
 
-(define-public guile-debbugs
+(define-public guile2.0-redis
   (package
-    (name "guile-debbugs")
-    (version "0.0.2")
+    (inherit guile-redis)
+    (name "guile2.0-redis")
+    (native-inputs `(("guile" ,guile-2.0)
+                     ,@(alist-delete "guile"
+                                     (package-native-inputs guile-redis))))))
+
+(define-public guile2.2-redis
+  (deprecated-package "guile2.2-redis" guile-redis))
+
+(define-public guile-commonmark
+  (package
+    (name "guile-commonmark")
+    (version "0.1.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-"
-                                  version ".tar.gz"))
+              (uri (string-append "https://github.com/OrangeShark/"; name
+                                  "/releases/download/v" version
+                                  "/" name "-" version ".tar.gz"))
               (sha256
                (base32
-                "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i"))
+                "0kzclwkfijj8xka3g9kfj53y67c34ndfy84swdbw3j7y962ndxq6"))
               (modules '((guix build utils)))
               (snippet
-               '(substitute* "Makefile.in"
-                  (("^godir = (.*)/ccache" _ prefix)
-                   (string-append "godir = " prefix "/site-ccache"))))))
+               ;; Install .scm files in the right place (see
+               ;; <https://github.com/OrangeShark/guile-commonmark/issues/12>.)
+               '(begin
+                  (substitute* "Makefile.in"
+                    (("^moddir = \\$\\(datadir\\)/share")
+                     "moddir = $(datadir)"))
+                  #t))))
     (build-system gnu-build-system)
+    (inputs
+     `(("guile" ,guile-2.2)))
     (native-inputs
-     `(("guile" ,guile-2.2)
-       ("pkg-config" ,pkg-config)))
-    (home-page "https://savannah.gnu.org/projects/guile-debbugs/";)
-    (synopsis "Guile interface to the Debbugs bug tracking service")
+     `(("pkg-config" ,pkg-config)))
+    (synopsis "CommonMark parser for Guile")
     (description
-     "This package provides a Guile library to communicate with a Debbugs bug
-tracker's SOAP service, such as @url{https://bugs.gnu.org}.";)
-    (license license:gpl3+)))
-
-(define-public guile-email
-  (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
-        (revision "1"))
-    (package
-      (name "guile-email")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.systemreboot.net/guile-email";)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
-      (build-system gnu-build-system)
-      (native-inputs
-       `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)))
-      (inputs
-       `(("guile" ,guile-2.2)))
-      (home-page "https://git.systemreboot.net/guile-email";)
-      (synopsis "Guile email parser")
-      (description "This package provides an email parser written in pure
-Guile.")
-      (license license:agpl3+))))
+     "guile-commonmark is a library for parsing CommonMark, a fully specified
+variant of Markdown.  The library is written in Guile Scheme and is designed
+to transform a CommonMark document to SXML.  guile-commonmark tries to closely
+follow the @uref{http://commonmark.org/, CommonMark spec}, the main difference
+is no support for parsing block and inline level HTML.")
+    (home-page "https://github.com/OrangeShark/guile-commonmark";)
+    (license license:lgpl3+)))
 
-(define-public guile-debbugs-next
-  (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
-        (revision "1"))
-    (package (inherit guile-debbugs)
-      (name "guile-debbugs")
-      (version (git-version "0.0.3" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url 
"https://git.savannah.gnu.org/git/guile-debbugs.git";)
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y"))))
-      (build-system gnu-build-system)
-      (native-inputs
-       `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("texinfo" ,texinfo)))
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("guile-email" ,guile-email))))))
+(define-public guile2.0-commonmark
+  (package
+    (inherit guile-commonmark)
+    (name "guile2.0-commonmark")
+    (inputs `(("guile" ,guile-2.0)))))
 
-;; There has not been any release yet.
-(define-public guile-newt
-  (let ((commit "80c1e9e71945f833386d1632b52573e59325804f")
-        (revision "4"))
-    (package
-      (name "guile-newt")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://gitlab.com/mothacehe/guile-newt";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:make-flags
-         '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("newt" ,newt)))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)))
-      (synopsis "Guile bindings to Newt")
-      (description
-       "This package provides bindings for Newt, a programming library for
-color text mode, widget based user interfaces.  The bindings are written in 
pure
-Scheme by using Guile’s foreign function interface.")
-      (home-page "https://gitlab.com/mothacehe/guile-newt";)
-      (license license:gpl3+))))
+(define-public guile2.2-commonmark
+  (deprecated-package "guile2.2-commonmark" guile-commonmark))
 
-(define-public guile-mastodon
+(define-public mcron
   (package
-    (name "guile-mastodon")
-    (version "0.0.1")
+    (name "mcron")
+    (version "1.1.1")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://framagit.org/prouby/guile-mastodon.git";)
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/mcron/mcron-"
+                                  version ".tar.gz"))
               (sha256
                (base32
-                "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry"))))
+                "1i9mcp6r6my61zfiydsm3n6my41mwvl7dfala4q29qx0zn1ynlm4"))))
     (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)
-       ("gnutls" ,gnutls)
-       ("guile-json" ,guile-json)))
-    (home-page "https://framagit.org/prouby/guile-mastodon";)
-    (synopsis "Guile Mastodon REST API module")
-    (description "This package provides Guile modules to access the
address@hidden://docs.joinmastodon.org/api/, REST API of Mastodon}, a federated
-microblogging service.")
-    (license license:gpl3+)))
-
-;; There has not been any release yet.
-(define-public guile-parted
-  (let ((commit "ea3f1a1f6844775fc59d3078d2a09c62ffb341b8")
-        (revision "0"))
-    (package
-      (name "guile-parted")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://gitlab.com/mothacehe/guile-parted";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:make-flags
-         '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("parted" ,parted)))
-      (propagated-inputs
-       `(("guile-bytestructures" ,guile-bytestructures)))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)))
-      (synopsis "Guile bindings to GNU Parted")
-      (description
-       "This package provides bindings for GNU Parted library, a C library
-allowing disk partition tables creation and manipulation. The bindings are
-written in pure Scheme by using Guile's foreign function interface.")
-      (home-page "https://gitlab.com/mothacehe/guile-parted";)
-      (license license:gpl3+))))
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'check 'set-timezone
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      ;; 'tests/job-specifier.scm' expects to be running in
+                      ;; UTC-2 or something.
+                      ;; FIXME: This issue is being investigated upstream, for
+                      ;; now we'll just skip the tests (see below):
+                      ;; 
<https://lists.gnu.org/archive/html/bug-mcron/2018-04/msg00005.html>.
+                      (let ((tzdata (assoc-ref inputs "tzdata")))
+                        (setenv "TZDIR"
+                                (string-append tzdata
+                                               "/share/zoneinfo"))
+                        (setenv "TZ" "UTC-2")
+                        #t)))
+                  (add-before 'check 'adjust-tests
+                    (lambda _
+                      (substitute* "tests/job-specifier.scm"
+                        ;; (getpw) fails with "entry not found" in the build
+                        ;; environment, so pass an argument.
+                        (("\\(getpw\\)")
+                         "(getpwnam (getuid))")
+                        ;; The build environment lacks an entry for root in
+                        ;; /etc/passwd.
+                        (("\\(getpw 0\\)")
+                         "(getpwnam \"nobody\")")
 
-;;; guile.scm ends here
+                        ;; FIXME: Skip the 4 faulty tests (see above).
+                        (("\\(test-equal \"next-year\"" all)
+                         (string-append "(test-skip 4)\n" all)))
+                      #t)))))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("tzdata" ,tzdata-for-tests)))
+    (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2)))
+    (home-page "https://www.gnu.org/software/mcron/";)
+    (synopsis "Run jobs at scheduled times")
+    (description
+     "GNU Mcron is a complete replacement for Vixie cron.  It is used to run
+tasks on a schedule, such as every hour or every Monday.  Mcron is written in
+Guile, so its configuration can be written in Scheme; the original cron
+format is also supported.")
+    (license license:gpl3+)))
 
+(define-public mcron2
+  ;; This was mthl's mcron development branch, and it became mcron 1.1.
+  (deprecated-package "mcron2" mcron))
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 1b1285d..09f6676 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1,25 +1,20 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
-;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
+;;; Copyright © 2014 Cyril Roelandt <address@hidden>
+;;; Copyright © 2014, 2016, 2018 David Thompson <address@hidden>
+;;; Copyright © 2014, 2017, 2018 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015, 2017 Christopher Allan Webber <address@hidden>
-;;; Copyright © 2016 Alex Sassmannshausen <address@hidden>
-;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2016 Erik Edrosa <address@hidden>
-;;; Copyright © 2016 Eraim Flashner <address@hidden>
-;;; Copyright © 2016, 2017 Alex Kost <address@hidden>
-;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira 
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
-;;; Copyright © 2016 Amirouche <address@hidden>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
+;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2016, 2019 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2017 Andy Wingo <address@hidden>
-;;; Copyright © 2017 David Thompson <address@hidden>
-;;; Copyright © 2017, 2018 Mathieu Othacehe <address@hidden>
-;;; Copyright © 2017 Theodoros Foradis <address@hidden>
-;;; Copyright © 2017 Nils Gillmann <address@hidden>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
-;;; Copyright © 2018 Arun Isaac <address@hidden>
-;;; Copyright © 2018 Pierre-Antoine Rouby <address@hidden>
+;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Amirouche <address@hidden>
+;;; Copyright © 2018 Danny Milosavljevic <address@hidden>
 ;;; Copyright © 2018 Eric Bavier <address@hidden>
+;;; Copyright © 2019 Taylan Kammer <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,48 +34,31 @@
 (define-module (gnu packages guile)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
-  #:use-module (gnu packages aspell)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages disk)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
-  #:use-module (gnu packages gl)
-  #:use-module (gnu packages gperf)
   #:use-module (gnu packages hurd)
-  #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages m4)
-  #:use-module (gnu packages man)
-  #:use-module (gnu packages maths)
   #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages networking)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages sdl)
-  #:use-module (gnu packages slang)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xorg)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system guile)
-  #:use-module (guix build-system trivial)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:prefix srfi-1:))
@@ -457,445 +435,11 @@ address@hidden  Use the @code{(ice-9 readline)} module 
and call its
             (files '("lib/guile/2.0/site-ccache"
                      "share/guile/site/2.0")))))))
 
-;; There has not been any release yet.
-(define-public guildhall
-  (let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778")
-        (revision "1"))
-    (package
-      (name "guildhall")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/ijp/guildhall.git";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "115bym7bg66h3gs399yb2vkzc2ygriaqsn4zbrg8f054mgy8wzn1"))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           ;; Tests fail without this fix because they try to load the bash
-           ;; executable as a Scheme file.  See bug report at
-           ;; https://github.com/ijp/guildhall/issues/22
-           (add-after 'unpack 'fix-bug-22
-             (lambda _
-               (substitute* "Makefile.am"
-                 (("TESTS_ENVIRONMENT=.*")
-                  "AM_TESTS_ENVIRONMENT=srcdir=$(abs_top_srcdir)/tests/
-TEST_EXTENSIONS = .scm
-SCM_LOG_COMPILER= $(top_builddir)/env $(GUILE)
-AM_SCM_LOG_FLAGS =  --no-auto-compile -s")
-                 ;; FIXME: one of the database tests fails for unknown
-                 ;; reasons.  It does not fail when run outside of Guix.
-                 (("tests/database.scm") ""))
-               #t)))))
-      (inputs
-       `(("guile" ,guile-2.0)))
-      (native-inputs
-       `(("zip" ,zip) ; for tests
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("texinfo" ,texinfo)))
-      (synopsis "Package manager for Guile")
-      (description
-       "Guildhall is a package manager written for Guile Scheme.  A guild is
-an association of independent craftspeople.  A guildhall is where they meet.
-This Guildhall aims to make a virtual space for Guile wizards and journeyfolk
-to share code.
-
-On a practical level, Guildhall lets you share Scheme modules and programs
-over the internet, and install code that has been shared by others.  Guildhall
-can handle dependencies, so when a program requires several libraries, and
-each of those has further dependencies, all of the prerequisites for the
-program can be installed in one go.")
-      (home-page "https://github.com/ijp/guildhall";)
-      (license license:gpl3+))))
-
 
 ;;;
 ;;; Extensions.
 ;;;
 
-(define-public artanis
-  (let ((release "0.2.1")
-       (revision 3))
-    (package
-      (name "artanis")
-      (version (if (zero? revision)
-                   release
-                   (string-append release "-"
-                                  (number->string revision))))
-      (source (origin
-                (method url-fetch)
-                (uri (string-append "mirror://gnu/artanis/artanis-"
-                                    release ".tar.gz"))
-                (file-name (string-append name "-" version ".tar.gz"))
-                (sha256
-                 (base32
-                  "041ajcg2pz918kd9iqcj4inpzddc3impvz3r2nhlpbv8zrz011hn"))
-                (modules '((guix build utils)))
-                (snippet
-                 '(begin
-                    (delete-file-recursively "artanis/third-party/json.scm")
-                    (delete-file-recursively "artanis/third-party/json")
-                    (substitute* '("artanis/artanis.scm"
-                                   "artanis/oht.scm")
-                      (("(#:use-module \\()artanis third-party (json\\))" _
-                        use-module json)
-                       (string-append use-module json)))
-                    (substitute* "artanis/oht.scm"
-                      
(("([[:punct:][:space:]]+)(->json-string)([[:punct:][:space:]]+)"
-                        _ pre json-string post)
-                       (string-append pre
-                                      "scm" json-string
-                                      post)))
-                    (substitute* "artanis/artanis.scm"
-                      
(("[[:punct:][:space:]]+->json-string[[:punct:][:space:]]+")
-                       ""))
-                    #t))))
-      (build-system gnu-build-system)
-      ;; TODO: Add guile-dbi and guile-dbd optional dependencies.
-      (inputs `(("guile" ,guile-2.2)
-                ("guile-json" ,guile-json)))
-      (native-inputs `(("bash"       ,bash)         ;for the `source' builtin
-                       ("pkgconfig"  ,pkg-config)
-                       ("util-linux" ,util-linux))) ;for the `script' command
-      (arguments
-       '(#:make-flags
-         ;; TODO: The documentation must be built with the `docs' target.
-         (let* ((out (assoc-ref %outputs "out"))
-                (scm (string-append out "/share/guile/site/2.2"))
-                (go  (string-append out "/lib/guile/2.2/site-ccache")))
-           ;; Don't use (%site-dir) for site paths.
-           (list (string-append "MOD_PATH=" scm)
-                 (string-append "MOD_COMPILED_PATH=" go)))
-         #:test-target "test"
-         #:phases
-         (modify-phases %standard-phases
-           (add-before 'install 'substitute-root-dir
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out  (assoc-ref outputs "out")))
-                 (substitute* "Makefile"   ;ignore the execution of bash.bashrc
-                   ((" /etc/bash.bashrc") " /dev/null"))
-                 (substitute* "Makefile"   ;set the root of config files to OUT
-                   ((" /etc") (string-append " " out "/etc")))
-                 (mkdir-p (string-append out "/bin")) ;for the `art' executable
-                 #t)))
-           (add-after 'install 'wrap-art
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (bin (string-append out "/bin"))
-                      (scm (string-append out "/share/guile/site/2.2"))
-                      (go  (string-append out "/lib/guile/2.2/site-ccache")))
-                 (wrap-program (string-append bin "/art")
-                   `("GUILE_LOAD_PATH" ":" prefix (,scm))
-                   `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go)))
-                 #t))))))
-      (synopsis "Web application framework written in Guile")
-      (description "GNU Artanis is a web application framework written in Guile
-Scheme.  A web application framework (WAF) is a software framework that is
-designed to support the development of dynamic websites, web applications, web
-services and web resources.  The framework aims to alleviate the overhead
-associated with common activities performed in web development.  Artanis
-provides several tools for web development: database access, templating
-frameworks, session management, URL-remapping for RESTful, page caching, and
-more.")
-      (home-page "https://www.gnu.org/software/artanis/";)
-      (license (list license:gpl3+ license:lgpl3+))))) ;dual license
-
-(define-public guile-reader
-  (package
-    (name "guile-reader")
-    (version "0.6.2")
-    (source  (origin
-               (method url-fetch)
-               (uri (string-append 
"mirror://savannah/guile-reader/guile-reader-"
-                                   version ".tar.gz"))
-               (sha256
-                (base32
-                 "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("pkgconfig" ,pkg-config)
-                     ("gperf" ,gperf-3.0)))
-    (inputs `(("guile" ,guile-2.2)))
-    (synopsis "Framework for building readers for GNU Guile")
-    (description
-     "Guile-Reader is a simple framework for building readers for GNU Guile.
-
-The idea is to make it easy to build procedures that extend Guile’s read
-procedure.  Readers supporting various syntax variants can easily be written,
-possibly by re-using existing “token readers” of a standard Scheme
-readers.  For example, it is used to implement Skribilo’s R5RS-derived
-document syntax.
-
-Guile-Reader’s approach is similar to Common Lisp’s “read table”, but
-hopefully more powerful and flexible (for instance, one may instantiate as
-many readers as needed).")
-    (home-page "https://www.nongnu.org/guile-reader/";)
-    (license license:gpl3+)))
-
-(define-public guile2.0-reader
-  (package-for-guile-2.0 guile-reader))
-(define-public guile2.2-reader
-  (deprecated-package "guile2.2-reader" guile-reader))
-
-(define-public guile-ncurses
-  (package
-    (name "guile-ncurses")
-    (version "2.2")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f"))))
-    (build-system gnu-build-system)
-    (inputs `(("ncurses" ,ncurses)
-              ("guile" ,guile-2.2)))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (arguments
-     '(#:configure-flags (list "--with-ncursesw"  ; Unicode support
-                               "--with-gnu-filesystem-hierarchy")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'fix-libguile-ncurses-file-name
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "make" "install"
-                     "-C" "src/ncurses"
-                     "-j" (number->string
-                           (parallel-job-count)))
-             (let* ((out   (assoc-ref outputs "out"))
-                    (dir   "src/ncurses")
-                    (files (find-files dir ".scm")))
-               (substitute* files
-                 (("\"libguile-ncurses\"")
-                  (format #f "\"~a/lib/guile/2.2/libguile-ncurses\""
-                          out)))
-               #t))))))
-    (home-page "https://www.gnu.org/software/guile-ncurses/";)
-    (synopsis "Guile bindings to ncurses")
-    (description
-     "guile-ncurses provides Guile language bindings for the ncurses
-library.")
-    (license license:lgpl3+)))
-
-(define-public guile-ncurses/gpm
-  (package
-    (inherit guile-ncurses)
-    (name "guile-ncurses-with-gpm")
-    (inputs `(("ncurses" ,ncurses/gpm)
-              ("guile" ,guile-2.2)))))
-
-(define-public mcron
-  (package
-    (name "mcron")
-    (version "1.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/mcron/mcron-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1i9mcp6r6my61zfiydsm3n6my41mwvl7dfala4q29qx0zn1ynlm4"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'set-timezone
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      ;; 'tests/job-specifier.scm' expects to be running in
-                      ;; UTC-2 or something.
-                      ;; FIXME: This issue is being investigated upstream, for
-                      ;; now we'll just skip the tests (see below):
-                      ;; 
<https://lists.gnu.org/archive/html/bug-mcron/2018-04/msg00005.html>.
-                      (let ((tzdata (assoc-ref inputs "tzdata")))
-                        (setenv "TZDIR"
-                                (string-append tzdata
-                                               "/share/zoneinfo"))
-                        (setenv "TZ" "UTC-2")
-                        #t)))
-                  (add-before 'check 'adjust-tests
-                    (lambda _
-                      (substitute* "tests/job-specifier.scm"
-                        ;; (getpw) fails with "entry not found" in the build
-                        ;; environment, so pass an argument.
-                        (("\\(getpw\\)")
-                         "(getpwnam (getuid))")
-                        ;; The build environment lacks an entry for root in
-                        ;; /etc/passwd.
-                        (("\\(getpw 0\\)")
-                         "(getpwnam \"nobody\")")
-
-                        ;; FIXME: Skip the 4 faulty tests (see above).
-                        (("\\(test-equal \"next-year\"" all)
-                         (string-append "(test-skip 4)\n" all)))
-                      #t)))))
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("tzdata" ,tzdata-for-tests)))
-    (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2)))
-    (home-page "https://www.gnu.org/software/mcron/";)
-    (synopsis "Run jobs at scheduled times")
-    (description
-     "GNU Mcron is a complete replacement for Vixie cron.  It is used to run
-tasks on a schedule, such as every hour or every Monday.  Mcron is written in
-Guile, so its configuration can be written in Scheme; the original cron
-format is also supported.")
-    (license license:gpl3+)))
-
-(define-public mcron2
-  ;; This was mthl's mcron development branch, and it became mcron 1.1.
-  (deprecated-package "mcron2" mcron))
-
-(define-public guile-hall
-  (package
-    (name "guile-hall")
-    (version "0.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.com/a-sassmannshausen/guile-hall";)
-             (commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b")))
-       (file-name "guile-hall-0.1.1-checkout")
-       (sha256
-        (base32
-         "03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules
-       ((ice-9 match)
-        (ice-9 ftw)
-        ,@%gnu-build-system-modules)
-       #:phases
-       (modify-phases
-           %standard-phases
-         (add-after
-             'install
-             'hall-wrap-binaries
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin/"))
-                    (site (string-append out "/share/guile/site")))
-               (match (scandir site)
-                 (("." ".." version)
-                  (let ((modules (string-append site "/" version))
-                        (compiled-modules
-                         (string-append
-                          out
-                          "/lib/guile/"
-                          version
-                          "/site-ccache")))
-                    (for-each
-                     (lambda (file)
-                       (wrap-program
-                           (string-append bin file)
-                         `("GUILE_LOAD_PATH" ":" prefix (,modules))
-                         `("GUILE_LOAD_COMPILED_PATH"
-                           ":"
-                           prefix
-                           (,compiled-modules))))
-                     ,(list 'list "hall"))
-                    #t)))))))))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (propagated-inputs
-     `(("guile-config" ,guile-config)))
-    (synopsis "Guile project tooling")
-    (description
-     "Hall is a command-line application and a set of Guile libraries that
-allow you to quickly create and publish Guile projects.  It allows you to
-transparently support the GNU build system, manage a project hierarchy &
-provides tight coupling to Guix.")
-    (home-page
-     "https://gitlab.com/a-sassmannshausen/guile-hall";)
-    (license license:gpl3+)))
-
-(define-public guile-ics
-  (package
-    (name "guile-ics")
-    (version "0.2.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/artyom-poptsov/guile-ics";)
-                    (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf-wrapper)
-       ("automake" ,automake)
-       ("texinfo" ,texinfo)
-       ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
-       ("gettext" ,gettext-minimal)
-       ("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2) ("which" ,which)))
-    (propagated-inputs `(("guile-lib" ,guile-lib)))
-    (home-page "https://github.com/artyom-poptsov/guile-ics";)
-    (synopsis "Guile parser library for the iCalendar format")
-    (description
-     "Guile-ICS is an iCalendar (RFC5545) format parser library written in
-pure Scheme.  The library can be used to read and write iCalendar data.
-
-The library is shipped with documentation in Info format and usage examples.")
-    (license license:gpl3+)))
-
-(define-public guile-lib
-  (package
-    (name "guile-lib")
-    (version "0.2.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/guile-lib/guile-lib-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:make-flags
-       '("GUILE_AUTO_COMPILE=0")        ; to prevent guild errors
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-module-dir
-           (lambda _
-             (substitute* "src/Makefile.in"
-               (("^moddir = ([[:graph:]]+)")
-                "moddir = $(datadir)/guile/site/@address@hidden")
-               (("^godir = ([[:graph:]]+)")
-                "godir = \
-$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
-             #t)))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2)))
-    (home-page "https://www.nongnu.org/guile-lib/";)
-    (synopsis "Collection of useful Guile Scheme modules")
-    (description
-     "Guile-Lib is intended as an accumulation place for pure-scheme Guile
-modules, allowing for people to cooperate integrating their generic Guile
-modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN
-for Guile\".")
-
-    ;; The whole is under GPLv3+, but some modules are under laxer
-    ;; distribution terms such as LGPL and public domain.  See `COPYING' for
-    ;; details.
-    (license license:gpl3+)))
-
-(define-public guile2.0-lib
-  (package-for-guile-2.0 guile-lib))
-
-(define-public guile2.2-lib
-  (deprecated-package "guile2.2-lib" guile-lib))
-
 (define-public guile-json
   (package
     (name "guile-json")
@@ -947,118 +491,6 @@ specification.  These are the main features:
                (base32
                 "1yfqscz74i4vxylabd3s9l0wbdp8bg9qxnv1ixdm3b1l7zdx00z3"))))))
 
-(define-public guile-minikanren
-  (package
-    (name "guile-minikanren")
-    (version "20150424.e844d85")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/ijp/minikanren.git";)
-                    (commit "e844d85512f8c055d3f96143ee506007389a25e3")))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6"))))
-    (build-system guile-build-system)
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/ijp/minikanren";)
-    (synopsis "MiniKanren declarative logic system, packaged for Guile")
-    (description
-     "MiniKanren is a relational programming extension to the Scheme
-programming Language, written as a smaller version of Kanren suitable for
-pedagogical purposes.  It is featured in the book, The Reasoned Schemer,
-written by Dan Friedman, William Byrd, and Oleg Kiselyov.
-
-This is Ian Price's r6rs packaged version of miniKanren, which deviates
-slightly from miniKanren mainline.
-
-See http://minikanren.org/ for more on miniKanren generally.")
-    (license license:expat)))
-
-(define-public guile2.0-minikanren
-  (package-for-guile-2.0 guile-minikanren))
-
-(define-public guile2.2-minikanren
-  (deprecated-package "guile2.2-minikanren" guile-minikanren))
-
-(define-public guile-miniadapton
-  (let ((commit "1b5749422304567c96ac5367f2221dda9eff5880")
-        (revision "1"))
-    (package
-      (name "guile-miniadapton")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/fisherdj/miniAdapton.git";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "09q51zkw2fypad5xixskfzw2cjhjgs5cswdp3i7cpp651rb3zndh"))))
-      (build-system guile-build-system)
-      (native-inputs
-       `(("guile" ,guile-2.2)))
-      (home-page "https://github.com/fisherdj/miniAdapton";)
-      (synopsis "Minimal implementation of incremental computation in Guile
-Scheme")
-      (description "This package provides a complete Scheme implementation of
-miniAdapton, which implements the core functionality of the Adapton system for
-incremental computation (also known as self-adjusting computation).  Like
-Adapton, miniAdapton allows programmers to safely combine mutation and
-memoization.  miniAdapton is built on top of an even simpler system,
-microAdapton.  Both miniAdapton and microAdapton are designed to be easy to
-understand, extend, and port to host languages other than Scheme.")
-      (license license:expat))))
-
-(define-public guile-irregex
-  (package
-    (name "guile-irregex")
-    (version "0.9.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://synthcode.com/scheme/irregex/irregex-";
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1ia3m7dp3lcxa048q0gqbiwwsyvn99baw6xkhb4bhhzn4k7bwyqq"))))
-    (build-system guile-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'move-files-around
-                    (lambda _
-                      ;; Move the relevant source files to src/ and create the
-                      ;; rx/ directory to match the expected module hierarchy.
-                      (mkdir-p "src/rx/source")
-                      (rename-file "irregex-guile.scm"
-                                   "src/rx/irregex.scm")
-                      (rename-file "irregex.scm"
-                                   "src/rx/source/irregex.scm")
-                      ;; Not really reachable via guile's packaging system,
-                      ;; but nice to have around.
-                      (rename-file "irregex-utils.scm"
-                                   "src/rx/source/irregex-utils.scm")
-                      #t)))
-       #:source-directory "src"))
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "http://synthcode.com/scheme/irregex";)
-    (synopsis "S-expression based regular expressions")
-    (description
-     "Irregex is an s-expression based alternative to your classic
-string-based regular expressions.  It implements SRFI 115 and is deeply
-inspired by the SCSH regular expression system.")
-    (license license:bsd-3)))
-
-(define-public guile2.0-irregex
-  (package-for-guile-2.0 guile-irregex))
-
-(define-public guile2.2-irregex
-  (deprecated-package "guile2.2-irregex" guile-irregex))
-
 ;; There are two guile-gdbm packages, one using the FFI and one with
 ;; direct C bindings, hence the verbose name.
 
@@ -1144,512 +576,6 @@ Guile's foreign function interface.")
 (define-public guile2.0-sqlite3
   (package-for-guile-2.0 guile-sqlite3))
 
-(define-public haunt
-  (package
-    (name "haunt")
-    (version "0.2.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://files.dthompson.us/haunt/haunt-";
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules ((ice-9 match) (ice-9 ftw)
-                  ,@%gnu-build-system-modules)
-       #:tests? #f ; test suite is non-deterministic :(
-       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'wrap-haunt
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      ;; Wrap the 'haunt' command to refer to the right
-                      ;; modules.
-                      (let* ((out  (assoc-ref outputs "out"))
-                             (bin  (string-append out "/bin"))
-                             (site (string-append
-                                    out "/share/guile/site"))
-                             (deps (list (assoc-ref inputs "guile-reader")
-                                         (assoc-ref inputs 
"guile-commonmark"))))
-                        (match (scandir site)
-                          (("." ".." version)
-                           (let ((modules (string-append site "/" version))
-                                 (compiled-modules (string-append
-                                                    out "/lib/guile/" version
-                                                    "/site-ccache")))
-                             (wrap-program (string-append bin "/haunt")
-                               `("GUILE_LOAD_PATH" ":" prefix
-                                 (,modules
-                                  ,@(map (lambda (dep)
-                                           (string-append dep
-                                                          "/share/guile/site/"
-                                                          version))
-                                         deps)))
-                               `("GUILE_LOAD_COMPILED_PATH" ":" prefix
-                                 (,compiled-modules
-                                  ,@(map (lambda (dep)
-                                           (string-append dep "/lib/guile/"
-                                                          version
-                                                          "/site-ccache"))
-                                         deps))))
-                             #t)))))))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (propagated-inputs
-     `(("guile-reader" ,guile-reader)
-       ("guile-commonmark" ,guile-commonmark)))
-    (synopsis "Functional static site generator")
-    (description "Haunt is a static site generator written in Guile
-Scheme.  Haunt features a functional build system and an extensible
-interface for reading articles in any format.")
-    (home-page "http://haunt.dthompson.us";)
-    (license license:gpl3+)))
-
-(define-public guile2.0-haunt
-  (package-for-guile-2.0
-   (package (inherit haunt) (name "guile2.0-haunt"))))
-(define-public guile2.2-haunt
-  (deprecated-package "guile2.2-haunt" haunt))
-
-(define-public guile-config
-  (package
-    (name "guile-config")
-    (version "0.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.com/a-sassmannshausen/guile-config";)
-             (commit "ce12de3f438c6b2b59c43ee21bcd58251835fdf3")))
-       (file-name "guile-config-0.3-checkout")
-       (sha256 (base32 
"02zbpin0r9m2vxmr7mv68v3xdn247dcck56kbzjn0gj4c2rhih85"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (synopsis
-     "Guile application configuration parsing library.")
-    (description
-     "Guile Config is a library providing a declarative approach to
-application configuration specification.  The library provides clean
-configuration declaration forms, and processors that take care of:
-configuration file creation; configuration file parsing; command-line
-parameter parsing using getopt-long; basic GNU command-line parameter
-generation (--help, --usage, --version); automatic output generation for the
-above command-line parameters.")
-    (home-page
-     "https://gitlab.com/a-sassmannshausen/guile-config";)
-    (license license:gpl3+)))
-
-(define-public guile-redis
-  (package
-    (name "guile-redis")
-    (version "1.0.0")
-    (home-page "https://github.com/aconchillo/guile-redis";)
-    (source (origin
-              (method url-fetch)
-              (uri (string-append home-page "/archive/" version ".tar.gz"))
-              (sha256
-               (base32
-                "1dp5fmqvma59pvp1nfpq6hqgbmjici8sd1y8llahl87fynw1dvr9"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("guile" ,guile-2.2)))
-    (synopsis "Redis client library for Guile")
-    (description "Guile-redis provides a Scheme interface to the Redis
-key-value cache and store.")
-    (license license:lgpl3+)))
-
-(define-public guile2.0-redis
-  (package-for-guile-2.0 guile-redis))
-
-(define-public guile2.2-redis
-  (deprecated-package "guile2.2-redis" guile-redis))
-
-(define-public guile-wisp
-  (package
-    (name "guile-wisp")
-    (version "0.9.9")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://bitbucket.org/ArneBab/";
-                                  "wisp/downloads/wisp-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1xa0f0fvcrimqap50azv5872bfx8jbhc6baxa1prpbwcksbh8gdz"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (ice-9 rdelim)
-                  (ice-9 popen))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-/usr/bin/env
-           (lambda _
-             (substitute* "Makefile.in"
-               (("/usr/bin/env bash") (which "bash"))
-               (("\\$\\(GUILE_EFFECTIVE_VERSION\\)/site")
-                "site/$(GUILE_EFFECTIVE_VERSION)")) ;use the right order
-             #t))
-         ;; auto compilation breaks, but if we set HOME to /tmp,
-         ;; that works ok
-         (add-before 'check 'auto-compile-hacky-workaround
-           (lambda _ (setenv "HOME" "/tmp") #t))
-         (add-after 'install 'install-go-files
-           (lambda* (#:key outputs inputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (effective (read-line
-                                (open-pipe* OPEN_READ
-                                            "guile" "-c"
-                                            "(display (effective-version))")))
-                    (module-dir (string-append out "/share/guile/site/"
-                                               effective))
-                    (object-dir (string-append out "/lib/guile/" effective
-                                               "/site-ccache"))
-                    (prefix     (string-length module-dir)))
-               ;; compile to the destination
-               (for-each (lambda (file)
-                           (let* ((base (string-drop (string-drop-right file 4)
-                                                     prefix))
-                                  (go   (string-append object-dir base ".go")))
-                             (invoke "guild" "compile" "-L" module-dir
-                                     file "-o" go)))
-                         (find-files module-dir "\\.scm$"))
-               #t))))))
-    (home-page "https://draketo.de/english/wisp";)
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (native-inputs
-     `(("python" ,python)
-       ("pkg-config" ,pkg-config)))
-    (synopsis "Whitespace to lisp syntax for Guile")
-    (description "Wisp is a syntax for Guile which provides a Python-like
-whitespace-significant language.  It may be easier on the eyes for some
-users and in some situations.")
-    (license license:gpl3+)))
-
-(define-public guile-sly
-  (package
-    (name "guile-sly")
-    (version "0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://files.dthompson.us/sly/sly-";
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1svzlbz2vripmyq2kjh0rig16bsrnbkwbsm558pjln9l65mcl4qq"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* "configure"
-                    (("_guile_required_version=\"2.0.11\"")
-                     "_guile_required_version=\"2\"")
-                    (("ac_subst_vars='")
-                     "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
-                  (substitute* (find-files "." "Makefile.in")
-                    (("moddir = .*$")
-                     (string-append
-                      "moddir = "
-                      "$(prefix)/share/guile/site/@address@hidden"))
-                    (("godir = .*$")
-                     (string-append
-                      "godir = "
-                      
"$(prefix)/lib/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")))
-                  #t))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags
-       (list (string-append "--with-libfreeimage-prefix="
-                            (assoc-ref %build-inputs "freeimage"))
-             (string-append "--with-libgslcblas-prefix="
-                            (assoc-ref %build-inputs "gsl")))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (propagated-inputs
-     `(("guile-sdl" ,guile-sdl)
-       ("guile-opengl" ,guile-opengl)))
-    (inputs
-     `(("guile" ,guile-2.2)
-       ("gsl" ,gsl)
-       ("freeimage" ,freeimage)
-       ("mesa" ,mesa)))
-    (synopsis "2D/3D game engine for GNU Guile")
-    (description "Sly is a 2D/3D game engine written in Guile Scheme.  Sly
-features a functional reactive programming interface and live coding
-capabilities.")
-    (home-page "https://dthompson.us/projects/sly.html";)
-    (license license:gpl3+)))
-
-(define-public g-wrap
-  (package
-    (name "g-wrap")
-    (version "1.9.15")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/g-wrap/g-wrap-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (propagated-inputs
-     `(("guile" ,guile-2.2)
-       ("guile-lib" ,guile-lib)))
-    (inputs
-     `(("libffi" ,libffi)))
-    (arguments
-     `(#:configure-flags '("--disable-Werror")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (substitute* (find-files "." "^Makefile.in$")
-                 (("guilemoduledir =.*guile/site" all)
-                  (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
-               #t))))))
-    (synopsis "Generate C bindings for Guile")
-    (description "G-Wrap is a tool and Guile library for generating function
-wrappers for inter-language calls.  It currently only supports generating Guile
-wrappers for C functions.  Given a definition of the types and prototypes for
-a given C interface, G-Wrap will automatically generate the C code that
-provides access to that interface and its types from the Scheme level.")
-    (home-page "https://www.nongnu.org/g-wrap/index.html";)
-    (license license:lgpl2.1+)))
-
-(define-public guile-dbi
-  (package
-    (name "guile-dbi")
-    (version "2.1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://download.gna.org/guile-dbi/guile-dbi-";
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "116njrprhgrsv1qm904sp3b02rq01fx639r433d657gyhw3x159n"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags
-       (list (string-append
-              "--with-guile-site-dir=" %output "/share/guile/site/2.2"))
-       #:make-flags
-       (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:"
-                            (assoc-ref %build-inputs "guile-dbd-sqlite3") 
"/lib"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'patch-extension-path
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref outputs "out"))
-                    (dbi.scm (string-append
-                              out "/share/guile/site/2.2/dbi/dbi.scm"))
-                    (ext     (string-append out "/lib/libguile-dbi")))
-               (substitute* dbi.scm (("libguile-dbi") ext))
-               #t))))))
-    (inputs
-     `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3))) ; only shared library, no 
scheme files
-    (propagated-inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "Guile database abstraction layer")
-    (home-page "http://home.gna.org/guile-dbi/guile-dbi.html";)
-    (description
-     "guile-dbi is a library for Guile that provides a convenient interface to
-SQL databases.  Database programming with guile-dbi is generic in that the same
-programming interface is presented regardless of which database system is used.
-It currently supports MySQL, Postgres and SQLite3.")
-    (license license:gpl2+)))
-
-(define guile-dbi-bootstrap
-  (package
-    (inherit guile-dbi)
-    (name "guile-dbi-bootstrap")
-    (inputs '())
-    (arguments
-     (substitute-keyword-arguments (package-arguments guile-dbi)
-       ((#:make-flags _) '(list))))))
-
-(define-public guile-dbd-sqlite3
-  (package
-    (name "guile-dbd-sqlite3")
-    (version "2.1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://download.gna.org/guile-dbi/guile-dbd-sqlite3-";
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "0rg71jchxd2y8x496s8zmfmikr5g8zxi8zv2ar3f7a23pph92iw2"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) ; only required for 
headers
-    (inputs
-     `(("sqlite" ,sqlite)
-       ("zlib" ,(@ (gnu packages compression) zlib))))
-    (synopsis "Guile DBI driver for SQLite")
-    (home-page "https://github.com/jkalbhenn/guile-dbd-sqlite3";)
-    (description
-     "guile-dbi is a library for Guile that provides a convenient interface to
-SQL databases.  This package implements the interface for SQLite.")
-    (license license:gpl2+)))
-
-(define-public guile-dsv
-  (package
-    (name "guile-dsv")
-    (version "0.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/artyom-poptsov/guile-dsv";)
-                    (commit "bdc5267d007478abc20ea96d7c459b7dd9560b3d")))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1irw6mz8998nwyhzrw9g94jcz60b9zljgqfmipaz1ybn8579qjx0"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (propagated-inputs `(("guile-lib" ,guile-lib)))
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'set-guilesitedir
-                    (lambda _
-                      (substitute* "Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      (substitute* "modules/Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      (substitute* "modules/dsv/Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      #t)))))
-    (home-page "https://github.com/artyom-poptsov/guile-dsv";)
-    (synopsis "DSV module for Guile")
-    (description
-     "Guile-DSV is a GNU Guile module for working with the
-delimiter-separated values (DSV) data format.  Guile-DSV supports the
-Unix-style DSV format and RFC 4180 format.")
-    (license license:gpl3+)))
-
-(define-public guile-xosd
-  (package
-    (name "guile-xosd")
-    (version "0.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/alezost/"; name
-                                  "/releases/download/v" version
-                                  "/" name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1ri5065c16kmgrf2pysn2ymxjqi5302lhpb07wkl1jr75ym8fn8p"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxinerama" ,libxinerama)
-       ("xosd" ,xosd)))
-    (home-page "https://github.com/alezost/guile-xosd";)
-    (synopsis "XOSD bindings for Guile")
-    (description
-     "Guile-XOSD provides Guile bindings for @code{libxosd},
address@hidden://sourceforge.net/projects/libxosd/, the X On Screen Display
-library}.")
-    (license license:gpl3+)))
-
-(define-public guile-daemon
-  (package
-    (name "guile-daemon")
-    (version "0.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/alezost/"; name
-                                  "/releases/download/v" version
-                                  "/" name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0hh6gq6b6phpxm0b1dkxyzj3f4sxdf7dji63609lzypa5v1ad2gv"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/alezost/guile-daemon";)
-    (synopsis "Evaluate code in a running Guile process")
-    (description
-     "Guile-Daemon is a small Guile program that loads your initial
-configuration file, and then reads and evaluates Guile expressions that
-you send to a FIFO file.")
-    (license license:gpl3+)))
-
-(define-public guile-commonmark
-  (package
-    (name "guile-commonmark")
-    (version "0.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/OrangeShark/"; name
-                                  "/releases/download/v" version
-                                  "/" name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0kzclwkfijj8xka3g9kfj53y67c34ndfy84swdbw3j7y962ndxq6"))
-              (modules '((guix build utils)))
-              (snippet
-               ;; Install .scm files in the right place (see
-               ;; <https://github.com/OrangeShark/guile-commonmark/issues/12>.)
-               '(begin
-                  (substitute* "Makefile.in"
-                    (("^moddir = \\$\\(datadir\\)/share")
-                     "moddir = $(datadir)"))
-                  #t))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (synopsis "CommonMark parser for Guile")
-    (description
-     "guile-commonmark is a library for parsing CommonMark, a fully specified
-variant of Markdown.  The library is written in Guile Scheme and is designed
-to transform a CommonMark document to SXML.  guile-commonmark tries to closely
-follow the @uref{http://commonmark.org/, CommonMark spec}, the main difference
-is no support for parsing block and inline level HTML.")
-    (home-page "https://github.com/OrangeShark/guile-commonmark";)
-    (license license:lgpl3+)))
-
-(define-public guile2.0-commonmark
-  (package-for-guile-2.0 guile-commonmark))
-(define-public guile2.2-commonmark
-  (deprecated-package "guile2.2-commonmark" guile-commonmark))
-
 (define-public guile-bytestructures
   (package
     (name "guile-bytestructures")
@@ -1680,194 +606,6 @@ type system, elevating types to first-class status.")
 (define-public guile2.0-bytestructures
   (package-for-guile-2.0 guile-bytestructures))
 
-(define-public guile-aspell
-  (package
-    (name "guile-aspell")
-    (version "0.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://lonelycactus.com/tarball/guile_aspell-";
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'set-guilesitedir
-                    (lambda _
-                      (substitute* "Makefile.in"
-                        (("^guilesitedir =.*$")
-                         "guilesitedir = \
-$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
-                      #t))
-                  (add-before 'build 'set-libaspell-file-name
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (let ((aspell (assoc-ref inputs "aspell")))
-                        (substitute* "aspell.scm"
-                          (("\"libaspell\\.so\"")
-                           (string-append "\"" aspell
-                                          "/lib/libaspell\"")))
-                        #t))))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.2)
-              ("aspell" ,aspell)))
-    (home-page "https://github.com/spk121/guile-aspell";)
-    (synopsis "Spell-checking from Guile")
-    (description
-     "guile-aspell is a Guile Scheme library for comparing a string against a
-dictionary and suggesting spelling corrections.")
-    (license license:gpl3+)))
-
-(define-public guile-bash
-  ;; This project is currently retired.  It was initially announced here:
-  ;; <https://lists.gnu.org/archive/html/guile-user/2015-02/msg00003.html>.
-  (let ((commit "1eabc563ca5692b3e08d84f1f0e6fd2283284469")
-        (revision "0"))
-    (package
-      (name "guile-bash")
-      (version (string-append "0.1.6-" revision "." (string-take commit 7)))
-      (home-page
-       
"https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git";)
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (commit commit)
-                      (url home-page)))
-                (sha256
-                 (base32
-                  "097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p"))
-                (file-name (string-append name "-" version "-checkout"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:configure-flags
-         ;; Add -I to match 'bash.pc' of Bash 4.4.
-         (list (string-append "CPPFLAGS=-I"
-                              (assoc-ref %build-inputs "bash:include")
-                              "/include/bash/include")
-
-               ;; The '.a' file is useless.
-               "--disable-static"
-
-               ;; Install 'lib/bash' as Bash 4.4 expects.
-               (string-append "--libdir=" (assoc-ref %outputs "out")
-                              "/lib/bash"))))
-      (native-inputs `(("pkg-config" ,pkg-config)
-                       ("autoconf" ,autoconf-wrapper)
-                       ("automake" ,automake)
-                       ("libtool" ,libtool)
-                       ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
-                       ("gettext" ,gettext-minimal)
-
-                       ;; Bash with loadable module support, for the test
-                       ;; suite.
-                       ("bash-full" ,bash)))
-      (inputs `(("guile" ,guile-2.0)
-                ("bash:include" ,bash "include")))
-      (synopsis "Extend Bash using Guile")
-      (description
-       "Guile-Bash provides a shared library and set of Guile modules,
-allowing you to extend Bash in Scheme.  Scheme interfaces allow you to access
-the following aspects of Bash:
-
address@hidden
address@hidden aliases;
address@hidden setting and getting Bash variables;
address@hidden creating dynamic variables;
address@hidden creating Bash functions with a Scheme implementation;
address@hidden reader macro for output capturing;
address@hidden reader macro for evaluating raw Bash commands.
address@hidden itemize
-
-To enable it, run:
-
address@hidden
-enable -f ~/.guix-profile/lib/bash/libguile-bash.so scm
address@hidden example
-
-and then run @command{scm example.scm}.")
-      (license license:gpl3+))))
-
-(define-public guile-8sync
-  (package
-    (name "guile-8sync")
-    (version "0.4.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/8sync/8sync-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw"))))
-    (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf)
-                     ("automake" ,automake)
-                     ("guile" ,guile-2.2)
-                     ("pkg-config" ,pkg-config)
-                     ("texinfo" ,texinfo)))
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'setenv
-                    (lambda _
-                      ;; quiet warnings
-                      (setenv "GUILE_AUTO_COMPILE" "0")
-                      #t)))))
-    (home-page "https://gnu.org/s/8sync/";)
-    (synopsis "Asynchronous actor model library for Guile")
-    (description
-     "GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming
-library for GNU Guile based on the actor model.
-
-Note that 8sync is only available for Guile 2.2.")
-    (license license:lgpl3+)))
-
-(define-public guile-fibers
-  (package
-    (name "guile-fibers")
-    (version "1.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://wingolog.org/pub/fibers/fibers-";
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-after 'install 'mode-guile-objects
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      ;; .go files are installed to "lib/guile/X.Y/cache".
-                      ;; This phase moves them to "…/site-ccache".
-                      (let* ((out (assoc-ref outputs "out"))
-                             (lib (string-append out "/lib/guile"))
-                             (old (car (find-files lib "^ccache$"
-                                                   #:directories? #t)))
-                             (new (string-append (dirname old)
-                                                 "/site-ccache")))
-                        (rename-file old new)
-                        #t))))))
-    (native-inputs
-     `(("texinfo" ,texinfo)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "Lightweight concurrency facility for Guile")
-    (description
-     "Fibers is a Guile library that implements a a lightweight concurrency
-facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is
-like a \"goroutine\" from the Go language: a lightweight thread-like
-abstraction.  Systems built with Fibers can scale up to millions of concurrent
-fibers, tens of thousands of concurrent socket connections, and many parallel
-cores.  The Fibers library also provides Concurrent ML-like channels for
-communication between fibers.
-
-Note that Fibers makes use of some Guile 2.1/2.2-specific features and
-is not available for Guile 2.0.")
-    (home-page "https://github.com/wingo/fibers";)
-    (license license:lgpl3+)))
-
 (define-public guile-git
   (package
     (name "guile-git")
@@ -1901,505 +639,5 @@ manipulate repositories of the Git version control 
system.")
 (define-public guile2.0-git
   (package-for-guile-2.0 guile-git))
 
-(define-public guile-syntax-highlight
-  (package
-    (name "guile-syntax-highlight")
-    (version "0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://files.dthompson.us/";
-                                  "guile-syntax-highlight/"
-                                  "guile-syntax-highlight-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "General-purpose syntax highlighter for GNU Guile")
-    (description "Guile-syntax-highlight is a general-purpose syntax
-highlighting library for GNU Guile.  It can parse code written in various
-programming languages into a simple s-expression that can be converted to
-HTML (via SXML) or any other format for rendering.")
-    (home-page "http://dthompson.us/projects/guile-syntax-highlight.html";)
-    (license license:lgpl3+)))
-
-(define-public guile-sjson
-  (package
-    (name "guile-sjson")
-    (version "0.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://dustycloud.org/misc/sjson-"; version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "https://gitlab.com/dustyweb/guile-sjson";)
-    (synopsis "S-expression based json reader/writer for Guile")
-    (description "guile-sjson is a json reader/writer for Guile.
-It has a nice, simple s-expression based syntax.")
-    (license license:lgpl3+)))
-
-(define-public guile-colorized
-  (package
-    (name "guile-colorized")
-    (version "0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append 
"https://github.com/NalaGinrut/guile-colorized/";
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "16xhc3an6aglnca8xl3mvgi8hsqzqn68vsl5ga4bz8bvbap5fn4p"))))
-    (build-system guile-build-system)
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (home-page "https://github.com/NalaGinrut/guile-colorized";)
-    (synopsis "Colorized REPL for Guile")
-    (description
-     "Guile-colorized provides you with a colorized REPL for GNU Guile.")
-    (license license:gpl3+)))
-
-(define-public guile-pfds
-  (package
-    (name "guile-pfds")
-    (version "0.3")
-    (home-page "https://github.com/ijp/pfds";)
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
-              (sha256
-               (base32
-                "19y33wg94pf0n98dkfqd1zbw93fgky4sawxsxl6s3vyqwl0yi5vh"))
-              (file-name (string-append name "-" version "-checkout"))))
-    (build-system guile-build-system)
-    (arguments
-     '(#:source-directory "src"
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'move-files-around
-                    (lambda _
-                      ;; Move files under a pfds/ directory to reflect the
-                      ;; module hierarchy.
-                      (mkdir-p "src/pfds")
-                      (for-each (lambda (file)
-                                  (rename-file file
-                                               (string-append "src/pfds/"
-                                                              file)))
-                                '("bbtrees.sls"
-                                  "deques"
-                                  "deques.sls"
-                                  "dlists.sls"
-                                  "fingertrees.sls"
-                                  "hamts.sls"
-                                  "heaps.sls"
-                                  "private"
-                                  "psqs.sls"
-                                  "queues"
-                                  "queues.sls"
-                                  "sequences.sls"
-                                  "sets.sls"))
-
-                      ;; In Guile <= 2.2.4, there's no way to tell 'guild
-                      ;; compile' to accept the ".sls" extension.  So...
-                      (for-each (lambda (file)
-                                  (rename-file file
-                                               (string-append
-                                                (string-drop-right file 4)
-                                                ".scm")))
-                                (find-files "." "\\.sls$"))
-                      #t)))))
-    (native-inputs
-     `(("guile" ,guile-2.2)))
-    (synopsis "Purely functional data structures for Guile")
-    (description
-     "This package provides purely functional data structures written in R6RS
-Scheme and compiled for Guile.  It has been tested with Racket, Guile 2,
-Vicare Scheme and IronScheme.  Right now it contains:
-
address@hidden
address@hidden queues
address@hidden deques
address@hidden bbtrees
address@hidden sets
address@hidden dlists
address@hidden priority search queues (PSQs)
address@hidden finger trees
address@hidden sequences
address@hidden heaps
address@hidden hash array mapped tries (HAMTs).
address@hidden itemize\n")
-    (license license:bsd-3)))
-
-(define-public guile-aa-tree
-  (package
-    (name "guile-aa-tree")
-    (version "3.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append 
"mirror://savannah/guile-aa-tree/guile-aa-tree-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh"))))
-    (build-system guile-build-system)
-    (native-inputs `(("guile" ,guile-2.2)))
-    ;; https://savannah.nongnu.org/projects/guile-aa-tree
-    (home-page "https://qlfiles.net/guile-aa-tree/";)
-    (synopsis "AA tree data structure for Guile")
-    (description
-     "This package provides an implementation of @dfn{AA trees}, a
-self-balancing binary tree data structure, for Guile.  It ensure @math{O(log
-n)} worst case performance for core operations.  The module provides
-non-mutating insert, delete, and search operations, with support for
-convenient nested tree operations.")
-    (license license:gpl3+)))
-
-(define-public guile-simple-zmq
-  (let ((commit "68bedb6679716214fb9d3472da57544526f7a618")
-        (revision "3"))
-    (package
-      (name "guile-simple-zmq")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/jerry40/guile-simple-zmq";)
-               (commit commit)))
-         (sha256
-          (base32
-           "1ad3xg69qqviy1f6dnlw0ysmfdbmp1jq65rfqb8nfd8dsrq2syli"))
-         (file-name (git-file-name name version))))
-      (build-system guile-build-system)
-      (arguments
-       `(#:source-directory "src"
-         #:phases (modify-phases %standard-phases
-                    (add-after 'unpack 'set-libzmq-file-name
-                      (lambda* (#:key inputs #:allow-other-keys)
-                        (substitute* "src/simple-zmq.scm"
-                          (("\\(dynamic-link \"libzmq\"\\)")
-                           (format #f "(dynamic-link \"~a/lib/libzmq.so\")"
-                                   (assoc-ref inputs "zeromq"))))
-                        #t)))))
-      (native-inputs
-       `(("guile" ,guile-2.2)))
-      (inputs
-       `(("zeromq" ,zeromq)))
-      (home-page "https://github.com/jerry40/guile-simple-zmq";)
-      (synopsis "Guile wrapper over ZeroMQ library")
-      (description
-       "This package provides a Guile programming interface to the ZeroMQ
-messaging library.")
-      (license license:gpl3+))))
-
-(define-public jupyter-guile-kernel
-  (let ((commit "a7db9245a886e104138474df46c3e88b95cff629")
-        (revision "1"))
-    (package
-      (name "jupyter-guile-kernel")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/jerry40/guile-kernel";)
-               (commit commit)))
-         (sha256
-          (base32
-           "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f"))))
-      (build-system guile-build-system)
-      (arguments
-       '(#:phases (modify-phases %standard-phases
-                    (add-after 'unpack 'set-openssl-file-name
-                      (lambda* (#:key inputs #:allow-other-keys)
-                        ;; Record the absolute file name of the 'openssl'
-                        ;; command.
-                        (substitute* "src/hmac.scm"
-                          (("openssl")
-                           (string-append (assoc-ref inputs "openssl")
-                                          "/bin/openssl")))
-                        #t))
-
-                    ;; XXX: The code uses 'include' to include its own source
-                    ;; files, and "-L src" isn't enough in this case.
-                    (add-before 'build 'chdir
-                      (lambda _ (chdir "src") #t))
-                    (add-after 'build 'chdir-back
-                      (lambda _ (chdir "..") #t))
-
-                    (add-after 'install 'install-kernel
-                      (lambda* (#:key inputs outputs #:allow-other-keys)
-                        (let* ((out   (assoc-ref outputs "out"))
-                               (json  (assoc-ref inputs "guile-json"))
-                               (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-file "src/kernel.json" dir)
-
-                          ;; Fix hard-coded file name in the kernel.
-                          (substitute* (string-append dir "/kernel.json")
-                            (("/home/.*/guile-jupyter-kernel.scm")
-                             (string-append out "/share/guile/site/"
-                                            (target-guile-effective-version)
-                                            "/guile-jupyter-kernel.scm"))
-                            (("\"guile\"")
-                             (string-append "\"" (assoc-ref inputs "guile")
-                                            "/bin/guile\""))
-                            (("-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))))))
-      (inputs
-       `(("openssl" ,openssl)
-         ("guile" ,guile-2.2)
-         ("guile-json" ,guile-json)
-         ("guile-simple-zmq" ,guile-simple-zmq)))
-      (synopsis "Guile kernel for the Jupyter Notebook")
-      (description
-       "This package provides a Guile 2.x kernel for the Jupyter Notebook.  It
-allows users to interact with the Guile REPL through Jupyter.")
-      (home-page "https://github.com/jerry40/guile-kernel";)
-      (license license:gpl3+))))
-
-(define-public guile-sparql
-  (package
-   (name "guile-sparql")
-   (version "0.0.7")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append
-                  "https://github.com/roelj/guile-sparql/releases/download/";
-                  version "/guile-sparql-" version ".tar.gz"))
-            (sha256
-             (base32 "1drnvhsgl0gc5crmb16yyw1j98nkhwwcgssv9vgm36ng43nnzffd"))))
-   (build-system gnu-build-system)
-   (arguments `(#:tests? #f)) ; There are no tests.
-   (native-inputs
-    `(("pkg-config" ,pkg-config)))
-   (inputs
-    `(("guile" ,guile-2.2)))
-   (home-page "https://github.com/roelj/guile-sparql";)
-   (synopsis "SPARQL module for Guile")
-   (description "This package provides the functionality to query a SPARQL
-endpoint.  Additionally, it provides an interface to write SPARQL queries
-using S-expressions.")
-   (license license:gpl3+)))
-
-(define-public guile-debbugs
-  (package
-    (name "guile-debbugs")
-    (version "0.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i"))
-              (modules '((guix build utils)))
-              (snippet
-               '(substitute* "Makefile.in"
-                  (("^godir = (.*)/ccache" _ prefix)
-                   (string-append "godir = " prefix "/site-ccache"))))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("guile" ,guile-2.2)
-       ("pkg-config" ,pkg-config)))
-    (home-page "https://savannah.gnu.org/projects/guile-debbugs/";)
-    (synopsis "Guile interface to the Debbugs bug tracking service")
-    (description
-     "This package provides a Guile library to communicate with a Debbugs bug
-tracker's SOAP service, such as @url{https://bugs.gnu.org}.";)
-    (license license:gpl3+)))
-
-(define-public guile-email
-  (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
-        (revision "1"))
-    (package
-      (name "guile-email")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.systemreboot.net/guile-email";)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
-      (build-system gnu-build-system)
-      (native-inputs
-       `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)))
-      (inputs
-       `(("guile" ,guile-2.2)))
-      (home-page "https://git.systemreboot.net/guile-email";)
-      (synopsis "Guile email parser")
-      (description "This package provides an email parser written in pure
-Guile.")
-      (license license:agpl3+))))
-
-(define-public guile-debbugs-next
-  (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
-        (revision "1"))
-    (package (inherit guile-debbugs)
-      (name "guile-debbugs")
-      (version (git-version "0.0.3" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url 
"https://git.savannah.gnu.org/git/guile-debbugs.git";)
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y"))))
-      (build-system gnu-build-system)
-      (native-inputs
-       `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("texinfo" ,texinfo)))
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("guile-email" ,guile-email))))))
-
-;; There has not been any release yet.
-(define-public guile-newt
-  (let ((commit "80c1e9e71945f833386d1632b52573e59325804f")
-        (revision "4"))
-    (package
-      (name "guile-newt")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://gitlab.com/mothacehe/guile-newt";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:make-flags
-         '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("newt" ,newt)))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)))
-      (synopsis "Guile bindings to Newt")
-      (description
-       "This package provides bindings for Newt, a programming library for
-color text mode, widget based user interfaces.  The bindings are written in 
pure
-Scheme by using Guile’s foreign function interface.")
-      (home-page "https://gitlab.com/mothacehe/guile-newt";)
-      (license license:gpl3+))))
-
-(define-public guile-mastodon
-  (package
-    (name "guile-mastodon")
-    (version "0.0.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://framagit.org/prouby/guile-mastodon.git";)
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2)
-       ("gnutls" ,gnutls)
-       ("guile-json" ,guile-json)))
-    (home-page "https://framagit.org/prouby/guile-mastodon";)
-    (synopsis "Guile Mastodon REST API module")
-    (description "This package provides Guile modules to access the
address@hidden://docs.joinmastodon.org/api/, REST API of Mastodon}, a federated
-microblogging service.")
-    (license license:gpl3+)))
-
-;; There has not been any release yet.
-(define-public guile-parted
-  (let ((commit "ea3f1a1f6844775fc59d3078d2a09c62ffb341b8")
-        (revision "0"))
-    (package
-      (name "guile-parted")
-      (version (string-append "0-" revision "." (string-take commit 9)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://gitlab.com/mothacehe/guile-parted";)
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:make-flags
-         '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("parted" ,parted)))
-      (propagated-inputs
-       `(("guile-bytestructures" ,guile-bytestructures)))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)))
-      (synopsis "Guile bindings to GNU Parted")
-      (description
-       "This package provides bindings for GNU Parted library, a C library
-allowing disk partition tables creation and manipulation. The bindings are
-written in pure Scheme by using Guile's foreign function interface.")
-      (home-page "https://gitlab.com/mothacehe/guile-parted";)
-      (license license:gpl3+))))
-
 ;;; guile.scm ends here
 
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5777374..05607c1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -76,6 +76,7 @@
   #:use-module (gnu packages gsasl)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libcanberra)
diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index f24e644..bfce96f 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -52,6 +52,7 @@
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages man)
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index 12bdd1a..a01633c 100644
--- a/gnu/packages/skribilo.scm
+++ b/gnu/packages/skribilo.scm
@@ -22,6 +22,7 @@
   #:use-module (guix licenses)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages lout)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages plotutils)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 776027c..c8f9bfd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -87,6 +87,7 @@
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages java)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages image)
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm
index e4b652b..1b232b6 100644
--- a/gnu/services/mcron.scm
+++ b/gnu/services/mcron.scm
@@ -20,7 +20,7 @@
   #:use-module (gnu services)
   #:use-module (gnu services base)
   #:use-module (gnu services shepherd)
-  #:autoload   (gnu packages guile) (mcron)
+  #:autoload   (gnu packages guile-xyz) (mcron)
   #:use-module (guix deprecation)
   #:use-module (guix records)
   #:use-module (guix gexp)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]