summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-04-15 00:41:03 +0200
committerRicardo Wurmus <rekado@elephly.net>2020-04-16 23:41:52 +0200
commit3532fc39fff41eabd061370ee36a1d42b9fac0e6 (patch)
treedd562f1a830a8eb67ad3f9c386b6d586614569a1
parent86a3b540d08e0ece2a697f7caa6342a55394a6b3 (diff)
downloadpatches-3532fc39fff41eabd061370ee36a1d42b9fac0e6.tar
patches-3532fc39fff41eabd061370ee36a1d42b9fac0e6.tar.gz
import/utils: alist->package: Ignore known inputs.
* guix/import/utils.scm (alist->package): Accept optional list of known inputs, which are excluded from the specification lookup. * guix/import/print.scm (package->code)[package-lists->code]: Handle inputs which are just symbols.
-rw-r--r--guix/import/print.scm2
-rw-r--r--guix/import/utils.scm27
2 files changed, 18 insertions, 11 deletions
diff --git a/guix/import/print.scm b/guix/import/print.scm
index 08f3ec9c34..471687c0ff 100644
--- a/guix/import/print.scm
+++ b/guix/import/print.scm
@@ -92,6 +92,8 @@ when evaluated."
(define (package-lists->code lsts)
(list 'quasiquote
(map (match-lambda
+ ((? symbol? s)
+ (list (symbol->string s) (list 'unquote s)))
((label pkg . out)
(let ((mod (package-module-name pkg)))
(cons* label
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 94c8cb040b..5fb1322535 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;;
@@ -310,7 +310,18 @@ the expected fields of an <origin> object."
(uri (assoc-ref orig "uri"))
(sha256 sha))))))
-(define (alist->package meta)
+(define* (alist->package meta #:optional (known-inputs '()))
+ "Return a package value generated from the alist META. If the list of
+strings KNOWN-INPUTS is provided, do not treat the mentioned inputs as
+specifications to look up and replace them with plain symbols instead."
+ (define (process-inputs which)
+ (let-values (((regular known)
+ (lset-diff+intersection
+ string=?
+ (vector->list (or (assoc-ref meta which) #()))
+ known-inputs)))
+ (append (specs->package-lists regular)
+ (map string->symbol known))))
(package
(name (assoc-ref meta "name"))
(version (assoc-ref meta "version"))
@@ -318,15 +329,9 @@ the expected fields of an <origin> object."
(build-system
(lookup-build-system-by-name
(string->symbol (assoc-ref meta "build-system"))))
- (native-inputs
- (specs->package-lists
- (vector->list (or (assoc-ref meta "native-inputs") '#()))))
- (inputs
- (specs->package-lists
- (vector->list (or (assoc-ref meta "inputs") '#()))))
- (propagated-inputs
- (specs->package-lists
- (vector->list (or (assoc-ref meta "propagated-inputs") '#()))))
+ (native-inputs (process-inputs "native-inputs"))
+ (inputs (process-inputs "inputs"))
+ (propagated-inputs (process-inputs "propagated-inputs"))
(home-page
(assoc-ref meta "home-page"))
(synopsis