[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/15: derivations: Add 'derivation-input'.
From: |
guix-commits |
Subject: |
05/15: derivations: Add 'derivation-input'. |
Date: |
Thu, 27 Jun 2019 05:15:45 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit c89985d91d2b44704fbcaebd7a097dee0c0e3e4a
Author: Ludovic Courtès <address@hidden>
Date: Sun Jun 23 11:46:17 2019 +0200
derivations: Add 'derivation-input'.
* guix/derivations.scm (derivation-input): New procedure.
* tests/grafts.scm (make-derivation-input): Remove.
("graft-derivation, unused outputs not depended on"): Use
'derivation-input'.
---
guix/derivations.scm | 8 ++++++++
tests/grafts.scm | 16 ++++------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/guix/derivations.scm b/guix/derivations.scm
index 8145d51..4df7b06 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -157,6 +157,14 @@
"Return the <derivation> object INPUT refers to."
(read-derivation-from-file (derivation-input-path input)))
+(define* (derivation-input drv #:optional
+ (outputs (derivation-output-names drv)))
+ "Return a <derivation-input> for the OUTPUTS of DRV."
+ ;; This is a public interface meant to be more convenient than
+ ;; 'make-derivation-input' and giving us more control.
+ (make-derivation-input (derivation-file-name drv)
+ outputs))
+
(set-record-type-printer! <derivation>
(lambda (drv port)
(format port "#<derivation ~a => ~a ~a>"
diff --git a/tests/grafts.scm b/tests/grafts.scm
index f85f3c6..6fd3d5e 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,9 +45,6 @@
(define %mkdir
(bootstrap-binary "mkdir"))
-(define make-derivation-input
- (@@ (guix derivations) make-derivation-input))
-
(test-begin "grafts")
@@ -356,16 +353,11 @@
(p1r-inputs (filter (match-input p1r) inputs))
(p2-inputs (filter (match-input p2) inputs)))
(and (equal? p1-inputs
- (list (make-derivation-input (derivation-file-name p1)
- '("one"))))
+ (list (derivation-input p1 '("one"))))
(equal? p1r-inputs
- (list
- (make-derivation-input (derivation-file-name p1r)
- '("ONE"))))
+ (list (derivation-input p1r '("ONE"))))
(equal? p2-inputs
- (list
- (make-derivation-input (derivation-file-name p2)
- '("aaa"))))
+ (list (derivation-input p2 '("aaa"))))
(derivation-output-names p2g))))))
(test-assert "graft-derivation, renaming" ;<http://bugs.gnu.org/23132>
- branch master updated (b09e496 -> c30d117), guix-commits, 2019/06/27
- 01/15: accounts: Use 'fsync' instead of 'fdatasync'., guix-commits, 2019/06/27
- 03/15: syscalls: Add 'terminal-rows'., guix-commits, 2019/06/27
- 06/15: derivations: Rewrite and replace 'derivations-prerequisites-to-build'., guix-commits, 2019/06/27
- 04/15: ui: Add 'display-search-results' and use it., guix-commits, 2019/06/27
- 02/15: ui: 'relevance' considers regexps connected with a logical and., guix-commits, 2019/06/27
- 11/15: derivations: 'build-derivations' can be passed derivation inputs., guix-commits, 2019/06/27
- 05/15: derivations: Add 'derivation-input'.,
guix-commits <=
- 15/15: tests: Avoid TCP port collision between lint.scm and guix-daemon.sh., guix-commits, 2019/06/27
- 13/15: ui: 'show-what-to-build' accepts derivation inputs., guix-commits, 2019/06/27
- 09/15: derivations: <derivation-input> now aggregates a <derivation>., guix-commits, 2019/06/27
- 10/15: derivations: 'derivation' preserves pointer equality., guix-commits, 2019/06/27
- 08/15: graph: Use 'derivation-input-derivation'., guix-commits, 2019/06/27
- 07/15: ui: 'show-what-to-build' uses 'derivation-build-plan'., guix-commits, 2019/06/27
- 14/15: ui: 'show-derivation-outputs' accepts <derivation-input> records., guix-commits, 2019/06/27
- 12/15: packages: 'specification->package+output' distinguishes "no output specified"., guix-commits, 2019/06/27