[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: Avoid name clash with 'build' from (guix store) and (guix status)
From: |
guix-commits |
Subject: |
06/06: Avoid name clash with 'build' from (guix store) and (guix status). |
Date: |
Mon, 11 Feb 2019 17:26:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 2637cfd7a4894ef2a2a7da3bb46d8815c43d7e75
Author: Ludovic Courtès <address@hidden>
Date: Mon Feb 11 23:05:36 2019 +0100
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.
---
build-aux/run-system-tests.scm | 2 +-
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 2 +-
guix/scripts/copy.scm | 2 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/pack.scm | 2 +-
guix/scripts/package.scm | 2 +-
guix/scripts/pull.scm | 2 +-
guix/scripts/system.scm | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm
index fd1f665..18f7393 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 950f0f4..d349b5d 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 fb7e049..6b29c47 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 be4ce43..ce70f2f 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 116b8dc..3143ea9 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 8fce99a..86e15d9 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 8a71467..1695250 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 3320200..e721cb8 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 569b826..4c8d8ac 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)
- branch master updated (8d11b6d -> 2637cfd), guix-commits, 2019/02/11
- 04/06: git: Add an exception printer for 'git-error'., guix-commits, 2019/02/11
- 05/06: pack, vm: Fix incorrect use of 'package-transitive-propagated-inputs'., guix-commits, 2019/02/11
- 01/06: HACKING: Update key server., guix-commits, 2019/02/11
- 03/06: ui: Always print the exception upon load errors., guix-commits, 2019/02/11
- 02/06: status: Erase the current line upon new builds or downloads., guix-commits, 2019/02/11
- 06/06: Avoid name clash with 'build' from (guix store) and (guix status).,
guix-commits <=