1 files changed, 52 insertions, 10 deletions

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index cac921a5ef..743537d0ad 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -145,7 +145,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
-  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
+  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE $GUIX_EXTENSIONS_PATH))
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
@@ -182,8 +182,8 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "1.4.0")
-        (commit "096dedd0bb13523002c814b001429c2f65b6f10d")
-        (revision 37))
+        (commit "95d88456844fc460fd1708c0fa1e04ab473af0ba")
+        (revision 39))
     (package
       (name "guix")
 
@@ -199,7 +199,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "1gm88mgcgpfaibzwy426szb7fvlz6zh17csjbqlz8lcjdz0a1wjx"))
+                  "0ghbnlq1g0r9srn6a6cxn28rxyd9icfgkrwzwd550ly0fanhy5xz"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
@@ -807,6 +807,48 @@ with the @command{module} command commonly found on @acronym{HPC,
 high-performance computing} clusters.")
     (license license:gpl3+)))
 
+(define-public guix-xsearch
+  (package
+    (name "guix-xsearch")
+    (version "2.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/Baleine/guix-xsearch.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1rx1984841jv6y4wkhlfgdjylfffl6zl07scl1l7wgm5kmaqc6br"))))
+    (build-system guile-build-system)
+    (arguments
+     (list
+      #:source-directory "src"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'build 'add-extension-to-search-path
+            (lambda _
+              (with-directory-excursion #$output
+                (mkdir-p "share/guix/extensions")
+                (symlink (string-append #$output
+                          "/share/guile/site/3.0/guix/extensions/xsearch.scm")
+                         "share/guix/extensions/xsearch.scm")))))))
+    ;; Avoid setting guix as propagated so that we use the user’s profile.
+    (native-inputs (list guile-3.0
+                         guile-xapian
+                         guix))
+    (propagated-inputs (list guile-xapian))
+    ;; This is very important since we want the extension to be available
+    ;; without having to add a vanilla guix to the current profile.
+    (native-search-paths
+     (list $GUIX_EXTENSIONS_PATH))
+    (home-page "https://codeberg.org/Baleine/guix-xsearch")
+    (synopsis "Extension for Guix to provide faster search using Xapian")
+    (description
+     "The Guix Xsearch extension is a new implementation of Guix search sped up
+by using a Xapian cache.")
+    (license (list license:gpl3+ license:cc0))))
+
 
 ;;;
 ;;; Other tools.
@@ -1003,8 +1045,8 @@ transactions from C or Python.")
     (license license:gpl2+)))
 
 (define-public bffe
-  (let ((commit "f9a5b5524d053ee07fd80943d8ef0e81878c3a17")
-        (revision "14"))
+  (let ((commit "2f9b1cb355e9a276903a721b48c77790841a91d6")
+        (revision "15"))
     (package
       (name "bffe")
       (version (git-version "0" revision commit))
@@ -1015,7 +1057,7 @@ transactions from C or Python.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "150596lyfl03v597i5k70jwgyvqfxyaaf7z05xb96l2rjc2lfavs"))
+                  "0h1nzlj6k9yhhsc1an72876p19yf8kszs2h7xww5ldcjs8vwxn9c"))
                 (file-name (string-append name "-" version "-checkout"))))
       (build-system gnu-build-system)
       (native-inputs
@@ -1604,8 +1646,8 @@ environments.")
                   "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
 
 (define-public guix-build-coordinator
-  (let ((commit "7e347870d56eec532662909eceb3bc79ae7fff1d")
-        (revision "130"))
+  (let ((commit "89e6de99c4ff29c1ac36077ca2f263b47539f8cf")
+        (revision "131"))
     (package
       (name "guix-build-coordinator")
       (version (git-version "0" revision commit))
@@ -1616,7 +1658,7 @@ environments.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "05drlw3sxq83fxphq569wf0kzn3fhzw11zrc8njxxr88ksvfi04y"))
+                  "1ffa3bhg4nzif4gk26gydnw4jvm1gfidh3b6r1i36kydy3ms19fw"))
                 (file-name (string-append name "-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments