Avoid name clash with 'build' from (guix store) and (guix status).
Since commit 976ef2d978
, (guix status)
exports 'build', which clashes with 'build' from (guix store).
* build-aux/run-system-tests.scm: Select 'with-status-verbosity'
from (guix status).
* guix/scripts/archive.scm: Likewise.
* guix/scripts/build.scm: Likewise.
* guix/scripts/copy.scm: Likewise.
* guix/scripts/environment.scm: Likewise.
* guix/scripts/pack.scm: Likewise.
* guix/scripts/package.scm: Likewise.
* guix/scripts/pull.scm: Likewise.
* guix/scripts/system.scm: Likewise.
master
parent
910d0121a8
commit
2637cfd7a4
|
@ -19,7 +19,7 @@
|
|||
(define-module (run-system-tests)
|
||||
#:use-module (gnu tests)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix monads)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix ui)
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#:use-module ((guix build utils) #:select (mkdir-p))
|
||||
#:use-module ((guix serialization) #:select (restore-file))
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix grafts)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix derivations)
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#:autoload (guix download) (download-to-store)
|
||||
#:autoload (guix git-download) (git-reference?)
|
||||
#:autoload (guix git) (git-checkout?)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module ((guix progress) #:select (current-terminal-columns))
|
||||
#:use-module ((guix build syscalls) #:select (terminal-columns))
|
||||
#:export (%standard-build-options
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#:use-module (guix scripts)
|
||||
#:use-module (guix ssh)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix scripts build)
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
(define-module (guix scripts environment)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix grafts)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix packages)
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix grafts)
|
||||
#:use-module (guix monads)
|
||||
#:use-module (guix modules)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
(define-module (guix scripts package)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix grafts)
|
||||
#:use-module (guix derivations)
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
(define-module (guix scripts pull)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix scripts)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix config)
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
(define-module (guix scripts system)
|
||||
#:use-module (guix config)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix status)
|
||||
#:use-module ((guix status) #:select (with-status-verbosity))
|
||||
#:use-module (guix store)
|
||||
#:autoload (guix store database) (register-path)
|
||||
#:use-module (guix grafts)
|
||||
|
|
Reference in New Issue