diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-05-09 14:44:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-09 14:44:48 +0200 |
| commit | da3be3ff4f6d8b643ed9bdf6834df366b1bcea44 (patch) | |
| tree | 913ff6010447b6a31dfbe4be6eccc06b11fd83cf /gnu/system/file-systems.scm | |
| parent | f5fe0082abe4547f3fb9f29d8351473cfb3a387b (diff) | |
| parent | 4980630d1e3e6f9a6dc05438c7593a727207d9a0 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/file-systems.scm')
| -rw-r--r-- | gnu/system/file-systems.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 437f8da898..f8f4276283 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Google LLC ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -272,7 +272,8 @@ flags are found." ;; Note: If we have (guix store database) in the search path and we do *not* ;; have (guix store) proper, 'resolve-module' returns an empty (guix store) ;; with one sub-module. - (cond ((and=> (resolve-module '(guix store) #:ensure #f) + (cond ((and=> (parameterize ((current-warning-port (%make-void-port "w0"))) + (resolve-module '(guix store) #:ensure #f)) (lambda (store) (module-variable store '%store-prefix))) => |