2 files changed, 33 insertions, 10 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 05eac9bda96..6bf2ca4f1ad 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -123,7 +123,7 @@ Copyright @copyright{} 2023 Foundation Devices, Inc.@*
 Copyright @copyright{} 2023 Thomas Ieong@*
 Copyright @copyright{} 2023 Saku Laesvuori@*
 Copyright @copyright{} 2023 Graham James Addis@*
-Copyright @copyright{} 2023-2025 Tomas Volf@*
+Copyright @copyright{} 2023-2026 Tomas Volf@*
 Copyright @copyright{} 2024-2026 Herman Rimm@*
 Copyright @copyright{} 2024 Matthew Trzcinski@*
 Copyright @copyright{} 2024 Richard Sent@*
@@ -13735,9 +13735,12 @@ $7 = "/gnu/store/@dots{}-x"
 The full list of REPL commands can be seen by typing @code{,help guix}
 and is given below for reference.
 
-@deffn {REPL command} build @var{object}
+@deffn {REPL command} build @var{object} [@var{build-mode}]
 Lower @var{object} and build it if it's not already built, returning its
 output file name(s).
+
+@var{build-mode} defaults to @code{normal}.  Other valid build modes are
+@code{check} and @code{repair}.
 @end deffn
 
 @deffn {REPL command} build-options @var{options}
diff --git a/guix/monad-repl.scm b/guix/monad-repl.scm
index dcb00988fe8..7c27765954a 100644
--- a/guix/monad-repl.scm
+++ b/guix/monad-repl.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014-2016, 2022-2023 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
+;;; Copyright © 2025-2026 Tomas Volf <~@wolfsden.cz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -86,7 +86,10 @@
   ;; Additional build options.
   '())
 
-(define* (evaluate/print-with-store mvalue #:key build?)
+(define* (evaluate/print-with-store mvalue
+                                    #:key
+                                    build?
+                                    (build-mode (build-mode normal)))
   "Run monadic value MVALUE in the store monad and print its value."
   (with-store store
     (apply set-build-options store
@@ -102,7 +105,7 @@
                            (mlet %store-monad ((obj mvalue))
                              (if (derivation? obj)
                                  (mbegin %store-monad
-                                   (built-derivations (list obj))
+                                   (built-derivations (list obj) build-mode)
                                    (return
                                     (match (derivation->output-paths obj)
                                       (((_ . files) ...) files))))
@@ -132,11 +135,28 @@ Change build verbosity to LEVEL.
 Lower OBJECT into a derivation or store file and return it."
   (evaluate/print-with-store (lower-object (repl-eval repl form))))
 
-(define-meta-command ((build guix) repl (form))
-  "build OBJECT
-Lower OBJECT and build it, returning its output file name(s)."
-  (evaluate/print-with-store (lower-object (repl-eval repl form))
-                             #:build? #t))
+(define-meta-command ((build guix) repl (form) . args)
+  "build OBJECT [BUILD-MODE]
+Lower OBJECT and build it, returning its output file name(s).
+
+Build mode defaults to 'normal.  If expression is provided, it must evaluate
+to one of the following symbols: normal, check, repair."
+  (let ((build-mode (match args
+                      ((mode)
+                       (match mode
+                         ((or 'normal ''normal) (build-mode normal))
+                         ((or 'check ''check)   (build-mode check))
+                         ((or 'repair ''repair) (build-mode repair))
+                         ((or 'normal ''normal) (build-mode normal))
+                         (_
+                          (format #t ";; ERROR: Invalid build mode.~%")
+                          #f)))
+                      (()
+                       (build-mode normal)))))
+    (when build-mode
+      (evaluate/print-with-store (lower-object (repl-eval repl form))
+                                 #:build? #t
+                                 #:build-mode build-mode))))
 
 (define-meta-command ((build-options guix) repl (opts))
   "build-options OPTIONS