From 708d646fccdf5f860c1b3ddd6b0eec324093d34a Mon Sep 17 00:00:00 2001
From: Morgan Smith
Date: Tue, 30 May 2023 12:29:37 -0400
Subject: guix.scm: Simplify.

* guix.scm (skribilo-latest, guile-xapian): Delete variables.
(tissue): Inherit from upstream Guix package.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
---
 guix.scm | 121 +++++----------------------------------------------------------
 1 file changed, 8 insertions(+), 113 deletions(-)

diff --git a/guix.scm b/guix.scm
index 02abd7e..953eb3c 100644
--- a/guix.scm
+++ b/guix.scm
@@ -16,124 +16,19 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with tissue.  If not, see <https://www.gnu.org/licenses/>.
 
-(use-modules ((gnu packages autotools) #:select (autoconf automake))
-             ((gnu packages fonts) #:select (font-ibm-plex) #:prefix guix:)
-             ((gnu packages gettext) #:select (gnu-gettext))
-             ((gnu packages guile) #:select (guile-3.0 guile-git))
-             ((gnu packages guile-xyz) #:select (guile-filesystem))
-             ((gnu packages guile-xyz) #:select (guile-xapian) #:prefix guix:)
-             ((gnu packages skribilo) #:prefix guix:)
-             (guix build-system gnu)
+(use-modules ((gnu packages fonts) #:select (font-ibm-plex))
+             ((gnu packages web) #:select (tissue) #:prefix guix:)
              (guix gexp)
              (guix git-download)
-             ((guix licenses) #:prefix license:)
-             (guix packages)
-             (guix utils))
+             (guix packages))
 
 (define %source-dir (dirname (current-filename)))
 
-;; 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))))))
-
-(define font-ibm-plex
-  (package
-    (inherit guix:font-ibm-plex)
-    (arguments
-     (substitute-keyword-arguments (package-arguments guix:font-ibm-plex)
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            ;; Install the woff/woff2 web fonts instead of opentype
-            ;; and truetype fonts.
-            (replace 'install
-              (lambda* (#:key outputs #:allow-other-keys)
-                (let ((out (assoc-ref outputs "out")))
-                  (for-each (lambda (file)
-                              (install-file file (string-append out "/share/fonts/web")))
-                            (find-files (getcwd) "\\.(woff|woff2)$")))))))))))
-
-(define guile-xapian
-  (let ((commit "93162fd60dbc0cce726113a82c13d88783a279b6")
-        (revision "1"))
-    (package
-      (inherit guix:guile-xapian)
-      (name "guile-xapian")
-      (version (git-version (package-version guix: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")))))))
-
-(define tissue
-  (package
-    (name "tissue")
-    (version "0.1.0")
-    (source (local-file %source-dir
-                        #:recursive? #t
-                        #:select? (git-predicate %source-dir)))
-    (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))
-    (propagated-inputs
-     (list skribilo-latest))
-    (home-page "https://tissue.systemreboot.net")
-    (synopsis "Text based issue tracker")
-    (description "tissue is a text based issue tracker.")
-    (license license:gpl3+)))
-
 (package
-  (inherit tissue)
+  (inherit guix:tissue)
+  (source (local-file %source-dir
+                      #:recursive? #t
+                      #:select? (git-predicate %source-dir)))
   (native-inputs
-   (modify-inputs (package-native-inputs tissue)
+   (modify-inputs (package-native-inputs guix:tissue)
      (prepend font-ibm-plex))))
-- 
cgit v1.2.3