From e72a05da251cb485c891142e6e6710bc98a8dd08 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 27 Jan 2023 02:05:25 +0000 Subject: tissue: Update to 0.1.0. * guix/forge/tissue.scm: Import lzip from (gnu packages compression). Import (guix download). (tissue): Update to 0.1.0. [source]: Use url-fetch. [native-inputs]: Add lzip. --- guix/forge/tissue.scm | 100 +++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'guix/forge') diff --git a/guix/forge/tissue.scm b/guix/forge/tissue.scm index b9ca72e..ea7c594 100644 --- a/guix/forge/tissue.scm +++ b/guix/forge/tissue.scm @@ -23,6 +23,7 @@ #: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)) @@ -32,6 +33,7 @@ #: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) @@ -96,62 +98,60 @@ (base32 "0g9w10wsjw11ayi9l5y0k6lz4mq2qfhq2hwbxbqgdj7jmllwirgp"))))))) -;; TODO: Contribute tissue package upstream to Guix after its first -;; release. +;; TODO: Contribute tissue package upstream to Guix after release of +;; its guile-xapian and skribilo dependencies. (define-public tissue - (let ((commit "6d6285d071132960835f848a1703faaea2356937") - (revision "1")) - (package - (name "tissue") - (version (git-version "0.1.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.systemreboot.net/tissue") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dlcy7m4gz1vmklyny4mxky9822q5hjc4qdmn42yf2qvh8xy62g5")))) - (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)) - (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 + (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+)))) + (license license:gpl3+))) (define-record-type* tissue-configuration make-tissue-configuration -- cgit v1.2.3