From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Simon Tournier <zimon.toutoune@gmail.com>
Cc: 65757-done@debbugs.gnu.org
Subject: bug#65757: [PATCH] guix: packages: Support package/inherit by package-field-location.
Date: Wed, 06 Sep 2023 16:41:31 -0400 [thread overview]
Message-ID: <875y4nqbk4.fsf@gmail.com> (raw)
In-Reply-To: <6cefcfecf409ffdd5fe856c23fbbc7b9cae7161d.1693924596.git.zimon.toutoune@gmail.com> (Simon Tournier's message of "Tue, 5 Sep 2023 16:37:32 +0200")
Hi Simon,
Simon Tournier <zimon.toutoune@gmail.com> writes:
> Fixes <https://issues.guix.gnu.org//65236>.
> Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>.
nitpick: 'Reported-by:' is a Git trailing (message tag); it should
appear at the bottom of the commit message for Git tools to correctly
parse it.
> * guix/packages.scm (package-field-location): Add package/inherit case.
> ---
> guix/packages.scm | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/guix/packages.scm b/guix/packages.scm
> index ba98bb0fb484..821eddb72d5d 100644
> --- a/guix/packages.scm
> +++ b/guix/packages.scm
> @@ -761,7 +761,8 @@ (define (package-field-location package field)
> (lambda (port)
> (go-to-location port line column)
> (match (read port)
> - (('package inits ...)
> + ((or ('package inits ...)
> + ('package/inherit inits ...))
I tested it in 'guix repl' for zxing-cpp-1.2, and something didn't go
well:
--8<---------------cut here---------------start------------->8---
scheme@(guix-user)> ,use (guix packages)
scheme@(guix-user)> ,use (gnu packages aidc)
scheme@(guix-user)> zxing-cpp-1.2
$1 = #<package zxing-cpp@1.2.0 gnu/packages/aidc.scm:76 7f4b56450d10>
scheme@(guix-user)> (package-field-location $1 'version)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure assoc: Wrong type argument: zxing-cpp
Entering a new prompt. Type `,bt' for a backtrace or `,q' to continue.
scheme@(guix-user) [1]> ,bt
In ice-9/boot-9.scm:
1747:15 4 (with-exception-handler #<procedure 7f4b58de8480 at ice-9/boot-9.scm:1831:7 (exn)> _ # _ # …)
In ice-9/ports.scm:
433:17 3 (call-with-input-file _ _ #:binary _ #:encoding _ #:guess-encoding _)
In guix/packages.scm:
766:32 2 (_ _)
In srfi/srfi-1.scm:
241:2 1 (assoc _ _ _)
In ice-9/boot-9.scm:
1685:16 0 (raise-exception _ #:continuable? _)
--8<---------------cut here---------------end--------------->8---
I modified it like:
--8<---------------cut here---------------start------------->8---
modified guix/packages.scm
@@ -762,7 +762,7 @@ (define (package-field-location package field)
(go-to-location port line column)
(match (read port)
((or ('package inits ...)
- ('package/inherit parent inits ...))
+ ('package/inherit _ inits ...))
(let ((field (assoc field inits)))
(match field
((_ value)
--8<---------------cut here---------------end--------------->8---
And it now works; yay! Will install shortly.
--
Thanks,
Maxim
next prev parent reply other threads:[~2023-09-06 20:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-05 14:37 [bug#65757] [PATCH] guix: packages: Support package/inherit by package-field-location Simon Tournier
2023-09-06 20:41 ` Maxim Cournoyer [this message]
2023-09-06 22:01 ` Simon Tournier
2023-09-07 1:55 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=875y4nqbk4.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=65757-done@debbugs.gnu.org \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.