--- Begin Message ---
Subject: |
[PATCH] activation: make install-special-file match against pairs as well. |
Date: |
Mon, 12 Dec 2022 17:45:47 +0000 |
From: Bruno Victal <mirai@makinata.eu>
special-files is a list of 2-tuples (pairs) but matching against
a non-list pair would fail as match-lambda was only matching
against a list pattern.
---
gnu/build/activation.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 10c9045740..d4a7559651 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -341,7 +341,7 @@ (define (activate-special-files special-files)
"
(define install-special-file
(match-lambda
- ((target file)
+ ((or (target file) (? pair? (= car target) (= cdr file)))
(let ((pivot (string-append target ".new")))
(mkdir-p (dirname target))
(symlink file pivot)
base-commit: 5fb5af5658b7575a945579a7cf51c193600b76bb
--
2.38.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#60014: [PATCH v2] doc: Clarify special-files-service-type expected value. |
Date: |
Tue, 21 Mar 2023 10:15:15 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hello,
mirai@makinata.eu writes:
> From: Bruno Victal <mirai@makinata.eu>
>
> * doc/guix.texi (Services, Base Services): Clarify special-files-service-type
> expected value.
> ---
> doc/guix.texi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index fd03da8c97..a9b6e1231d 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -17753,7 +17753,7 @@ This is the service that sets up ``special files''
> such as
> @file{/bin/sh}; an instance of it is part of @code{%base-services}.
>
> The value associated with @code{special-files-service-type} services
> -must be a list of tuples where the first element is the ``special file''
> +must be a list of two-element lists where the first element is the ``special
> file''
> and the second element is its target. By default it is:
Applied!
--
Thanks,
Maxim
--- End Message ---