[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/75: import: crate: Emit new-style package inputs.
|
From: |
guix-commits |
|
Subject: |
48/75: import: crate: Emit new-style package inputs. |
|
Date: |
Sun, 21 Jan 2024 13:21:48 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 4dcf69c5513f53d6dd5f321b8855e163edb8c895
Author: Sarah Morgensen <iskarian@mgsn.dev>
AuthorDate: Mon Jul 12 07:41:04 2021 -0700
import: crate: Emit new-style package inputs.
* guix/import/crate.scm (maybe-cargo-development-inputs)
(maybe-cargo-inputs): Wrap PACKAGE-INPUTS in unquoted 'list'.
* tests/crate.scm ("crate->guix-package")
("cargo-recursive-import")
("cargo-recursive-import-honors-existing-packages"): Adjust accordingly.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I4dfb745272ecbc893926446872514fb815c07236
---
guix/import/crate.scm | 5 ++--
tests/crate.scm | 77 ++++++++++++++++++---------------------------------
2 files changed, 30 insertions(+), 52 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 7a25b2243c..b5a0b604e2 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
@@ -146,14 +147,14 @@ record or #f if it was not found."
(()
'())
((package-inputs ...)
- `(#:cargo-inputs ,package-inputs))))
+ `(#:cargo-inputs (,'unquote (list ,@package-inputs))))))
(define (maybe-cargo-development-inputs package-names)
(match (package-names->package-inputs package-names)
(()
'())
((package-inputs ...)
- `(#:cargo-development-inputs ,package-inputs))))
+ `(#:cargo-development-inputs (,'unquote (list ,@package-inputs))))))
(define (maybe-arguments arguments)
(match arguments
diff --git a/tests/crate.scm b/tests/crate.scm
index ce2f08aade..fd2ada103e 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 David Elsing <david.elsing@posteo.net>
;;;
@@ -500,7 +501,7 @@
('quasiquote
(#:skip-build? #t
#:cargo-inputs
- (("rust-leaf-alice" ('unquote
'rust-leaf-alice-0.7))))))
+ ('unquote (list rust-leaf-alice-0.7)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -606,7 +607,7 @@
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- (? string? hash)))))
+ (? string? hash)))))
(build-system cargo-build-system)
(arguments ('quasiquote (#:skip-build? #t)))
(home-page "http://example.com";)
@@ -649,8 +650,7 @@
(arguments
('quasiquote (#:skip-build? #t
#:cargo-inputs
- (("rust-leaf-bob"
- ('unquote rust-leaf-bob-3))))))
+ ('unquote (list rust-leaf-bob-3)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -672,12 +672,9 @@
(arguments
('quasiquote (#:skip-build? #t
#:cargo-inputs
- (("rust-intermediate-b"
- ('unquote rust-intermediate-b-1))
- ("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7))
- ("rust-leaf-bob"
- ('unquote rust-leaf-bob-3))))))
+ ('unquote (list rust-intermediate-b-1
+ rust-leaf-alice-0.7
+ rust-leaf-bob-3)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -698,17 +695,12 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
- (("rust-intermediate-a"
- ('unquote rust-intermediate-a-1))
- ("rust-intermediate-b"
- ('unquote rust-intermediate-b-1))
- ("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7))
- ("rust-leaf-bob"
- ('unquote rust-leaf-bob-3)))
+ ('unquote (list rust-intermediate-a-1
+ rust-intermediate-b-1
+ rust-leaf-alice-0.7
+ rust-leaf-bob-3))
#:cargo-development-inputs
- (("rust-intermediate-c"
- ('unquote rust-intermediate-c-1))))))
+ ('unquote (list rust-intermediate-c-1)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -736,8 +728,7 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-development-inputs
- (("rust-leaf-alice"
- ('unquote rust-leaf-alice-0.7))))))
+ ('unquote (list rust-leaf-alice-0.7)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -816,12 +807,9 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
- (("rust-intermediate-b"
- ('unquote rust-intermediate-b-1))
- ("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7))
- ("rust-leaf-bob"
- ('unquote rust-leaf-bob-3))))))
+ ('unquote (list rust-intermediate-b-1
+ rust-leaf-alice-0.7
+ rust-leaf-bob-3)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -842,17 +830,12 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
- (("rust-intermediate-a"
- ('unquote rust-intermediate-a-1))
- ("rust-intermediate-b"
- ('unquote rust-intermediate-b-1))
- ("rust-leaf-alice"
- ('unquote 'rust-leaf-alice-0.7))
- ("rust-leaf-bob"
- ('unquote rust-leaf-bob-3)))
+ ('unquote (list rust-intermediate-a-1
+ rust-intermediate-b-1
+ rust-leaf-alice-0.7
+ rust-leaf-bob-3))
#:cargo-development-inputs
- (("rust-intermediate-c"
- ('unquote rust-intermediate-c-1))))))
+ ('unquote (list rust-intermediate-c-1)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -963,13 +946,10 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
- (("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3)))
+ ('unquote (list rust-leaf-bob-3))
#:cargo-development-inputs
- (("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3.0.2-yanked))
- ("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+ ('unquote (list rust-leaf-bob-3.0.2-yanked
+ rust-leaf-bob-4.0.0-yanked)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
@@ -1094,13 +1074,10 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
- (("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3)))
+ ('unquote (list rust-leaf-bob-3))
#:cargo-development-inputs
- (("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-3.0.2-yanked))
- ("rust-leaf-bob"
- ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+ ('unquote (list rust-leaf-bob-3.0.2-yanked
+ rust-leaf-bob-4.0.0-yanked)))))
(home-page "http://example.com";)
(synopsis "summary")
(description "summary")
- 58/75: gnu: python: Make the build reproducible., (continued)
- 58/75: gnu: python: Make the build reproducible., guix-commits, 2024/01/21
- 65/75: gnu: patchelf: Update to 0.18.0., guix-commits, 2024/01/21
- 66/75: gnu: qpdf: Update to 11.8.0., guix-commits, 2024/01/21
- 51/75: gnu: findutils-boot0: Re-enable most tests., guix-commits, 2024/01/21
- 17/75: gnu: font-canada1500: Install license file., guix-commits, 2024/01/21
- 36/75: gnu: libxcomposite: Update to 0.4.6., guix-commits, 2024/01/21
- 38/75: gnu: transset: Update to 1.0.3., guix-commits, 2024/01/21
- 42/75: gnu: bluez: enable wiimote plugin., guix-commits, 2024/01/21
- 44/75: gnu: man-pages-posix: Remove redundant manpage compression., guix-commits, 2024/01/21
- 46/75: build-system/go: Honor #:parallel-build?., guix-commits, 2024/01/21
- 48/75: import: crate: Emit new-style package inputs.,
guix-commits <=
- 54/75: gnu: bluez: Update to 5.72., guix-commits, 2024/01/21
- 57/75: packages: Fix repacked file name extension when zstd is unavailable., guix-commits, 2024/01/21
- 63/75: gnu: libgpg-error: Update to 1.47., guix-commits, 2024/01/21
- 64/75: gnu: libice: Update to 1.1.1., guix-commits, 2024/01/21
- 68/75: gnu: openjdk9: Make build reproducible., guix-commits, 2024/01/21
- 69/75: gnu: openjdk10: Make more reproducible., guix-commits, 2024/01/21
- 70/75: gnu: openjdk11: Make more reproducible., guix-commits, 2024/01/21
- 75/75: packages: Silence tar's support for --sort check output., guix-commits, 2024/01/21
- 39/75: gnu: xprop: Update to 1.2.6., guix-commits, 2024/01/21
- 49/75: import: go: Emit new-style package inputs., guix-commits, 2024/01/21