[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: ui: Avoid #:select'ing bindings introduced in the latest (guix bu
From: |
Ludovic Courtès |
Subject: |
05/10: ui: Avoid #:select'ing bindings introduced in the latest (guix build utils). |
Date: |
Sat, 9 Jun 2018 06:02:38 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 24cb66d18e37162721d636c277838718d3b23966
Author: Ludovic Courtès <address@hidden>
Date: Sat Jun 9 10:21:26 2018 +0200
ui: Avoid #:select'ing bindings introduced in the latest (guix build utils).
This should allow 'guix pull' to complete even when invoked from a Guix
that predates commit 5d669883ecc104403c5d3ba7d172e9c02234577c.
* guix/ui.scm: Use #:hide instead of #:select. This is a followup to
5d669883ecc104403c5d3ba7d172e9c02234577c.
---
guix/ui.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index 45f438f..99f66b0 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -42,11 +42,12 @@
#:use-module ((guix build syscalls)
#:select (free-disk-space terminal-columns))
#:use-module ((guix build utils)
- #:select (invoke-error? invoke-error-program
- invoke-error-arguments
- invoke-error-exit-status
- invoke-error-term-signal
- invoke-error-stop-signal))
+ ;; XXX: All we need are the bindings related to
+ ;; '&invoke-error'. However, to work around the bug described
+ ;; in 5d669883ecc104403c5d3ba7d172e9c02234577c, #:hide
+ ;; unwanted bindings instead of #:select'ing the needed
+ ;; bindings.
+ #:hide (package-name->name+version))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-19)
- branch master updated (d6fb098 -> 77a1aac), Ludovic Courtès, 2018/06/09
- 05/10: ui: Avoid #:select'ing bindings introduced in the latest (guix build utils).,
Ludovic Courtès <=
- 06/10: system: Honor ~/.config/guix/current in /etc/profile., Ludovic Courtès, 2018/06/09
- 07/10: profiles: Add '%current-profile', 'user-friendly-profile', & co., Ludovic Courtès, 2018/06/09
- 10/10: pull: Record the URL, branch, and commit as a manifest entry property., Ludovic Courtès, 2018/06/09
- 01/10: self: Produce a complete package with the 'guix' command., Ludovic Courtès, 2018/06/09
- 03/10: self: Compute and use locale data., Ludovic Courtès, 2018/06/09
- 08/10: packages: Add 'package-patched-vulnerabilities'., Ludovic Courtès, 2018/06/09
- 02/10: pull: Install the new Guix in a profile., Ludovic Courtès, 2018/06/09
- 04/10: self: Build the Info manual., Ludovic Courtès, 2018/06/09
- 09/10: profiles: Add 'properties' field to manifest entries., Ludovic Courtès, 2018/06/09