aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-07-24 23:28:11 +0200
committerLudovic Courtès <ludo@gnu.org>2020-07-25 19:11:36 +0200
commitf9a8dd053c4e0fd1fc4b64291bb90de36520b3bc (patch)
tree8543692db00f8e9380274056b047e9662267eb20
parent6a79eed920fd4914b162461553a8d7e8f5eee324 (diff)
downloadguix-f9a8dd053c4e0fd1fc4b64291bb90de36520b3bc.tar
guix-f9a8dd053c4e0fd1fc4b64291bb90de36520b3bc.tar.gz
utils: Move '&fix-hint' to (guix diagnostics).
* guix/utils.scm (&fix-hint): Move to... * guix/diagnostics.scm (&fix-hint): ... here. * gnu.scm: Adjust imports accordingly. * gnu/system/mapped-devices.scm: Likewise. * guix/channels.scm: Likewise. * guix/profiles.scm: Likewise. * guix/scripts/system/reconfigure.scm: Likewise. * guix/ssh.scm: Likewise.
-rw-r--r--gnu.scm1
-rw-r--r--gnu/system/mapped-devices.scm2
-rw-r--r--guix/channels.scm4
-rw-r--r--guix/diagnostics.scm8
-rw-r--r--guix/profiles.scm1
-rw-r--r--guix/scripts/system/reconfigure.scm1
-rw-r--r--guix/ssh.scm2
-rw-r--r--guix/utils.scm15
8 files changed, 16 insertions, 18 deletions
diff --git a/gnu.scm b/gnu.scm
index 5f593bd569..b95082f42e 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -20,7 +20,6 @@
(define-module (gnu)
#:use-module (guix i18n)
- #:use-module ((guix utils) #:select (&fix-hint))
#:use-module (guix diagnostics)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index c3f98302ad..00f235e6b6 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -23,7 +23,7 @@
#:use-module (guix records)
#:use-module ((guix modules) #:hide (file-name->module-name))
#:use-module (guix i18n)
- #:use-module ((guix utils)
+ #:use-module ((guix diagnostics)
#:select (source-properties->location
&fix-hint
&error-location))
diff --git a/guix/channels.scm b/guix/channels.scm
index bbabf654a9..21a2fdb631 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -40,10 +40,6 @@
#:use-module (guix sets)
#:use-module (guix store)
#:use-module (guix i18n)
- #:use-module ((guix utils)
- #:select (source-properties->location
- &error-location
- &fix-hint))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-2)
#:use-module (srfi srfi-9)
diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm
index 8b24b1b994..3096d384d8 100644
--- a/guix/diagnostics.scm
+++ b/guix/diagnostics.scm
@@ -43,6 +43,10 @@
error-location?
error-location
+ &fix-hint
+ fix-hint?
+ condition-fix-hint
+
guix-warning-port
program-name))
@@ -225,6 +229,10 @@ a location object."
error-location?
(location error-location)) ;<location>
+(define-condition-type &fix-hint &condition
+ fix-hint?
+ (hint condition-fix-hint)) ;string
+
(define guix-warning-port
(make-parameter (current-warning-port)))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index f34f73e17e..0619e735fb 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -32,6 +32,7 @@
#:use-module ((guix utils) #:hide (package-name->name+version))
#:use-module ((guix build utils)
#:select (package-name->name+version mkdir-p))
+ #:use-module ((guix diagnostics) #:select (&fix-hint))
#:use-module (guix i18n)
#:use-module (guix records)
#:use-module (guix packages)
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index 9013e035f7..a2570839a8 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -39,7 +39,6 @@
#:autoload (guix git) (update-cached-checkout)
#:use-module (guix i18n)
#:use-module (guix diagnostics)
- #:use-module ((guix utils) #:select (&fix-hint))
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
diff --git a/guix/ssh.scm b/guix/ssh.scm
index b9e6ff8564..418443992b 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -20,7 +20,7 @@
#:use-module (guix store)
#:use-module (guix inferior)
#:use-module (guix i18n)
- #:use-module ((guix utils) #:select (&fix-hint))
+ #:use-module ((guix diagnostics) #:select (&fix-hint))
#:use-module (gcrypt pk-crypto)
#:use-module (ssh session)
#:use-module (ssh auth)
diff --git a/guix/utils.scm b/guix/utils.scm
index 8198204ade..436c5cd093 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -29,7 +29,6 @@
#:use-module (srfi srfi-9)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
- #:use-module (srfi srfi-35)
#:use-module (srfi srfi-39)
#:use-module (ice-9 ftw)
#:use-module (rnrs io ports) ;need 'port-position' etc.
@@ -55,7 +54,11 @@
&error-location
error-location?
- error-location)
+ error-location
+
+ &fix-hint
+ fix-hint?
+ condition-fix-hint)
#:export (strip-keyword-arguments
default-keyword-arguments
substitute-keyword-arguments
@@ -63,10 +66,6 @@
current-source-directory
- &fix-hint
- fix-hint?
- condition-fix-hint
-
nix-system->gnu-triplet
gnu-triplet->nix-system
%current-system
@@ -833,10 +832,6 @@ be determined."
;; raising an error would upset Geiser users
#f))))))
-(define-condition-type &fix-hint &condition
- fix-hint?
- (hint condition-fix-hint)) ;string
-
;;; Local Variables:
;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1)
;;; End: