[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49531] [PATCH core-updates 1/4] import: utils: Emit new-style packa
From: |
Sarah Morgensen |
Subject: |
[bug#49531] [PATCH core-updates 1/4] import: utils: Emit new-style package inputs. |
Date: |
Sun, 11 Jul 2021 22:48:06 -0700 |
* guix/import/utils.scm (package-names->package-inputs)[make-input]:
Return new-style package inputs.
(maybe-inputs): Wrap PACKAGE-INPUTS in 'list' instead of 'quasiquote'.
---
guix/import/utils.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index d817318a91..8fa017e18f 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -237,12 +238,10 @@ into a proper sentence and by using two spaces between
sentences."
optional OUTPUT, tries to generate a quoted list of inputs, as suitable to
use in an 'inputs' field of a package definition."
(define (make-input input version)
- (cons* input (list 'unquote (string->symbol
- (if version
- (string-append input "-" version)
- input)))
- (or (and output (list output))
- '())))
+ (let ((name (if version (string-append input "-" version) input)))
+ (if output
+ (list (string->symbol name) output)
+ (string->symbol name))))
(map (match-lambda
((input version) (make-input input version))
@@ -263,7 +262,7 @@ snippet generated is for regular inputs."
(()
'())
((package-inputs ...)
- `((,field-name (,'quasiquote ,package-inputs)))))))
+ `((,field-name (list ,@package-inputs)))))))
(define* (maybe-native-inputs package-names #:optional (output #f))
"Same as MAYBE-INPUTS, but for native inputs."
--
2.31.1
- [bug#49531] [PATCH core-updates 0/4] import: {utils, go, crate}: Emit new-style package inputs., Sarah Morgensen, 2021/07/12
- [bug#49531] [PATCH core-updates 1/4] import: utils: Emit new-style package inputs.,
Sarah Morgensen <=
- [bug#49531] [PATCH core-updates 2/4] import: go: Emit new-style package inputs., Sarah Morgensen, 2021/07/12
- [bug#49531] [PATCH core-updates 3/4] import: crate: Emit new-style package inputs., Sarah Morgensen, 2021/07/12
- [bug#49531] [PATCH core-updates 4/4] cargo-build-system: Accept new-style package inputs., Sarah Morgensen, 2021/07/12