guix: Remove custom versions of packages.

[software/mumi.git] / guix.scm

diff --git a/guix.scm b/guix.scm
index 8982ec6c7bd9ccb03f371470ed83a1c3afc19334..ee1558f8165d1104bfc74c387098c5dad9a70bb8 100644 (file)
--- a/guix.scm
+++ b/guix.scm
@@ -29,98 +29,11 @@
              (guix build-system gnu)
              (gnu packages)
              (gnu packages autotools)
-             (gnu packages gettext)
              (gnu packages guile)
-             (gnu packages gsasl)
-             (gnu packages mail)
              (gnu packages pkg-config)
+             (gnu packages texinfo)
              (srfi srfi-1))
 
-(define-public mailutils-next
-  ;; This version of Mailutils supports Guile 2.2, unlike version <= 3.4.
-  (let ((commit "ce5b13e92b6e2f7af243654fe0673646f00dc3a6")
-        (revision "1"))
-    (package
-      (inherit mailutils)
-      (version (string-append (package-version mailutils)
-                              "-" revision "." (string-take commit 7)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.savannah.gnu.org/git/mailutils.git")
-                      (commit commit)
-                      (recursive? #t)))           ;for Gnulib & co.
-                (sha256
-                 (base32
-                  "15vbj5by7qg8zmh3scr3k9pymls6ijk1s85y1skclsln172r9p33"))
-                (file-name (string-append "mailutils-" version "-checkout"))))
-      (outputs '("out" "debug"))
-      (inputs
-       `(("guile" ,guile-2.2)
-         ("gsasl" ,gsasl)                         ;for SMTP authentication
-         ,@(alist-delete "guile" (package-inputs mailutils))))
-      (native-inputs
-       `(("autoconf" ,autoconf-wrapper)
-         ("automake" ,automake)
-         ("libtool" ,libtool)
-         ("gettext" ,gnu-gettext)
-         ,@(package-native-inputs mailutils)))
-      (arguments
-       (substitute-keyword-arguments (package-arguments mailutils)
-         ((#:modules modules %gnu-build-system-modules)
-          `((srfi srfi-1) ,@modules))
-         ((#:configure-flags flags ''())
-          `(cons* "--disable-radius"
-
-                  ;; Add "/2.2" to the installation directory.
-                  (string-append "--with-guile-site-dir="
-                                 (assoc-ref %outputs "out")
-                                 "/share/guile/site/2.2")
-                  ,flags))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (replace 'bootstrap
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (for-each patch-shebang
-                           '("bootstrap" "gnulib/gnulib-tool"))
-                 (substitute* "bootstrap.conf"
-                   (("git submodule" all)
-                    (string-append "#" all)))
-                 (for-each make-file-writable (find-files "gnulib"))
-                 (substitute* "configure.ac"
-                   (("AM_GNU_RADIUS") ""))
-                 (invoke "./bootstrap" "--no-git" "--skip-po"
-                         (string-append "--gnulib-srcdir=gnulib"))
-                 #t))
-             (delete 'prepare-test-suite)))
-         ((#:parallel-build? _ #f)                ;due to parser.y
-          #f)
-         ((#:tests? _ #f)                         ;XXX
-          #f))))))
-
-(define-public guile-debbugs-next
-  (package
-    (name "guile-debbugs")
-    (version "0.0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/guile-debbugs/"
-                                  "guile-debbugs-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1lwrj2hmncc4ks05c2yfh8z93bcwcynplqi3cvm6kdblcv4yr2rl"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("guile" ,guile-2.2.4)
-       ("mailutils" ,mailutils-next)))
-    (home-page "https://www.gnu.org/software/guile-debbugs")
-    (synopsis "Guile bindings for the Debbugs bug tracker")
-    (description "This package provides a Guile library to communicate with a
-Debbugs bug tracker's SOAP service.")
-    (license license:gpl3+)))
-
 (package
   (name "mumi")
   (version "0.0.0")
@@ -128,8 +41,11 @@ Debbugs bug tracker's SOAP service.")
   (build-system gnu-build-system)
   (inputs
    `(("guile-debbugs" ,guile-debbugs-next)
-     ("mailutils" ,mailutils-next)
-     ("guile" ,guile-2.2.4)))
+     ("guile-email" ,guile-email)
+     ("guile-json" ,guile-json)
+     ("guile-fibers" ,guile-fibers)
+     ("guile-syntax-highlight" ,guile-syntax-highlight)
+     ("guile" ,guile-2.2)))
   (native-inputs
    `(("autoconf" ,autoconf)
      ("automake" ,automake)