diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-07-24 22:58:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-07-25 19:11:36 +0200 |
| commit | a5e2fc73760a2ae023f2e56bdbf8025971f90e64 (patch) | |
| tree | 2933826e391a889723e1db12699c74a845b7c4c5 /gnu | |
| parent | 07dbdbd766760ce0121c1ac96fee766135fe7320 (diff) | |
| download | guix-a5e2fc73760a2ae023f2e56bdbf8025971f90e64.tar.gz | |
utils: Move <location> and '&error-location' to (guix diagnostics).
* guix/utils.scm (<location>, source-properties->location) (location->source-properties, &error-location): Move to... * guix/diagnostics.scm: ... here. * gnu.scm: Adjust imports accordingly. * gnu/machine.scm: Likewise. * gnu/system.scm: Likewise. * gnu/tests.scm: Likewise. * guix/inferior.scm: Likewise. * tests/channels.scm: Likewise. * tests/packages.scm: Likewise.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/machine.scm | 2 | ||||
| -rw-r--r-- | gnu/system.scm | 5 | ||||
| -rw-r--r-- | gnu/tests.scm | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/gnu/machine.scm b/gnu/machine.scm index 434d78ab41..667a988f99 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -23,7 +23,7 @@ #:use-module (guix monads) #:use-module (guix records) #:use-module (guix store) - #:use-module ((guix utils) #:select (source-properties->location)) + #:use-module ((guix diagnostics) #:select (source-properties->location)) #:use-module (srfi srfi-35) #:export (environment-type environment-type? diff --git a/gnu/system.scm b/gnu/system.scm index de5f25a35d..6ae15ab23b 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -35,8 +35,9 @@ #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix profiles) - #:use-module (guix ui) - #:use-module (guix utils) + #:use-module ((guix utils) #:select (substitute-keyword-arguments)) + #:use-module (guix i18n) + #:use-module (guix diagnostics) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages cross-base) diff --git a/gnu/tests.scm b/gnu/tests.scm index 705bf561a6..83528a40f0 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -20,7 +20,7 @@ (define-module (gnu tests) #:use-module (guix gexp) - #:use-module (guix utils) + #:use-module (guix diagnostics) #:use-module (guix records) #:use-module ((guix ui) #:select (warn-about-load-error)) #:use-module (gnu bootloader) |