* [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs.
@ 2020-01-24 10:38 Efraim Flashner
2020-02-04 23:17 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Efraim Flashner @ 2020-01-24 10:38 UTC (permalink / raw)
To: 39261; +Cc: Efraim Flashner
* guix/import/crate.scm (crate->guix-package): Add definition for
'dev-dependency?' and 'build-dependency?'. Adjust dep-crates to take
normal- and build- dependencies.
---
guix/import/crate.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 57823c3639..0fece81c55 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -86,7 +87,7 @@
crate-dependency?
json->crate-dependency
(id crate-dependency-id "crate_id") ;string
- (kind crate-dependency-kind "kind" ;'normal | 'dev
+ (kind crate-dependency-kind "kind" ;'normal | 'dev | 'build
string->symbol)
(requirement crate-dependency-requirement "req")) ;string
@@ -197,6 +198,12 @@ latest version of CRATE-NAME."
(define (normal-dependency? dependency)
(eq? (crate-dependency-kind dependency) 'normal))
+ (define (dev-dependency? dependency)
+ (eq? (crate-dependency-kind dependency) 'dev))
+
+ (define (build-dependency? dependency)
+ (eq? (crate-dependency-kind dependency) 'build))
+
(define crate
(lookup-crate crate-name))
@@ -212,8 +219,9 @@ latest version of CRATE-NAME."
(and crate version*
(let* ((dependencies (crate-version-dependencies version*))
- (dep-crates (filter normal-dependency? dependencies))
- (dev-dep-crates (remove normal-dependency? dependencies))
+ (dep-crates (append (filter normal-dependency? dependencies)
+ (filter build-dependency? dependencies)))
+ (dev-dep-crates (filter dev-dependency? dependencies))
(cargo-inputs (sort (map crate-dependency-id dep-crates)
string-ci<?))
(cargo-development-inputs
--
2.25.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs.
2020-01-24 10:38 [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs Efraim Flashner
@ 2020-02-04 23:17 ` Ludovic Courtès
2020-02-05 7:14 ` Efraim Flashner
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2020-02-04 23:17 UTC (permalink / raw)
To: Efraim Flashner; +Cc: 39261
Hello!
Nitpick: for the subject line, I’d write:
import: crate: Move build dependencies to cargo-inputs.
Efraim Flashner <efraim@flashner.co.il> skribis:
> * guix/import/crate.scm (crate->guix-package): Add definition for
> 'dev-dependency?' and 'build-dependency?'. Adjust dep-crates to take
> normal- and build- dependencies.
[...]
> + (define (dev-dependency? dependency)
> + (eq? (crate-dependency-kind dependency) 'dev))
Nitpick2: I’d recommend ‘development-dependency?’ as per the style
guidelines. :-)
Anyhow, LGTM!
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs.
2020-02-04 23:17 ` Ludovic Courtès
@ 2020-02-05 7:14 ` Efraim Flashner
0 siblings, 0 replies; 3+ messages in thread
From: Efraim Flashner @ 2020-02-05 7:14 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 39261
I'm actually going to let this one ride until we review the importer patches. Then if it still makes sense we can apply this one.
On February 4, 2020 11:17:36 PM UTC, "Ludovic Courtès" <ludo@gnu.org> wrote:
>Hello!
>
>Nitpick: for the subject line, I’d write:
>
> import: crate: Move build dependencies to cargo-inputs.
>
>Efraim Flashner <efraim@flashner.co.il> skribis:
>
>> * guix/import/crate.scm (crate->guix-package): Add definition for
>> 'dev-dependency?' and 'build-dependency?'. Adjust dep-crates to take
>> normal- and build- dependencies.
>
>[...]
>
>> + (define (dev-dependency? dependency)
>> + (eq? (crate-dependency-kind dependency) 'dev))
>
>Nitpick2: I’d recommend ‘development-dependency?’ as per the style
>guidelines. :-)
>
>Anyhow, LGTM!
>
>Thanks,
>Ludo’.
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-05 7:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-24 10:38 [bug#39261] [PATCH] guix: import/crate: Move build-dependencies to cargo-inputs Efraim Flashner
2020-02-04 23:17 ` Ludovic Courtès
2020-02-05 7:14 ` Efraim Flashner
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.