diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
| commit | 0747328e317de4bf936fab50e795d1e1523adfc1 (patch) | |
| tree | 291d4f07a801b147d64faec31e4394c5cd46ce35 /guix/channels.scm | |
| parent | df09e1d6e71f68a8fb44bcc9f13e625f9f9701a5 (diff) | |
| parent | ff75441fcf0ba1212b0342f933a8999bafe60f03 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/channels.scm')
| -rw-r--r-- | guix/channels.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index 10345c1ce5..96d62ce062 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -27,6 +27,7 @@ #:use-module (guix profiles) #:use-module (guix derivations) #:use-module (guix combinators) + #:use-module (guix deprecation) #:use-module (guix store) #:use-module (guix i18n) #:use-module ((guix utils) @@ -275,7 +276,12 @@ package modules under SOURCE using CORE, an instance of Guix." (if (file-exists? script) (let ((build (save-module-excursion (lambda () - (primitive-load script))))) + ;; 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 + (%make-void-port "w"))) + (primitive-load script)))))) ;; BUILD must be a monadic procedure of at least one argument: the ;; source tree. ;; @@ -472,7 +478,8 @@ be used as a profile hook." (gexp->derivation-in-inferior "guix-package-cache" build profile #:properties '((type . profile-hook) - (hook . package-cache))))) + (hook . package-cache)) + #:local-build? #t))) (define %channel-profile-hooks ;; The default channel profile hooks. |