nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-02-11 23:05:36 +01:00
parent 910d0121a8
commit 2637cfd7a4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/run-system-tests.scm
View File

@ -19,7 +19,7 @@
(define-module (run-system-tests) (define-module (run-system-tests)
#:use-module (gnu tests) #:use-module (gnu tests)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix ui) #:use-module (guix ui)

2
guix/scripts/archive.scm
View File

@ -23,7 +23,7 @@
#:use-module ((guix build utils) #:select (mkdir-p)) #:use-module ((guix build utils) #:select (mkdir-p))
#:use-module ((guix serialization) #:select (restore-file)) #:use-module ((guix serialization) #:select (restore-file))
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix grafts) #:use-module (guix grafts)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix derivations) #:use-module (guix derivations)

2
guix/scripts/build.scm
View File

@ -47,7 +47,7 @@
#:autoload (guix download) (download-to-store) #:autoload (guix download) (download-to-store)
#:autoload (guix git-download) (git-reference?) #:autoload (guix git-download) (git-reference?)
#:autoload (guix git) (git-checkout?) #: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 progress) #:select (current-terminal-columns))
#:use-module ((guix build syscalls) #:select (terminal-columns)) #:use-module ((guix build syscalls) #:select (terminal-columns))
#:export (%standard-build-options #:export (%standard-build-options

2
guix/scripts/copy.scm
View File

@ -21,7 +21,7 @@
#:use-module (guix scripts) #:use-module (guix scripts)
#:use-module (guix ssh) #:use-module (guix ssh)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix scripts build) #:use-module (guix scripts build)

2
guix/scripts/environment.scm
View File

@ -21,7 +21,7 @@
(define-module (guix scripts environment) (define-module (guix scripts environment)
#:use-module (guix ui) #:use-module (guix ui)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix grafts) #:use-module (guix grafts)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix packages) #:use-module (guix packages)

2
guix/scripts/pack.scm
View File

@ -26,7 +26,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix grafts) #:use-module (guix grafts)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix modules) #:use-module (guix modules)

2
guix/scripts/package.scm
View File

@ -24,7 +24,7 @@
(define-module (guix scripts package) (define-module (guix scripts package)
#:use-module (guix ui) #:use-module (guix ui)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix grafts) #:use-module (guix grafts)
#:use-module (guix derivations) #:use-module (guix derivations)

2
guix/scripts/pull.scm
View File

@ -20,7 +20,7 @@
(define-module (guix scripts pull) (define-module (guix scripts pull)
#:use-module (guix ui) #:use-module (guix ui)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix scripts) #:use-module (guix scripts)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix config) #:use-module (guix config)

2
guix/scripts/system.scm
View File

@ -23,7 +23,7 @@
(define-module (guix scripts system) (define-module (guix scripts system)
#:use-module (guix config) #:use-module (guix config)
#:use-module (guix ui) #:use-module (guix ui)
#:use-module (guix status) #:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix store) #:use-module (guix store)
#:autoload (guix store database) (register-path) #:autoload (guix store database) (register-path)
#:use-module (guix grafts) #:use-module (guix grafts)