diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-01-06 22:02:40 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-09 14:47:53 +0100 |
commit | a65177a657b0cb36d45f2e8db574ea9c10f89a1f (patch) | |
tree | 1e2ccdbccc0d6fd39461ce31a8677be7ce86675d /guix/ui.scm | |
parent | 0991fd53367907908fbd901a9fbe79540e4e4527 (diff) | |
download | gnu-guix-a65177a657b0cb36d45f2e8db574ea9c10f89a1f.tar gnu-guix-a65177a657b0cb36d45f2e8db574ea9c10f89a1f.tar.gz |
maint: Remove 'cond-expand' forms for Guile 2.0.
Note: Leave 'cond-expand' forms used in the build-side modules that can
run on %BOOTSTRAP-GUILE, which is currently Guile 2.0.
* guix/build/compile.scm: Move 'use-modules' clause from 'cond-expand'
to 'define-module' form.
(%default-optimizations): Remove 'cond-expand'.
* guix/build/download.scm (tls-wrap): Remove 'cond-expand'.
* guix/build/syscalls.scm: Remove 'cond-expand' form around
'%set-automatic-finalization-enabled?!' and
'without-automatic-finalization'.
* guix/inferior.scm (port->inferior): Remove 'cond-expand'.
* guix/scripts/pack.scm (wrapped-package)[build]: Remove 'cond-expand'.
* guix/status.scm (build-event-output-port): Remove 'cond-expand'.
* guix/store.scm (open-inet-socket): Remove 'cond-expand'.
* guix/ui.scm (install-locale): Remove 'cond-expand'.
* tests/status.scm ("current-build-output-port, UTF-8 + garbage"):
Remove 'cond-expand'.
* tests/store.scm ("current-build-output-port, UTF-8 + garbage"):
Remove 'cond-expand'.
Diffstat (limited to 'guix/ui.scm')
-rw-r--r-- | guix/ui.scm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 4c31246920..f542cd3e3f 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -427,11 +427,6 @@ report them in a user-friendly way." (lambda _ (setlocale LC_ALL "")) (lambda args - (cond-expand - ;; Guile 2.2 already emits a warning, so let's not add a second one. - (guile-2.2 #t) - (else (warning (G_ "failed to install locale: ~a~%") - (strerror (system-error-errno args))))) (display-hint (G_ "Consider installing the @code{glibc-utf8-locales} or @code{glibc-locales} package and defining @code{GUIX_LOCPATH}, along these lines: |