tissue: Use upstream Guix tissue package.

* guix/forge/tissue.scm: Do not import (gnu packages autotools), (gnu
packages compression), (gnu packages gettext), (gnu packages
guile), (gnu packages guile-xyz), (gnu packages skribilo), (guix
build-system gnu), (guix download), (guix git-download), (guix
licenses) and (guix packages).
(skribilo-latest, guile-xapian-latest, tissue): Delete variables.

1 files changed, 1 insertions, 108 deletions

diff --git a/guix/forge/tissue.scm b/guix/forge/tissue.scm
index 07687e8..7836b13 100644
--- a/guix/forge/tissue.scm
+++ b/guix/forge/tissue.scm
@@ -22,24 +22,14 @@
   #:use-module (forge socket)
   #:use-module (gnu build linux-container)
   #:use-module ((gnu packages admin) #:select (shadow))
-  #:use-module ((gnu packages autotools) #:select (autoconf automake))
-  #:use-module ((gnu packages compression) #:select (lzip))
-  #:use-module ((gnu packages gettext) #:select (gnu-gettext))
-  #:use-module ((gnu packages guile) #:select (guile-3.0 guile-git))
-  #:use-module ((gnu packages guile-xyz) #:select (guile-filesystem guile-xapian))
-  #:use-module ((gnu packages skribilo) #:select (skribilo) #:prefix guix:)
+  #:use-module ((gnu packages web) #:select (tissue))
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
   #:use-module (gnu system file-systems)
   #:use-module (gnu system shadow)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix least-authority)
   #:use-module (guix modules)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
   #:use-module (guix records)
   #:export (tissue-service-type
             <tissue-configuration>
@@ -56,103 +46,6 @@
             tissue-host-user
             tissue-host-upstream-repository))
 
-;; tissue requires an unreleased version of skribilo for its gemtext
-;; reader.
-(define-public skribilo-latest
-  (let ((commit "621eb1945aec8f26f5aee4bdf896f2434e145182")
-        (revision "1"))
-    (package
-      (inherit guix:skribilo)
-      (name "skribilo")
-      (version (git-version "0.9.5" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.savannah.gnu.org/git/skribilo.git")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "16rdcvszl9x183y32hjdwns0lkrvkmwd2fsshymspb12k4cxj6i4"))))
-      (native-inputs
-       (modify-inputs (package-native-inputs guix:skribilo)
-         (prepend autoconf)
-         (prepend automake)
-         (prepend gnu-gettext))))))
-
-;; We use this commit of guile-xapian until the 0.4.0 release.
-(define guile-xapian-latest
-  (let ((commit "93162fd60dbc0cce726113a82c13d88783a279b6")
-        (revision "1"))
-    (package
-      (inherit guile-xapian)
-      (name "guile-xapian")
-      (version (git-version (package-version guile-xapian) revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.systemreboot.net/guile-xapian")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0g9w10wsjw11ayi9l5y0k6lz4mq2qfhq2hwbxbqgdj7jmllwirgp")))))))
-
-;; TODO: Contribute tissue package upstream to Guix after release of
-;; its guile-xapian and skribilo dependencies.
-(define-public tissue
-  (package
-    (name "tissue")
-    (version "0.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://tissue.systemreboot.net/releases/tissue-"
-                                  version ".tar.lz"))
-              (sha256
-               (base32
-                "0vsybgnzv8nnwf58pnxrs4101xczl8jvxd1wzmk4vmdyrp8a2kkm"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:make-flags #~(list (string-append "prefix=" #$output))
-           #:modules `(((guix build guile-build-system)
-                        #:select (target-guile-effective-version))
-                       ,@%gnu-build-system-modules)
-           #:phases
-           (with-imported-modules '((guix build guile-build-system))
-             #~(modify-phases %standard-phases
-                 (replace 'patch-source-shebangs
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (substitute* "bin/tissue"
-                       (("^exec guile")
-                        (string-append "exec " (search-input-file inputs "/bin/guile"))))))
-                 (delete 'configure)
-                 (add-after 'install 'wrap
-                   (lambda* (#:key inputs outputs #:allow-other-keys)
-                     (let ((out (assoc-ref outputs "out"))
-                           (effective-version (target-guile-effective-version)))
-                       (wrap-program (string-append out "/bin/tissue")
-                         `("GUILE_LOAD_PATH" prefix
-                           (,(string-append out "/share/guile/site/" effective-version)
-                            ,(getenv "GUILE_LOAD_PATH")))
-                         `("GUILE_LOAD_COMPILED_PATH" prefix
-                           (,(string-append out "/lib/guile/" effective-version "/site-ccache")
-                            ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))))
-    (inputs (list guile-3.0 guile-filesystem guile-git guile-xapian-latest))
-    (native-inputs
-     (list lzip))
-    (propagated-inputs
-     (list skribilo-latest))
-    (home-page "https://tissue.systemreboot.net")
-    (synopsis "Text based project information management system")
-    (description
-     "tissue is an issue tracker and project information management system
-built on plain text files and git.  It features a static site
-generator to build a project website and a powerful search interface
-to search through project issues and documentation.  The search
-interface is built on the Xapian search engine library, and is
-available both as a command-line program and as a web server.")
-    (license license:gpl3+)))
-
 (define-record-type* <tissue-configuration>
   tissue-configuration make-tissue-configuration
   tissue-configuration?