diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
| commit | 023522d3a1e81fe9bc803183337fdc8c183a88c4 (patch) | |
| tree | ec374744812891a627f33fa457b0bcf083e2c142 /guix | |
| parent | 07abc851ce8a580253061e065b31a4037d2f965d (diff) | |
| parent | 7373eb8304e0ebbfabe66deb59e78187013403dd (diff) | |
| download | guix-patches-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar guix-patches-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/packages.scm | 4 | ||||
| -rw-r--r-- | guix/scripts/system/reconfigure.scm | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index f2c94c7bc2..c98fb98aec 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -241,9 +241,9 @@ name of its URI." (define %hydra-supported-systems ;; This is the list of system types for which build machines are available. ;; - ;; XXX: MIPS is temporarily unavailable on Hydra: + ;; XXX: MIPS is unavailable in CI: ;; <https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00790.html>. - (fold delete %supported-systems '("aarch64-linux" "mips64el-linux"))) + (fold delete %supported-systems '("mips64el-linux"))) ;; A package. diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 579b7fffbe..2f9dbb2508 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -136,7 +136,10 @@ canonical names (symbols)." (srfi srfi-1)) ;; Load the service files for any new services. - (load-services/safe '#$service-files) + ;; Silence messages coming from shepherd such as "Evaluating + ;; expression ..." since they are unhelpful. + (parameterize ((shepherd-message-port (%make-void-port "w"))) + (load-services/safe '#$service-files)) ;; Unload obsolete services and start new services. (for-each unload-service '#$to-unload) |