guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: guix: packages: Support package/inherit by packag


From: guix-commits
Subject: branch master updated: guix: packages: Support package/inherit by package-field-location.
Date: Wed, 06 Sep 2023 16:42:06 -0400

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new d552c2508f guix: packages: Support package/inherit by 
package-field-location.
d552c2508f is described below

commit d552c2508f891a92c465492984ff498dcc384651
Author: Simon Tournier <zimon.toutoune@gmail.com>
AuthorDate: Tue Sep 5 16:37:32 2023 +0200

    guix: packages: Support package/inherit by package-field-location.
    
    Fixes <https://issues.guix.gnu.org/65236>.
    
    * guix/packages.scm (package-field-location): Add package/inherit case.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Reported-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 guix/packages.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index ba98bb0fb4..f70fad695e 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -761,7 +761,8 @@ object."
               (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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]