[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: grafts: Record metadata as derivation properties.
From: |
guix-commits |
Subject: |
02/07: grafts: Record metadata as derivation properties. |
Date: |
Wed, 28 Nov 2018 04:40:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 64fd1c01bc6f1be6ffcafc08789d5dafb9850c2e
Author: Ludovic Courtès <address@hidden>
Date: Mon Nov 26 22:27:39 2018 +0100
grafts: Record metadata as derivation properties.
* guix/grafts.scm (graft-derivation/shallow): Pass #:properties to
'build-expression->derivation'.
* tests/grafts.scm ("graft-derivation, grafted item is a direct
dependency"): Check the value returned by 'derivation-properties'.
---
guix/grafts.scm | 7 ++++++-
tests/grafts.scm | 13 ++++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/guix/grafts.scm b/guix/grafts.scm
index 01e245d..63f3845 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -123,6 +123,10 @@ are not recursively applied to dependencies of DRV."
(define add-label
(cut cons "x" <>))
+ (define properties
+ `((type . graft)
+ (graft (count . ,(length grafts)))))
+
(match grafts
((($ <graft> sources source-outputs targets target-outputs) ...)
(let ((sources (zip sources source-outputs))
@@ -140,7 +144,8 @@ are not recursively applied to dependencies of DRV."
,@(append (map add-label
sources)
(map add-label
targets)))
#:outputs outputs
- #:local-build? #t)))))
+ #:local-build? #t
+ #:properties properties)))))
(define (item->deriver store item)
"Return two values: the derivation that led to ITEM (a store item), and the
name of the output of that derivation ITEM corresponds to (for example
diff --git a/tests/grafts.scm b/tests/grafts.scm
index abb074d..f85f3c6 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 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,7 +51,8 @@
(test-begin "grafts")
-(test-assert "graft-derivation, grafted item is a direct dependency"
+(test-equal "graft-derivation, grafted item is a direct dependency"
+ '((type . graft) (graft (count . 2)))
(let* ((build `(begin
(mkdir %output)
(chdir %output)
@@ -76,14 +77,16 @@
(origin %mkdir)
(replacement two))))))
(and (build-derivations %store (list grafted))
- (let ((two (derivation->output-path two))
- (grafted (derivation->output-path grafted)))
+ (let ((properties (derivation-properties grafted))
+ (two (derivation->output-path two))
+ (grafted (derivation->output-path grafted)))
(and (string=? (format #f "foo/~a/bar" two)
(call-with-input-file (string-append grafted "/text")
get-string-all))
(string=? (readlink (string-append grafted "/sh")) one)
(string=? (readlink (string-append grafted "/self"))
- grafted))))))
+ grafted)
+ properties)))))
(test-assert "graft-derivation, grafted item uses a different name"
(let* ((build `(begin
- branch master updated (01e7ca5 -> e91152e), guix-commits, 2018/11/28
- 03/07: status: Report grafting derivations specially., guix-commits, 2018/11/28
- 02/07: grafts: Record metadata as derivation properties.,
guix-commits <=
- 01/07: derivations: Add properties., guix-commits, 2018/11/28
- 04/07: ui: 'show-what-to-build' reports grafts separately., guix-commits, 2018/11/28
- 06/07: channels: Add 'checkout->channel-instance'., guix-commits, 2018/11/28
- 07/07: guix hash: Fix version and help messages, guix-commits, 2018/11/28
- 05/07: inferior: Add 'inferior-eval-with-store'., guix-commits, 2018/11/28