[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36578] [PATCH 9/9] channels: Avoid use of 'derivation-input-path'.
From: |
Ludovic Courtès |
Subject: |
[bug#36578] [PATCH 9/9] channels: Avoid use of 'derivation-input-path'. |
Date: |
Wed, 10 Jul 2019 19:11:28 +0200 |
* 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 e6bb9b891b..a8c8f43276 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -424,8 +424,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)
--
2.22.0
- [bug#36578] [PATCH 0/9] Modernize the API of the 'derivation' primitive, Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 1/9] derivations: 'derivation' primitive accepts <derivation> and #:sources., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 4/9] download: Use the new 'derivation' calling convention., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 3/9] gnu: guile-bootstrap: Use the new 'derivation' calling convention., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 5/9] derivations: 'map-derivation' uses the new 'derivation' calling convention., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 9/9] channels: Avoid use of 'derivation-input-path'.,
Ludovic Courtès <=
- [bug#36578] [PATCH 8/9] gexp: 'lowered-gexp-guile' now returns a <derivation-input>., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 2/9] gexp: <lowered-gexp> separates sources from derivation inputs., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 7/9] derivations: Deprecate the previous calling convention., Ludovic Courtès, 2019/07/10
- [bug#36578] [PATCH 6/9] derivations: Update tests to use new calling convention., Ludovic Courtès, 2019/07/10
- bug#36578: [PATCH 0/9] Modernize the API of the 'derivation' primitive, Ludovic Courtès, 2019/07/15