guix-commits
[Top][All Lists]
Advanced

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

11/11: channels: Avoid use of 'derivation-input-path'.


From: guix-commits
Subject: 11/11: channels: Avoid use of 'derivation-input-path'.
Date: Mon, 15 Jul 2019 04:18:18 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 9af75a26308475f5fc9cf1c13bb0374b5a3345a6
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 10 18:51:56 2019 +0200

    channels: Avoid use of 'derivation-input-path'.
    
    * guix/channels.scm (old-style-guix?): Use 'derivation-name' rather than
    'derivation-input-path'.
---
 guix/channels.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index 615ff14..bfe6963 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -435,8 +435,9 @@ derivation."
   ;; "old style" (before commit 8a0d9bc8a3f153159d9e239a151c0fa98f1e12d8,
   ;; dated May 30, 2018) did not depend on "guix-command.drv".
   (not (find (lambda (input)
-               (string-suffix? "-guix-command.drv"
-                               (derivation-input-path input)))
+               (string=? "guix-command"
+                         (derivation-name
+                          (derivation-input-derivation input))))
              (derivation-inputs drv))))
 
 (define (channel-instances->manifest instances)



reply via email to

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