[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)
- branch master updated (2f3c0fb -> 9af75a2), guix-commits, 2019/07/15
- 02/11: syscalls: Use 'define-as-needed' for 'AT_' constants introduced in Guile 2.2.5., guix-commits, 2019/07/15
- 01/11: compile: Report the name of the file that cannot be compiled., guix-commits, 2019/07/15
- 06/11: download: Use the new 'derivation' calling convention., guix-commits, 2019/07/15
- 03/11: derivations: 'derivation' primitive accepts <derivation> and #:sources., guix-commits, 2019/07/15
- 05/11: gnu: guile-bootstrap: Use the new 'derivation' calling convention., guix-commits, 2019/07/15
- 07/11: derivations: 'map-derivation' uses the new 'derivation' calling convention., guix-commits, 2019/07/15
- 10/11: gexp: 'lowered-gexp-guile' now returns a <derivation-input>., guix-commits, 2019/07/15
- 04/11: gexp: <lowered-gexp> separates sources from derivation inputs., guix-commits, 2019/07/15
- 09/11: derivations: Deprecate the previous calling convention., guix-commits, 2019/07/15
- 11/11: channels: Avoid use of 'derivation-input-path'.,
guix-commits <=
- 08/11: derivations: Update tests to use new calling convention., guix-commits, 2019/07/15