[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: ui: 'load*' accepts /dev/fd/N files pointing to a pipe.
From: |
guix-commits |
Subject: |
01/07: ui: 'load*' accepts /dev/fd/N files pointing to a pipe. |
Date: |
Thu, 17 Aug 2023 13:07:13 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 3363ff1867bb02c4aa4955db917ef1d67f2c47e6
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Fri Aug 11 17:20:06 2023 +0200
ui: 'load*' accepts /dev/fd/N files pointing to a pipe.
This allows users to write Bash commands like:
guix time-machine -C <(echo %default-channels) -- ...
or:
guix build -m <(echo '(specifications->manifest (list "guile"))')
Previously, on GNU/Linux, they would fail with:
error: failed to load '/dev/fd/63': No such file or directory
* guix/ui.scm (try-canonicalize-path): New procedure.
(load*): Use it.
* tests/guix-build.sh: Test 'guix build -m' with a /dev/fd/N file.
---
guix/ui.scm | 16 +++++++++++++++-
tests/guix-build.sh | 9 ++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index 47a118364a..6f2d4fe245 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -200,6 +200,20 @@ information, or #f if it could not be found."
(parameterize (((@ (system base compile) default-optimization-level) 1))
exp))
+(define (try-canonicalize-path file)
+ "Like 'canonicalize-path', but return FILE as-is if 'canonicalize-path'
+throws.
+
+This is necessary for corner cases where 'canonicalize-path' fails. One
+example is on Linux when a /dev/fd/N file denotes a pipe, represented as a
+symlink to a non-existent file like 'pipe:[1234]', as in this example:
+
+ sh -c 'stat $(readlink -f /dev/fd/1)' | cat"
+ (catch 'system-error
+ (lambda ()
+ (canonicalize-path file))
+ (const file)))
+
(define* (load* file user-module
#:key (on-error 'nothing-special))
"Load the user provided Scheme source code FILE."
@@ -230,7 +244,7 @@ information, or #f if it could not be found."
;; 'primitive-load', so that FILE is compiled, which then allows
;; us to provide better error reporting with source line
numbers.
(without-compiler-optimizations
- (load (canonicalize-path file))))
+ (load (try-canonicalize-path file))))
(const #f))))))
(lambda _
;; XXX: Errors are reported from the pre-unwind handler below, but
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 317c58ac42..4eab0e38b6 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2014, 2016-2022 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2014, 2016-2023 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
@@ -397,6 +397,13 @@ guix build -d -m "$module_dir/manifest.scm" \
rm "$module_dir"/*.scm
+if [ -n "$BASH_VERSION" ]
+then
+ # Check whether we can load from a /dev/fd/N denoting a pipe, using this
+ # handy Bash-specific construct.
+ guix build -m <(echo '(specifications->manifest (list "guile"))') -n
+fi
+
# Using 'GUIX_BUILD_OPTIONS'.
GUIX_BUILD_OPTIONS="--dry-run --no-grafts"
export GUIX_BUILD_OPTIONS
- branch master updated (9896b37ac5 -> adc4ab9389), guix-commits, 2023/08/17
- 01/07: ui: 'load*' accepts /dev/fd/N files pointing to a pipe.,
guix-commits <=
- 06/07: gnu: perf: Remove extra libtraceevent input., guix-commits, 2023/08/17
- 04/07: gnu: bloomberg-bde-tools: Update to 3.118.0.0., guix-commits, 2023/08/17
- 03/07: gnu: libflame: Update to 70c19e7., guix-commits, 2023/08/17
- 07/07: gnu: Add xtrlock., guix-commits, 2023/08/17
- 02/07: pull, time-machine: Add '-q' to ignore channel files., guix-commits, 2023/08/17
- 05/07: gnu: bloomberg-bde: Update to 3.118.0.1., guix-commits, 2023/08/17