ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 52 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
guix/import/crate.scm
View file

@ -3,7 +3,6 @@
;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
@ -164,14 +163,14 @@ (define (maybe-cargo-inputs package-names)
(() (()
'()) '())
((package-inputs ...) ((package-inputs ...)
`(#:cargo-inputs (,'unquote (list ,@package-inputs)))))) `(#:cargo-inputs ,package-inputs))))
(define (maybe-cargo-development-inputs package-names) (define (maybe-cargo-development-inputs package-names)
(match (package-names->package-inputs package-names) (match (package-names->package-inputs package-names)
(() (()
'()) '())
((package-inputs ...) ((package-inputs ...)
`(#:cargo-development-inputs (,'unquote (list ,@package-inputs)))))) `(#:cargo-development-inputs ,package-inputs))))
(define (maybe-arguments arguments) (define (maybe-arguments arguments)
(match arguments (match arguments

77
tests/crate.scm
View file

@ -3,7 +3,6 @@
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 David Elsing <david.elsing@posteo.net> ;;; Copyright © 2023 David Elsing <david.elsing@posteo.net>
;;; ;;;
@ -501,7 +500,7 @@ (define have-guile-semver?
('quasiquote ('quasiquote
(#:skip-build? #t (#:skip-build? #t
#:cargo-inputs #:cargo-inputs
('unquote (list rust-leaf-alice-0.7))))) (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -607,7 +606,7 @@ (define-public 'rust-leaf-alice-0.7
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
(? string? hash))))) (? string? hash)))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments ('quasiquote (#:skip-build? #t))) (arguments ('quasiquote (#:skip-build? #t)))
(home-page "http://example.com") (home-page "http://example.com")
@ -650,7 +649,8 @@ (define-public 'rust-intermediate-b-1
(arguments (arguments
('quasiquote (#:skip-build? #t ('quasiquote (#:skip-build? #t
#:cargo-inputs #:cargo-inputs
('unquote (list rust-leaf-bob-3))))) (("rust-leaf-bob"
('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -672,9 +672,12 @@ (define-public 'rust-intermediate-a-1
(arguments (arguments
('quasiquote (#:skip-build? #t ('quasiquote (#:skip-build? #t
#:cargo-inputs #:cargo-inputs
('unquote (list rust-intermediate-b-1 (("rust-intermediate-b"
rust-leaf-alice-0.7 ('unquote rust-intermediate-b-1))
rust-leaf-bob-3))))) ("rust-leaf-alice"
('unquote 'rust-leaf-alice-0.7))
("rust-leaf-bob"
('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -695,12 +698,17 @@ (define-public 'rust-root-1
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
('quasiquote (#:cargo-inputs ('quasiquote (#:cargo-inputs
('unquote (list rust-intermediate-a-1 (("rust-intermediate-a"
rust-intermediate-b-1 ('unquote rust-intermediate-a-1))
rust-leaf-alice-0.7 ("rust-intermediate-b"
rust-leaf-bob-3)) ('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 #:cargo-development-inputs
('unquote (list rust-intermediate-c-1))))) (("rust-intermediate-c"
('unquote rust-intermediate-c-1))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -728,7 +736,8 @@ (define-public 'rust-root-1
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
('quasiquote (#:cargo-development-inputs ('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") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -807,9 +816,12 @@ (define-public 'rust-intermediate-a-1
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
('quasiquote (#:cargo-inputs ('quasiquote (#:cargo-inputs
('unquote (list rust-intermediate-b-1 (("rust-intermediate-b"
rust-leaf-alice-0.7 ('unquote rust-intermediate-b-1))
rust-leaf-bob-3))))) ("rust-leaf-alice"
('unquote 'rust-leaf-alice-0.7))
("rust-leaf-bob"
('unquote rust-leaf-bob-3))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -830,12 +842,17 @@ (define-public 'rust-root-1
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
('quasiquote (#:cargo-inputs ('quasiquote (#:cargo-inputs
('unquote (list rust-intermediate-a-1 (("rust-intermediate-a"
rust-intermediate-b-1 ('unquote rust-intermediate-a-1))
rust-leaf-alice-0.7 ("rust-intermediate-b"
rust-leaf-bob-3)) ('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 #:cargo-development-inputs
('unquote (list rust-intermediate-c-1))))) (("rust-intermediate-c"
('unquote rust-intermediate-c-1))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -946,10 +963,13 @@ (define rust-leaf-bob-3.0.2-yanked
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
('quasiquote (#:cargo-inputs ('quasiquote (#:cargo-inputs
('unquote (list rust-leaf-bob-3)) (("rust-leaf-bob"
('unquote 'rust-leaf-bob-3)))
#:cargo-development-inputs #:cargo-development-inputs
('unquote (list rust-leaf-bob-3.0.2-yanked (("rust-leaf-bob"
rust-leaf-bob-4.0.0-yanked))))) ('unquote 'rust-leaf-bob-3.0.2-yanked))
("rust-leaf-bob"
('unquote 'rust-leaf-bob-4.0.0-yanked))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")
@ -1074,10 +1094,13 @@ (define-public 'rust-bar-1
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
('quasiquote (#:cargo-inputs ('quasiquote (#:cargo-inputs
('unquote (list rust-leaf-bob-3)) (("rust-leaf-bob"
('unquote 'rust-leaf-bob-3)))
#:cargo-development-inputs #:cargo-development-inputs
('unquote (list rust-leaf-bob-3.0.2-yanked (("rust-leaf-bob"
rust-leaf-bob-4.0.0-yanked))))) ('unquote 'rust-leaf-bob-3.0.2-yanked))
("rust-leaf-bob"
('unquote 'rust-leaf-bob-4.0.0-yanked))))))
(home-page "http://example.com") (home-page "http://example.com")
(synopsis "summary") (synopsis "summary")
(description "This package provides summary.") (description "This package provides summary.")