diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 21:56:34 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 22:30:04 +0300 |
| commit | de3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch) | |
| tree | 4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /gnu.scm | |
| parent | ab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff) | |
| parent | b8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff) | |
| download | guix-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu.scm')
| -rw-r--r-- | gnu.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu.scm b/gnu.scm index 2c29b6dc3f..f139531ef3 100644 --- a/gnu.scm +++ b/gnu.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; @@ -20,7 +20,7 @@ (define-module (gnu) #:use-module (guix i18n) - #:use-module (guix utils) + #:use-module (guix diagnostics) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (ice-9 match) @@ -78,10 +78,8 @@ (raise (apply make-compound-condition - (condition - (&message - (message (format #f (G_ "module ~a not found") - module)))) + (formatted-message (G_ "module ~a not found") + module) (condition (&error-location (location location))) (or (and=> (make-hint module) list) |