[bug#54644] [PATCH 1/7] gnu: rust-nom-locate-4: Add 4.0.0

[bug#54644] [PATCH 1/7] gnu: rust-nom-locate-4: Add 4.0.0

[Evgenii Lepikhin via Guix-patches via]

This patch set adds multiple Rust crates. Some of them are just new versions and others are new in Guvs.

* gnu/packages/crates-io.scm (rust-nom-locate-4): Add 4.0.0
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 90c95b6368..82fd24b310 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37465,6 +37465,31 @@ (define-public rust-nom-derive-0.7
     (description "This package derives custom nom parsers from structs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-nom-locate-4
+  (package
+    (name "rust-nom-locate")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nom_locate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0186n5qbpiyhpas3nk8y4ynnbdghl4nx958bkq4a6a9hr8v48y9p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bytecount" ,rust-bytecount-0.6)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+    (home-page "https://github.com/fflorent/nom_locate")
+    (synopsis "A special input type for nom to locate tokens")
+    (description
+     "The crate provide the LocatedSpan struct that encapsulates the data.")
+    (license (list license:expat))))
+
 (define-public rust-noop-proc-macro-0.3
   (package
     (name "rust-noop-proc-macro")
-- 
2.34.0

[bug#54644] [PATCH 2/7] gnu: rust-pretty 0.11: Update to 0.11.2.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pretty-0.11) Update to 0.11.2.
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 82fd24b310..83df1ae130 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44199,6 +44199,38 @@ (define-public rust-predicates-tree-0.9
        (("rust-predicates-core" ,rust-predicates-core-0.9)
         ("rust-treeline" ,rust-treeline-0.1))))))
 
+(define-public rust-pretty-0.11
+  (package
+    (name "rust-pretty")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1282l4pa9hhamvbnd5mjrwhdgcsjy1l1lj44i0m4pczsf1cd3br9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-arrayvec" ,rust-arrayvec-0.5)
+        ("rust-typed-arena" ,rust-typed-arena-2)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-difference" ,rust-difference-2)
+        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/Marwes/pretty.rs")
+    (synopsis "Pretty printing combinators for Rust")
+    (description
+     "This crate provides functionality for defining pretty printers.  It is
+particularly useful for printing structured recursive data like trees.")
+    (license license:expat)))
+
 (define-public rust-pretty-0.5
   (package
     (name "rust-pretty")
-- 
2.34.0

[bug#54644] [PATCH 3/7] gnu: rust-located-yaml 0.2: Update to 0.2.1.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-located-yaml-0.2) Update to 0.2.1.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 83df1ae130..3f04192a8a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32322,6 +32322,30 @@ (define-public rust-locale-config-0.2
         ("rust-regex" ,rust-regex-1)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-located-yaml-0.2
+  (package
+    (name "rust-located-yaml")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "located_yaml" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xnx5al5v7d9syspj0irm22alwc3a9adikqxpbyyf6vsz3k8xilv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-yaml-rust" ,rust-yaml-rust-0.4)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.5)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/johnlepikhin/located_yaml")
+    (synopsis "YAML parser with saved positions")
+    (description
+     "YAML parser which provides AST with saved tokens positions.")
+    (license (list license:expat))))
+
 (define-public rust-lock-api-0.4
   (package
     (name "rust-lock-api")
-- 
2.34.0

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-minimal-lexical-0.2): Update to 0.2.1.
---
 gnu/packages/crates-io.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3f04192a8a..8cc50adf55 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34648,6 +34648,23 @@ (define-public rust-miniflux-api-0.3
     ;; No copyright headers in the source code.  LICENSE indicates gpl3.
     (license license:gpl3)))
 
+(define-public rust-minimal-lexical-0.2
+  (package
+    (name "rust-minimal-lexical")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "minimal-lexical" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/Alexhuszagh/minimal-lexical")
+    (synopsis "Fast float parsing conversion routines")
+    (description "Fast float parsing conversion routines.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-minimal-lexical-0.1
   (package
     (name "rust-minimal-lexical")
-- 
2.34.0

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:35
[+0300]:
> +    (synopsis "Fast float parsing conversion routines")
> +    (description "Fast float parsing conversion routines.")

The description is missing.  Aslo, every rust package seems to aim to
be fast, so no need to mention fastness, it borders on marketing
phrasing (see (guix)Synopses and Descriptions)

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:35
[+0300]:
> +(define-public rust-minimal-lexical-0.2
> +  (package
> +    (name "rust-minimal-lexical")
> +    (version "0.2.1")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (crate-uri "minimal-lexical" version))
> +        (file-name (string-append name "-" version ".tar.gz"))
> +        (sha256
> +         (base32 "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8"))))
> +    (build-system cargo-build-system)
> +    (home-page "https://github.com/Alexhuszagh/minimal-lexical")
> +    (synopsis "Fast float parsing conversion routines")
> +    (description "Fast float parsing conversion routines.")
> +    (license (list license:expat license:asl2.0))))
> +
>  (define-public rust-minimal-lexical-0.1
>    (package
>      (name "rust-minimal-lexical")

Instead of defining a new package, WDYT renaming 'rust-minimal-lexical-
0.1' to 'rust-minimal-lexical' and updating it to 0.2?  If so, you'll
have to check if rust-nom@7 still builds.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1664 bytes --]

On Thu, Mar 31, 2022 at 02:01:31PM +0200, Maxime Devos wrote:
> Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:35
> [+0300]:
> > +(define-public rust-minimal-lexical-0.2
> > +  (package
> > +    (name "rust-minimal-lexical")
> > +    (version "0.2.1")
> > +    (source
> > +      (origin
> > +        (method url-fetch)
> > +        (uri (crate-uri "minimal-lexical" version))
> > +        (file-name (string-append name "-" version ".tar.gz"))
> > +        (sha256
> > +         (base32 "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8"))))
> > +    (build-system cargo-build-system)
> > +    (home-page "https://github.com/Alexhuszagh/minimal-lexical")
> > +    (synopsis "Fast float parsing conversion routines")
> > +    (description "Fast float parsing conversion routines.")
> > +    (license (list license:expat license:asl2.0))))
> > +
> >  (define-public rust-minimal-lexical-0.1
> >    (package
> >      (name "rust-minimal-lexical")
> 
> Instead of defining a new package, WDYT renaming 'rust-minimal-lexical-
> 0.1' to 'rust-minimal-lexical' and updating it to 0.2?  If so, you'll
> have to check if rust-nom@7 still builds.

semver is very strongly followed in the rust community, so 0.1 isn't
necessarily compatible with 0.2. That's how we've ended up with the
numerical suffix on all the rust packages.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 2016 bytes --]

Efraim Flashner schreef op do 31-03-2022 om 17:47 [+0300]:
> On Thu, Mar 31, 2022 at 02:01:31PM +0200, Maxime Devos wrote:
> > Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om
> 00:35
> > [+0300]:
> > > +(define-public rust-minimal-lexical-0.2
> > > +  (package
> > > +    (name "rust-minimal-lexical")
> > > +    (version "0.2.1")
> > > +    (source
> > > +      (origin
> > > +        (method url-fetch)
> > > +        (uri (crate-uri "minimal-lexical" version))
> > > +        (file-name (string-append name "-" version ".tar.gz"))
> > > +        (sha256
> > > +         (base32
> "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8"))))
> > > +    (build-system cargo-build-system)
> > > +    (home-page "https://github.com/Alexhuszagh/minimal-lexical")
> > > +    (synopsis "Fast float parsing conversion routines")
> > > +    (description "Fast float parsing conversion routines.")
> > > +    (license (list license:expat license:asl2.0))))
> > > +
> > >  (define-public rust-minimal-lexical-0.1
> > >    (package
> > >      (name "rust-minimal-lexical")
> > 
> > Instead of defining a new package, WDYT renaming 'rust-minimal-
> lexical-
> > 0.1' to 'rust-minimal-lexical' and updating it to 0.2?  If so,
> you'll
> > have to check if rust-nom@7 still builds.
> 
> semver is very strongly followed in the rust community, so 0.1 isn't
> necessarily compatible with 0.2. That's how we've ended up with the
> numerical suffix on all the rust packages.

It isn't 100% theoretically compatible.  However, it might be
_sufficiently_ compatible for all packages using rust-minimal-lexical 
in Guix.  The same seems to hold often for non-Rust packages, I don't
see a reason to make an exception for Rust.  Why do we package separate
0.Y versions (or separate major versions, for that matter) for Rust
packages and not for, say, Guile, Python and C packages?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Evgenii Lepikhin via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1881 bytes --]

Hello there,

On 2022-03-31 17:40, Maxime Devos wrote:

>> > Instead of defining a new package, WDYT renaming 'rust-minimal-
>> lexical-
>> > 0.1' to 'rust-minimal-lexical' and updating it to 0.2?  If so,
>> you'll
>> > have to check if rust-nom@7 still builds.
>> 
>> semver is very strongly followed in the rust community, so 0.1 isn't
>> necessarily compatible with 0.2. That's how we've ended up with the
>> numerical suffix on all the rust packages.
>
> It isn't 100% theoretically compatible.  However, it might be
> _sufficiently_ compatible for all packages using rust-minimal-lexical 
> in Guix.  The same seems to hold often for non-Rust packages, I don't
> see a reason to make an exception for Rust.  Why do we package separate
> 0.Y versions (or separate major versions, for that matter) for Rust
> packages and not for, say, Guile, Python and C packages?

nom-7.0 is not forward compatible with nom-7.1. I need 7.1 for future contributions and this is why I added it into patchset. In developer's manifest of nom-7.1 dependency on rust-minimal-lexical has been updated from 0.1 to 0.2. For both versions dependencies on exact versions on rust-minimal-lexical are pinned by crate developers and we cannot change it at will. Multiple packages depends on rust-nom-7. At least on of them, rust-rusticata-macros, requires nom 7.0 exactly. Thus, we need rust-nom-7.1 as a separate package.
g
It looks like the standard here in Guix:

$ grep -P 'define-public [^ ]+-\d+[.]\d+$' gnu/packages/crates-io.scm | wc -l
2320 Rust packages in form PACKAGENAME-X.Y

$ grep -P 'define-public [^ ]+-\d+$' gnu/packages/crates-io.scm | wc -l
536 Rust packages in form PACKAGENAME-X

$ grep -P 'define-public [^ ]+\D$' gnu/packages/crates-io.scm|wc -l
3 Rust packages in form PACKAGENAME


Thank you for review! I am newbie Guix contributor.


-- 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

Evgenii Lepikhin schreef op vr 01-04-2022 om 01:30 [+0300]:
> nom-7.0 is not forward compatible with nom-7.1. I need 7.1 for future
> contributions and this is why I added it into patchset.

Related: to reduce duplication, you can do

(define-public rust-nom-7.1
  (package
    (inherit rust-nom-7)
    [...]))

that way, you can ‘copy’ the synopsis of rust-nom-7 without writing it
down again.

Also, if semver is used here, nom-7.0 is compatible with nom-7.1 (not
sure about the terminology here -- forwards? backwards?, but updating
it shouldn't cause any problems if semver is followed correctlu).

> In developer's manifest of nom-7.1 dependency on rust-minimal-lexical
> has been updated from 0.1 to 0.2. For both versions dependencies on
> exact versions on rust-minimal-lexical are pinned by crate developers
> and we cannot change it at will

We can do that, with some 'substitute*'.  It is not guaranteed that it
will actually build, but there's a good chance that it will.  Or that
it fails.  Hard to say in advance.  See, e.g., rust-version-sync@0.8.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Evgenii Lepikhin via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

Hello there,

On 2022-04-01 08:38, Maxime Devos wrote:

>> nom-7.0 is not forward compatible with nom-7.1. I need 7.1 for future
>> contributions and this is why I added it into patchset.
>
> Related: to reduce duplication, you can do

Thank you, nice idea.

> Also, if semver is used here, nom-7.0 is compatible with nom-7.1 (not
> sure about the terminology here -- forwards? backwards?, but updating
> it shouldn't cause any problems if semver is followed correctlu).

That's right, 7.1 is compatible with 7.0.

>> In developer's manifest of nom-7.1 dependency on rust-minimal-lexical
>> has been updated from 0.1 to 0.2. For both versions dependencies on
>> exact versions on rust-minimal-lexical are pinned by crate developers
>> and we cannot change it at will

I was wrong, all dependent on nom-7 packages successfully compiled with 7.1.

Could you advise on sending a new version of the patches, please? Should I create a completely new patchset with separate patches for each package individually or just one patch with all the fixes is enough now?


-- 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#54644] [PATCH 4/7] gnu: rust-minimal-lexical 0.2: Update to 0.2.1.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

Evgenii Lepikhin schreef op vr 01-04-2022 om 16:51 [+0300]:
> Could you advise on sending a new version of the patches, please?
> Should I create a completely new patchset with separate patches for
> each package individually or just one patch with all the fixes is
> enough now?

I would send a new patch series with a version number: [PATCH v2 0/7]
..., [PATCH v2 7/7] ..., to the same bug number 54644@debbugs.gnu.org.
You can use the -v2 option of "git send-email" for this.

If a single ‘fixup patch’ were used, then the commit history would be
messier and the reviewer would need to remember which ‘wrong’ things in
the earlier patches are fixed in the fixup patch.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 5/7] gnu: rust-nom 7.1: Update to 7.1.1

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nom-7.1): Update to 7.1.1.
---
 gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8cc50adf55..738f57837a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37277,6 +37277,49 @@ (define-public rust-nodrop-union-0.1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-nom-7.1
+  (package
+    (name "rust-nom")
+    (version "7.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nom" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0djc3lq5xihnwhrvkc4bj0fd58sjf632yh6hfiw545x355d3x458"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; Tests require example directory, not included in tarball.
+       #:cargo-inputs
+       (("rust-memchr" ,rust-memchr-2)
+        ("rust-minimal-lexical" ,rust-minimal-lexical-0.2)
+        ("rust-version-check" ,rust-version-check-0.9))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-jemallocator" ,rust-jemallocator-0.3)
+        ("rust-proptest" ,rust-proptest-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'override-jemalloc
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((jemalloc (assoc-ref inputs "jemalloc")))
+               (setenv "JEMALLOC_OVERRIDE"
+                       (string-append jemalloc "/lib/libjemalloc_pic.a")))
+             #t)))))
+    (native-inputs
+     (list jemalloc))
+    (home-page "https://github.com/Geal/nom")
+    (synopsis
+     "Byte-oriented, zero-copy, parser combinators library")
+    (description
+     "This package provides a byte-oriented, zero-copy, parser
+combinators library.")
+    (license license:expat)))
+
 (define-public rust-nom-7
   (package
     (name "rust-nom")
-- 
2.34.0

[bug#54644] [PATCH 6/7] gnu: rust-serde-regex 1: Update to 1.1.0

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-regex-1): Update to 1.1.0.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 738f57837a..f57f4161db 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54513,6 +54513,31 @@ (define-public rust-serde-qs-0.7
 commonly used by Ruby on Rails via Rack.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-serde-regex-1
+  (package
+    (name "rust-serde-regex")
+    (version "1.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_regex" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "1pxsnxb8c198szghk1hvzvhva36w2q5zs70hqkmdf5d89qd6y4x8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #true
+       #:cargo-inputs
+       (("rust-regex" ,rust-regex-1))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/tailhook/serde-regex")
+    (synopsis "A serde wrapper, that can be used to serialize regular expressions as strings.")
+    (description "A serde wrapper, that can be used to serialize regular expressions as strings.
+It's often useful to read regexes from configuration file.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-serde-repr-0.1
   (package
     (name "rust-serde-repr")
-- 
2.34.0

[bug#54644] [PATCH 6/7] gnu: rust-serde-regex 1: Update to 1.1.0

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 719 bytes --]

Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:37
[+0300]:
> +    (arguments
> +     `(#:skip-build? #true
> +       #:cargo-inputs
> +       (("rust-regex" ,rust-regex-1))
> +       #:cargo-development-inputs
> +       (("rust-serde-derive" ,rust-serde-derive-1)
> +        ("rust-serde-json" ,rust-serde-json-1))))

Would propagated-inputs/native-inputs suffice instead of the cargo-
specific input system?  Also, why is building skipped?  From (guix)Rust
Crates:

Care should be taken to ensure the correct version of dependencies
are used; to this end we try to refrain from skipping the tests or
using ‘#:skip-build?’ when possible.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 6/7] gnu: rust-serde-regex 1: Update to 1.1.0

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 870 bytes --]

Maxime Devos schreef op do 31-03-2022 om 13:56 [+0200]:
> Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:37
> [+0300]:
> > +    (arguments
> > +     `(#:skip-build? #true
> > +       #:cargo-inputs
> > +       (("rust-regex" ,rust-regex-1))
> > +       #:cargo-development-inputs
> > +       (("rust-serde-derive" ,rust-serde-derive-1)
> > +        ("rust-serde-json" ,rust-serde-json-1))))
> 
> Also, why is building skipped?  From (guix)Rust Crates:
> 
> Care should be taken to ensure the correct version of dependencies
> are used; to this end we try to refrain from skipping the tests or
> using ‘#:skip-build?’ when possible.

Nevermind, if interested in why not see the recent "Removing #:skip-
build? from the crate importer?" thread on guix-devel@gnu.org.

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 6/7] gnu: rust-serde-regex 1: Update to 1.1.0

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:37
[+0300]:
> * gnu/packages/crates-io.scm (rust-serde-regex-1): Update to 1.1.0.

This is not yet in Guix AFAICT, so this is adding, not updating.

> ---
>  gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index 738f57837a..f57f4161db 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -54513,6 +54513,31 @@ (define-public rust-serde-qs-0.7
>  commonly used by Ruby on Rails via Rack.")
>      (license (list license:expat license:asl2.0))))
>  
> +(define-public rust-serde-regex-1

Why the -1 suffix?  This appears to be the only rust-serde-regex in
Guix.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54644] [PATCH 6/7] gnu: rust-serde-regex 1: Update to 1.1.0

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]

On Thu, Mar 31, 2022 at 01:58:38PM +0200, Maxime Devos wrote:
> Evgenii Lepikhin via Guix-patches via schreef op do 31-03-2022 om 00:37
> [+0300]:
> > * gnu/packages/crates-io.scm (rust-serde-regex-1): Update to 1.1.0.
> 
> This is not yet in Guix AFAICT, so this is adding, not updating.
> 
> > ---
> >  gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
> >  1 file changed, 25 insertions(+)
> > 
> > diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> > index 738f57837a..f57f4161db 100644
> > --- a/gnu/packages/crates-io.scm
> > +++ b/gnu/packages/crates-io.scm
> > @@ -54513,6 +54513,31 @@ (define-public rust-serde-qs-0.7
> >  commonly used by Ruby on Rails via Rack.")
> >      (license (list license:expat license:asl2.0))))
> >  
> > +(define-public rust-serde-regex-1
> 
> Why the -1 suffix?  This appears to be the only rust-serde-regex in
> Guix.

It's needed so we can keep track of the different versions of the
crates. As with the other crates we have packaged, we can easily end up
needed numerous 0.x crates in addition to this one.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#54644] [PATCH 7/7] gnu: Add copyright for myself.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm: Add myself to the copyright headers.
---
 gnu/packages/crates-io.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f57f4161db..674bcff7ae 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2021 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2022 Evgenii Lepikhin <e.lepikhin@corp.mail.ru>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.34.0

[bug#54644] [PATCH v2 1/6] gnu: rust-nom-locate-4: Add 4.0.0

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nom-locate-4): Add 4.0.0
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 90c95b6368..82fd24b310 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37465,6 +37465,31 @@ (define-public rust-nom-derive-0.7
     (description "This package derives custom nom parsers from structs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-nom-locate-4
+  (package
+    (name "rust-nom-locate")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nom_locate" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0186n5qbpiyhpas3nk8y4ynnbdghl4nx958bkq4a6a9hr8v48y9p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-bytecount" ,rust-bytecount-0.6)
+        ("rust-nom" ,rust-nom-7)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-stable-deref-trait" ,rust-stable-deref-trait-1))))
+    (home-page "https://github.com/fflorent/nom_locate")
+    (synopsis "A special input type for nom to locate tokens")
+    (description
+     "The crate provide the LocatedSpan struct that encapsulates the data.")
+    (license (list license:expat))))
+
 (define-public rust-noop-proc-macro-0.3
   (package
     (name "rust-noop-proc-macro")
-- 
2.34.0

[bug#54644] [PATCH v2 2/6] gnu: rust-pretty 0.11: Update to 0.11.2.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-pretty-0.11) Update to 0.11.2.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 82fd24b310..cc5c8e2a1b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44223,6 +44223,32 @@ (define-public rust-pretty-0.5
 particularly useful for printing structured recursive data like trees.")
     (license license:expat)))
 
+(define-public rust-pretty-0.11
+  (package
+    (inherit rust-pretty-0.5)
+    (name "rust-pretty")
+    (version "0.11.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pretty" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1282l4pa9hhamvbnd5mjrwhdgcsjy1l1lj44i0m4pczsf1cd3br9"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-log" ,rust-log-0.4)
+        ("rust-arrayvec" ,rust-arrayvec-0.5)
+        ("rust-typed-arena" ,rust-typed-arena-2)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-unicode-segmentation" ,rust-unicode-segmentation-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-difference" ,rust-difference-2)
+        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-tempfile" ,rust-tempfile-3))))))
+
 (define-public rust-pretty-assertions-0.7
   (package
     (name "rust-pretty-assertions")
-- 
2.34.0

[bug#54644] [PATCH v2 3/6] gnu: rust-located-yaml: Add 0.2.1.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-located-yaml-0) Add 0.2.1.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cc5c8e2a1b..1979d6aa3a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32322,6 +32322,30 @@ (define-public rust-locale-config-0.2
         ("rust-regex" ,rust-regex-1)
         ("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-located-yaml-0
+  (package
+    (name "rust-located-yaml")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "located_yaml" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0xnx5al5v7d9syspj0irm22alwc3a9adikqxpbyyf6vsz3k8xilv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-yaml-rust" ,rust-yaml-rust-0.4)
+        ("rust-linked-hash-map" ,rust-linked-hash-map-0.5)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/johnlepikhin/located_yaml")
+    (synopsis "YAML parser with saved positions")
+    (description
+     "YAML parser which provides AST with saved tokens positions.")
+    (license (list license:expat))))
+
 (define-public rust-lock-api-0.4
   (package
     (name "rust-lock-api")
-- 
2.34.0

[bug#54644] [PATCH v2 4/6] gnu: rust-nom 7: Update to 7.1.1

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-nom-7): Update to 7.1.1.
* gnu/packages/crates-io.scm (rust-minimal-lexical-0): Update to 0.2.1.
---
 gnu/packages/crates-io.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1979d6aa3a..1f5db8d9bc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34648,21 +34648,23 @@ (define-public rust-miniflux-api-0.3
     ;; No copyright headers in the source code.  LICENSE indicates gpl3.
     (license license:gpl3)))
 
-(define-public rust-minimal-lexical-0.1
+(define-public rust-minimal-lexical-0
   (package
     (name "rust-minimal-lexical")
-    (version "0.1.4")
+    (version "0.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "minimal-lexical" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "0xynhr97vyv5n5lls41dl7bfa3ba122lix9mqij1l7yprl6n6r4w"))))
+         (base32 "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/Alexhuszagh/minimal-lexical")
-    (synopsis "Fast float parsing conversion routines")
-    (description "Fast float parsing conversion routines.")
+    (synopsis "Float parsing conversion routines")
+    (description "This is a minimal version of rust-lexical, meant to allow
+efficient round-trip float parsing. Minimal-lexical implements a correct, fast
+float parser.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-miniz-oxide-0.4
@@ -37263,7 +37265,7 @@ (define-public rust-nodrop-union-0.1
 (define-public rust-nom-7
   (package
     (name "rust-nom")
-    (version "7.0.0")
+    (version "7.1.1")
     (source
      (origin
        (method url-fetch)
@@ -37272,13 +37274,13 @@ (define-public rust-nom-7
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1ha24yclw4m74gi9p5c3d68rhrrcb7qvkgicz153p5cahck9vzbz"))))
+         "0djc3lq5xihnwhrvkc4bj0fd58sjf632yh6hfiw545x355d3x458"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; Tests require example directory, not included in tarball.
        #:cargo-inputs
        (("rust-memchr" ,rust-memchr-2)
-        ("rust-minimal-lexical" ,rust-minimal-lexical-0.1)
+        ("rust-minimal-lexical" ,rust-minimal-lexical-0)
         ("rust-version-check" ,rust-version-check-0.9))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-- 
2.34.0

[bug#54644] [PATCH v2 5/6] gnu: rust-serde-regex: Add 1.1.0

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-regex-1): Add 1.1.0.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1f5db8d9bc..189a0b6bd1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54449,6 +54449,31 @@ (define-public rust-serde-qs-0.7
 commonly used by Ruby on Rails via Rack.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-serde-regex-1
+  (package
+    (name "rust-serde-regex")
+    (version "1.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "serde_regex" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32 "1pxsnxb8c198szghk1hvzvhva36w2q5zs70hqkmdf5d89qd6y4x8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #true
+       #:cargo-inputs
+       (("rust-regex" ,rust-regex-1))
+       #:cargo-development-inputs
+       (("rust-serde-derive" ,rust-serde-derive-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/tailhook/serde-regex")
+    (synopsis "A serde wrapper, that can be used to serialize regular expressions as strings.")
+    (description "A serde wrapper, that can be used to serialize regular expressions as strings.
+It's often useful to read regexes from configuration file.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-serde-repr-0.1
   (package
     (name "rust-serde-repr")
-- 
2.34.0

[bug#54644] [PATCH v2 6/6] Add copyright for myself.

[Evgenii Lepikhin via Guix-patches via]

* gnu/packages/crates-io.scm: Add myself to the copyright headers.
---
 gnu/packages/crates-io.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 189a0b6bd1..e62672ba70 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2021 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2022 Evgenii Lepikhin <e.lepikhin@corp.mail.ru>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.34.0

[bug#54644] [PATCH v2 1/6] gnu: rust-nom-locate-4: Add 4.0.0

[Evgenii Lepikhin via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

Hello Guix,

On 2022-04-02 00:54, Evgenii Lepikhin via Guix-patches via wrote:

> * gnu/packages/crates-io.scm (rust-nom-locate-4): Add 4.0.0

Could anybody review or merge this updated patchset, please?


-- 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

bug#54644: [PATCH v2 1/6] gnu: rust-nom-locate-4: Add 4.0.0

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

On Mon, May 16, 2022 at 04:49:30PM +0300, Evgenii Lepikhin via Guix-patches via wrote:
> Hello Guix,
> 
> On 2022-04-02 00:54, Evgenii Lepikhin via Guix-patches via wrote:
> 
> > * gnu/packages/crates-io.scm (rust-nom-locate-4): Add 4.0.0
> 
> Could anybody review or merge this updated patchset, please?

I made a couple of changes. I split the rust-nom-7 patch into two, one
to add rust-minimal-lexical-0.2 and the second to update rust-nom-7. I
also cleaned up the synopsis and descriptions to make `guix lint` happy
and adjusted the commit messages.

Patches pushed! Thanks.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]