Attached is an updated patch based on current master after core-updates
merge.
`~Eric
From 6282f668d3cadb9f24f045a0c6992eda9fbe6d5d Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 21 Jul 2015 20:45:54 -0500
Subject: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and
package-propagated-input-refs to (guix packages).
* gnu/packages/version-control.scm (package-transitive-propagated-labels*)
(package-propagated-input-refs): Move from here...
* guix/packages.scm: ...to here.
---
gnu/packages/version-control.scm | 18 ------------------
guix/packages.scm | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c3f501b..6fc1be8 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -98,24 +98,6 @@ changes to project files over time. It supports both a distributed workflow
as well as the classic centralized workflow.")
(license gpl2+)))
-(define (package-transitive-propagated-labels* package)
- "Return a list of the input labels of PACKAGE and its transitive inputs."
- (let ((name (package-name package)))
- `(,name
- ,@(map (match-lambda
- ((label (? package? _) . _)
- label))
- (package-transitive-propagated-inputs package)))))
-
-(define (package-propagated-input-refs inputs packages)
- "Return a list of (assoc-ref INPUTS <package-name>) for each package in
-PACKAGES and their propagated inputs."
- (map (lambda (l)
- `(assoc-ref ,inputs ,l))
- (delete-duplicates ;XXX: efficiency
- (append-map package-transitive-propagated-labels*
- packages))))
-
(define-public git
;; Keep in sync with 'git-manpages'!
(package
diff --git a/guix/packages.scm b/guix/packages.scm
index 3983d14..9150cf4 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -93,6 +93,9 @@
package-output
package-grafts
+ package-transitive-propagated-labels*
+ package-propagated-input-refs
+
%supported-systems
%hydra-supported-systems
supported-package?
@@ -579,6 +582,24 @@ for the host system (\"native inputs\"), and not target inputs."
recursively."
(transitive-inputs (package-propagated-inputs package)))
+(define (package-transitive-propagated-labels* package)
+ "Return a list of the input labels of PACKAGE and its transitive inputs."
+ (let ((name (package-name package)))
+ `(,name
+ ,@(map (match-lambda
+ ((label (? package? _) . _)
+ label))
+ (package-transitive-propagated-inputs package)))))
+
+(define (package-propagated-input-refs inputs packages)
+ "Return a list of (assoc-ref INPUTS <package-name>) for each package in
+PACKAGES and their transitive propagated inputs."
+ (map (lambda (l)
+ `(assoc-ref ,inputs ,l))
+ (delete-duplicates ;XXX: efficiency
+ (append-map package-transitive-propagated-labels*
+ packages))))
+
(define-syntax define-memoized/v
(lambda (form)
"Define a memoized single-valued unary procedure with docstring.
--
2.4.3
