summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-02-11 23:05:36 +0100
committerLudovic Courtès <ludo@gnu.org>2019-02-11 23:23:28 +0100
commit2637cfd7a4894ef2a2a7da3bb46d8815c43d7e75 (patch)
tree8d8a29cb8581e9b3d3d4b560e3776a2adda23689
parent910d0121a8b6515febf0a02e4d23c249f98c0da2 (diff)
Avoid name clash with 'build' from (guix store) and (guix status).
Since commit 976ef2d97887d16eab8d4eb9dad811786b04d690, (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.
-rw-r--r--build-aux/run-system-tests.scm2
-rw-r--r--guix/scripts/archive.scm2
-rw-r--r--guix/scripts/build.scm2
-rw-r--r--guix/scripts/copy.scm2
-rw-r--r--guix/scripts/environment.scm2
-rw-r--r--guix/scripts/pack.scm2
-rw-r--r--guix/scripts/package.scm2
-rw-r--r--guix/scripts/pull.scm2
-rw-r--r--guix/scripts/system.scm2
9 files changed, 9 insertions, 9 deletions
diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm
index fd1f6653a..18f7393d8 100644
--- a/build-aux/run-system-tests.scm
+++ b/build-aux/run-system-tests.scm
@@ -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)
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 950f0f41d..d349b5d59 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -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)
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index fb7e04904..6b29c470f 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -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
diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm
index be4ce4364..ce70f2f0b 100644
--- a/guix/scripts/copy.scm
+++ b/guix/scripts/copy.scm
@@ -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)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 116b8dcbc..3143ea928 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -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)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 8fce99ad1..86e15d9ba 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -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)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 8a71467b5..1695250c7 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -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)
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 3320200c0..e721cb859 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -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)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 569b826ac..4c8d8acc8 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -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)