From 5428e524457baa9484b6437f134f03a972c7d4d3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 20 Jan 2023 23:40:31 +0000 Subject: tissue: Use latest guile-xapian commit. * guix/forge/tissue.scm (guile-xapian-latest): New variable. (tissue)[inputs]: Replace guile-xapian-latest with guile-xapian. --- guix/forge/tissue.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/guix/forge/tissue.scm b/guix/forge/tissue.scm index e34e656..b9ca72e 100644 --- a/guix/forge/tissue.scm +++ b/guix/forge/tissue.scm @@ -1,5 +1,5 @@ ;;; guix-forge --- Guix software forge meta-service -;;; Copyright © 2022 Arun Isaac +;;; Copyright © 2022, 2023 Arun Isaac ;;; ;;; This file is part of guix-forge. ;;; @@ -78,6 +78,24 @@ (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 its first ;; release. (define-public tissue @@ -121,7 +139,7 @@ `("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)) + (inputs (list guile-3.0 guile-filesystem guile-git guile-xapian-latest)) (propagated-inputs (list skribilo-latest)) (home-page "https://tissue.systemreboot.net") -- cgit v1.2.3