guix-commits
[Top][All Lists]
Advanced

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

06/06: build-system/asdf: 'package-with-build-system' accesses inputs la


From: guix-commits
Subject: 06/06: build-system/asdf: 'package-with-build-system' accesses inputs lazily.
Date: Wed, 9 Jan 2019 09:10:14 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 804b9b18ac9188ffb6c6891cbb9241c6a80ed7c8
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jan 9 15:01:40 2019 +0100

    build-system/asdf: 'package-with-build-system' accesses inputs lazily.
    
    Fixes a bug whereby we would, at the top-level (while evaluation
    lisp.scm package definitions), attempt to access package inputs.
    Because of circular dependencies, this could lead to unbound variables
    as reported by Arun Isaac <address@hidden> at
    <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=33801#56>.
    
    * guix/build-system/asdf.scm (package-with-build-system)[transform]
    (new-propagated-inputs): Turn into a procedure.
    Adjust user accordingly.
---
 guix/build-system/asdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm
index 57e294d..af04084 100644
--- a/guix/build-system/asdf.scm
+++ b/guix/build-system/asdf.scm
@@ -172,7 +172,7 @@ set up using CL source package conventions."
       ;; Special considerations for source packages: CL inputs become
       ;; propagated, and un-handled arguments are removed.
 
-      (define new-propagated-inputs
+      (define (new-propagated-inputs)
         (if target-is-source?
             (map rewrite
                  (append
@@ -218,7 +218,7 @@ set up using CL source package conventions."
            (substitute-keyword-arguments base-arguments
              ((#:phases phases) (list phases-transformer phases))))
           (inputs (new-inputs package-inputs))
-          (propagated-inputs new-propagated-inputs)
+          (propagated-inputs (new-propagated-inputs))
           (native-inputs (new-inputs package-native-inputs))
           (outputs (if target-is-source?
                        '("out")



reply via email to

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