tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

Revert "import: crate: Emit new-style package inputs."

Browse Source 
This reverts commit b8af6694b9, which led
‘guix import crate’ to produce invalid code (missing quasiquote) and
triggered a failure of ‘tests/crate.scm’.

Fixes <https://issues.guix.gnu.org/72939>.

Reported-by: Aleksandr Vityazev <avityazev@disroot.org>
Change-Id: If309caaa594f912788e20007bfa1f55b7d581a93
This commit is contained in:
Ludovic Courtès
2024-09-19 12:41:02 +02:00
parent bfdde69808
commit 89413a1162
2 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
tests/crate.scm
View File

@@ -3,7 +3,6 @@
;;; 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>
;;;
@@ -501,7 +500,7 @@
('quasiquote
(#:skip-build? #t
#:cargo-inputs
('unquote (list rust-leaf-alice-0.7)))))
(("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -607,7 +606,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")
@@ -650,7 +649,8 @@
(arguments
('quasiquote (#:skip-build? #t
#:cargo-inputs
('unquote (list rust-leaf-bob-3)))))
(("rust-leaf-bob"
('unquote rust-leaf-bob-3))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -672,9 +672,12 @@
(arguments
('quasiquote (#:skip-build? #t
#:cargo-inputs
('unquote (list rust-intermediate-b-1
rust-leaf-alice-0.7
rust-leaf-bob-3)))))
(("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))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -695,12 +698,17 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
('unquote (list rust-intermediate-a-1
rust-intermediate-b-1
rust-leaf-alice-0.7
rust-leaf-bob-3))
(("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)))
#:cargo-development-inputs
('unquote (list rust-intermediate-c-1)))))
(("rust-intermediate-c"
('unquote rust-intermediate-c-1))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -728,7 +736,8 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-development-inputs
('unquote (list rust-leaf-alice-0.7)))))
(("rust-leaf-alice"
('unquote rust-leaf-alice-0.7))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -807,9 +816,12 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
('unquote (list rust-intermediate-b-1
rust-leaf-alice-0.7
rust-leaf-bob-3)))))
(("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))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -830,12 +842,17 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
('unquote (list rust-intermediate-a-1
rust-intermediate-b-1
rust-leaf-alice-0.7
rust-leaf-bob-3))
(("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)))
#:cargo-development-inputs
('unquote (list rust-intermediate-c-1)))))
(("rust-intermediate-c"
('unquote rust-intermediate-c-1))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -946,10 +963,13 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
('unquote (list rust-leaf-bob-3))
(("rust-leaf-bob"
('unquote 'rust-leaf-bob-3)))
#:cargo-development-inputs
('unquote (list rust-leaf-bob-3.0.2-yanked
rust-leaf-bob-4.0.0-yanked)))))
(("rust-leaf-bob"
('unquote 'rust-leaf-bob-3.0.2-yanked))
("rust-leaf-bob"
('unquote 'rust-leaf-bob-4.0.0-yanked))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")
@@ -1074,10 +1094,13 @@
(build-system cargo-build-system)
(arguments
('quasiquote (#:cargo-inputs
('unquote (list rust-leaf-bob-3))
(("rust-leaf-bob"
('unquote 'rust-leaf-bob-3)))
#:cargo-development-inputs
('unquote (list rust-leaf-bob-3.0.2-yanked
rust-leaf-bob-4.0.0-yanked)))))
(("rust-leaf-bob"
('unquote 'rust-leaf-bob-3.0.2-yanked))
("rust-leaf-bob"
('unquote 'rust-leaf-bob-4.0.0-yanked))))))
(home-page "http://example.com")
(synopsis "summary")
(description "This package provides summary.")