ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-19 09:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

import: utils: Refactor maybe-inputs and add maybe-propagated-inputs.

Browse source 
* guix/import/utils.scm (maybe-inputs)[type]: New argument.  Update docstring.
The argument is used to derive the input field name to use.
(maybe-native-inputs): Adjust to use the above.
(maybe-propagated-inputs): New procedure.
This commit is contained in:
Maxim Cournoyer 2021-03-05 09:21:14 -05:00
parent b685337c94
commit 2446a112df
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
guix/import/utils.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -57,6 +58,7 @@ (define-module (guix import utils)
package-names->package-inputs
maybe-inputs
maybe-native-inputs
maybe-propagated-inputs
package->definition
spdx-string->license
@ -247,23 +249,29 @@ (define (make-input input version)
(input (make-input input #f)))
names))
(define* (maybe-inputs package-names #:optional (output #f))
(define* (maybe-inputs package-names #:optional (output #f)
#:key (type #f))
"Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a
package definition."
(match (package-names->package-inputs package-names output)
(()
'())
((package-inputs ...)
`((inputs (,'quasiquote ,package-inputs))))))
package definition. TYPE can be used to specify the type of the inputs;
either the 'native or 'propagated symbols are accepted. Left unspecified, the
snippet generated is for regular inputs."
(let ((field-name (match type
('native 'native-inputs)
('propagated 'propagated-inputs)
(_ 'inputs))))
(match (package-names->package-inputs package-names output)
(()
'())
((package-inputs ...)
`((,field-name (,'quasiquote ,package-inputs)))))))
(define* (maybe-native-inputs package-names #:optional (output #f))
"Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a
package definition."
(match (package-names->package-inputs package-names output)
(()
'())
((package-inputs ...)
`((native-inputs (,'quasiquote ,package-inputs))))))
"Same as MAYBE-INPUTS, but for native inputs."
(maybe-inputs package-names output #:type 'native))
(define* (maybe-propagated-inputs package-names #:optional (output #f))
"Same as MAYBE-INPUTS, but for propagated inputs."
(maybe-inputs package-names output #:type 'propagated))
(define* (package->definition guix-package #:optional append-version?/string)
"If APPEND-VERSION?/STRING is #t, append the package's major+minor