diff options
| author | Marius Bakke | 2019-06-05 19:46:16 +0200 |
|---|---|---|
| committer | Marius Bakke | 2019-06-05 19:46:16 +0200 |
| commit | d4721ff1017b64e5242b09fd7b430665ec580524 (patch) | |
| tree | 1bd9ce1a339f5b348e780e4bb7f53a4333bfce01 /guix/channels.scm | |
| parent | 30e12b9664d774aca3948b1fa2e0aee6af09ca40 (diff) | |
| parent | c0f6eebb6d9f6ca9b62344f32ce5f82dab601d53 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/channels.scm')
| -rw-r--r-- | guix/channels.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index e93879e1b..e7278c606 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -27,7 +27,7 @@ #:use-module (guix profiles) #:use-module (guix derivations) #:use-module (guix combinators) - #:use-module (guix deprecation) + #:use-module (guix diagnostics) #:use-module (guix store) #:use-module (guix i18n) #:use-module ((guix utils) @@ -280,7 +280,7 @@ package modules under SOURCE using CORE, an instance of Guix." ;; Disable deprecation warnings; it's OK for SCRIPT to ;; use deprecated APIs and the user doesn't have to know ;; about it. - (parameterize ((deprecation-warning-port + (parameterize ((guix-warning-port (%make-void-port "w"))) (primitive-load script)))))) ;; BUILD must be a monadic procedure of at least one argument: the |