Subject: bug#65757: closed (Re: [bug#65757] [PATCH] guix: packages: Support package/inherit by package-field-location.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 06 Sep 2023 20:42:02 +0000

Your bug report

#65757: [PATCH] guix: packages: Support package/inherit by package-field-location.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
65757: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65757
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#65757] [PATCH] guix: packages: Support package/inherit by package-field-location.
From: Maxim Cournoyer <[email-masked]>
To: Simon Tournier <[email-masked]>
Cc: [email-masked]
Date: Wed, 06 Sep 2023 16:41:31 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Simon,

Simon Tournier <[email-masked]> writes:

> Fixes <https://issues.guix.gnu.org//65236>.
> Reported by Maxim Cournoyer <[email-masked]>.

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 [email-masked] 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

Subject: [PATCH] guix: packages: Support package/inherit by package-field-location.
From: Simon Tournier <[email-masked]>
To: [email-masked]
Cc: Simon Tournier <[email-masked]>
Date: Tue, 5 Sep 2023 16:37:32 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Fixes <https://issues.guix.gnu.org//65236>.
Reported by Maxim Cournoyer <[email-masked]>.

* 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 ...))
                    (let ((field (assoc field inits)))
                      (match field
                        ((_ value)

base-commit: bedcdf0fb5ac035f696790827679406c7146396c
-- 
2.38.1