ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: Move '&fix-hint' to (guix diagnostics).

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2020-07-24 23:28:11 +02:00
parent 6a79eed920
commit f9a8dd053c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
8 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu.scm
View file

@ -20,7 +20,6 @@
(define-module (gnu) (define-module (gnu)
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module ((guix utils) #:select (&fix-hint))
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)

2
gnu/system/mapped-devices.scm
View file

@ -23,7 +23,7 @@ (define-module (gnu system mapped-devices)
#:use-module (guix records) #:use-module (guix records)
#:use-module ((guix modules) #:hide (file-name->module-name)) #:use-module ((guix modules) #:hide (file-name->module-name))
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module ((guix utils) #:use-module ((guix diagnostics)
#:select (source-properties->location #:select (source-properties->location
&fix-hint &fix-hint
&error-location)) &error-location))

4
guix/channels.scm
View file

@ -40,10 +40,6 @@ (define-module (guix channels)
#:use-module (guix sets) #:use-module (guix sets)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix i18n) #: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-1)
#:use-module (srfi srfi-2) #:use-module (srfi srfi-2)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)

8
guix/diagnostics.scm
View file

@ -43,6 +43,10 @@ (define-module (guix diagnostics)
error-location? error-location?
error-location error-location
&fix-hint
fix-hint?
condition-fix-hint
guix-warning-port guix-warning-port
program-name)) program-name))
@ -225,6 +229,10 @@ (define-condition-type &error-location &error
error-location? error-location?
(location error-location)) ;<location> (location error-location)) ;<location>
(define-condition-type &fix-hint &condition
fix-hint?
(hint condition-fix-hint)) ;string
(define guix-warning-port (define guix-warning-port
(make-parameter (current-warning-port))) (make-parameter (current-warning-port)))

1
guix/profiles.scm
View file

@ -32,6 +32,7 @@ (define-module (guix profiles)
#:use-module ((guix utils) #:hide (package-name->name+version)) #:use-module ((guix utils) #:hide (package-name->name+version))
#:use-module ((guix build utils) #:use-module ((guix build utils)
#:select (package-name->name+version mkdir-p)) #:select (package-name->name+version mkdir-p))
#:use-module ((guix diagnostics) #:select (&fix-hint))
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix packages) #:use-module (guix packages)

1
guix/scripts/system/reconfigure.scm
View file

@ -39,7 +39,6 @@ (define-module (guix scripts system reconfigure)
#:autoload (guix git) (update-cached-checkout) #:autoload (guix git) (update-cached-checkout)
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module ((guix utils) #:select (&fix-hint))
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)

2
guix/ssh.scm
View file

@ -20,7 +20,7 @@ (define-module (guix ssh)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix inferior) #:use-module (guix inferior)
#:use-module (guix i18n) #: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 (gcrypt pk-crypto)
#:use-module (ssh session) #:use-module (ssh session)
#:use-module (ssh auth) #:use-module (ssh auth)

15
guix/utils.scm
View file

@ -29,7 +29,6 @@ (define-module (guix utils)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (srfi srfi-35)
#:use-module (srfi srfi-39) #:use-module (srfi srfi-39)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (rnrs io ports) ;need 'port-position' etc. #:use-module (rnrs io ports) ;need 'port-position' etc.
@ -55,7 +54,11 @@ (define-module (guix utils)
&error-location &error-location
error-location? error-location?
error-location) error-location
&fix-hint
fix-hint?
condition-fix-hint)
#:export (strip-keyword-arguments #:export (strip-keyword-arguments
default-keyword-arguments default-keyword-arguments
substitute-keyword-arguments substitute-keyword-arguments
@ -63,10 +66,6 @@ (define-module (guix utils)
current-source-directory current-source-directory
&fix-hint
fix-hint?
condition-fix-hint
nix-system->gnu-triplet nix-system->gnu-triplet
gnu-triplet->nix-system gnu-triplet->nix-system
%current-system %current-system
@ -833,10 +832,6 @@ (define-syntax current-source-directory
;; raising an error would upset Geiser users ;; raising an error would upset Geiser users
#f)))))) #f))))))
(define-condition-type &fix-hint &condition
fix-hint?
(hint condition-fix-hint)) ;string
;;; Local Variables: ;;; Local Variables:
;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1) ;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1)
;;; End: ;;; End: