guix-commits
[Top][All Lists]
Advanced

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

02/04: packages: Patches can be any lowerable object.


From: Ludovic Courtès
Subject: 02/04: packages: Patches can be any lowerable object.
Date: Thu, 15 Jun 2017 17:18:53 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 7ebc6cf869006a2a568b09cc6b435961f399a20a
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jun 15 18:07:10 2017 +0200

    packages: Patches can be any lowerable object.
    
    * guix/packages.scm (patch-and-repack)[instantiate-patch]: Replace
    'origin?' with 'struct?'.
---
 guix/packages.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index f4967f9..76aa43e 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -477,10 +477,10 @@ specifies modules in scope when evaluating SNIPPET."
 
   (define instantiate-patch
     (match-lambda
-      ((? string? patch)
+      ((? string? patch)                          ;deprecated
        (interned-file patch #:recursive? #t))
-      ((? origin? patch)
-       (origin->derivation patch system))))
+      ((? struct? patch)                          ;origin, local-file, etc.
+       (lower-object patch system))))
 
   (mlet %store-monad ((tar ->     (lookup-input "tar"))
                       (xz ->      (lookup-input "xz"))



reply via email to

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