unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Martin Becze <mjbecze@riseup.net>
Cc: 37322@debbugs.gnu.org
Subject: [bug#37322] [PATCH 1/2] adds the capability of importing a specified version to the crate importer
Date: Sun, 08 Sep 2019 14:27:48 +0200	[thread overview]
Message-ID: <877e6j9dmj.fsf@gnu.org> (raw)
In-Reply-To: <20190906153211.8613-1-mjbecze@riseup.net> (Martin Becze's message of "Fri, 6 Sep 2019 11:32:10 -0400")

Hello Martin,

So the goal is to allow users to run “guix import rust-foo@1.2.3”,
right?  That’s a good idea.

Martin Becze <mjbecze@riseup.net> skribis:

> diff --git a/guix/import/crate.scm b/guix/import/crate.scm
> index f6057dbf8b..3266ebdfec 100644
> --- a/guix/import/crate.scm
> +++ b/guix/import/crate.scm
> @@ -1,6 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2016 David Craven <david@craven.ch>
>  ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -181,8 +182,8 @@ and LICENSE."
>    ;; This regexp matches that.
>    (make-regexp "^(.*) OR (.*)$"))
>  
> -(define (crate->guix-package crate-name)
> -  "Fetch the metadata for CRATE-NAME from crates.io, and return the
> +(define (crate->guix-package crate-name@version)
> +  "Fetch the metadata for CRATE-NAME@VERSION from crates.io, and return the

The idea is that the (guix import …) modules do not contain UI-related
stuff, and that UI-related stuff is instead isolated in (guix scripts
import …).

Thus, splitting the “crate@version” string should happen in (guix
scripts import crate) rather than in this module.

Instead, you could simply change ‘crate->guix-package’ so that it takes
an optional ‘version’ field:

  (define* (crate->guix-package crate-name #:optional version)
    …)

In a second step, you’d change (guix scripts import crate) so that it
passes that version string to ‘crate->guix-package’.

How does that sound?

> +  (define crate-name-version-list
> +    (let ((lnv (string-split crate-name@version #\@)))
> +      (if (= 1 (length lnv))
> +	  (append lnv '(#f))
> +	  lnv)))
> +
> +  (define crate-name
> +    (car crate-name-version-list))
> +
> +
>    (define crate
>      (lookup-crate crate-name))
>  
> +  (define crate-version-string
> +    (let ((version (cadr crate-name-version-list)))
> +      (if version
> +        version
> +        (crate-latest-version crate))))

We have a policy of not using ‘cadr’ and friends:

  https://guix.gnu.org/manual/en/html_node/Data-Types-and-Pattern-Matching.html

So the code above would typically look like:

  (define-values (name version)
    (match (string-split crate-spec #\@)
      ((name version) (values name version))
      ((name)         (values name #f))))

Could you send an updated patch (actually two patches)?

Thanks for working on the importer!

Ludo’.

  parent reply	other threads:[~2019-09-08 12:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-06 15:32 [bug#37322] [PATCH 1/2] adds the capability of importing a specified version to the crate importer Martin Becze
2019-09-06 15:32 ` [bug#37323] [PATCH 2/2] updated import crate docs Martin Becze
2019-09-08 12:27 ` Ludovic Courtès [this message]
2019-09-09 15:32   ` [bug#37322] [PATCH 1/2] adds the capability of importing a specified version to the crate importer Martin Becze

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877e6j9dmj.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=37322@debbugs.gnu.org \
    --cc=mjbecze@riseup.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).