[bug#39500] [PATCH 0/8] Update ripgrep to 11.0.2.

[bug#39500] [PATCH 0/8] Update ripgrep to 11.0.2.

[Jakub Kądziołka]

This patchstack updates ripgrep and its closely-tied dependencies to the
newest versions. #:skip-build? arguments are removed on the modified
packages.

Fun fact: rust-regex* and rust-aho-corasick had mentioned some bugfixes
in their changelog that could potentially be observed by the user.

All modified packages build after the commits that modify them, moreover
everything in rust-apps.scm builds properly after the patchstack is
applied.

Jakub Kądziołka (8):
  gnu: rust-regex-syntax: Update to 0.6.14.
  gnu: rust-regex: Update to 1.3.4.
  gnu: rust-aho-corasick: Update to 0.7.8.
  gnu: rust-grep-matcher: Update to 0.1.3.
  gnu: rust-grep-regex: Update to 0.1.4.
  gnu: rust-ignore: Update to 0.4.9.
  gnu: ripgrep: Update to 11.0.2.
  gnu: Remove rust-bstr-0.1.

 gnu/packages/crates-io.scm | 59 ++++++++++++--------------------------
 gnu/packages/rust-apps.scm | 12 ++++----
 2 files changed, 25 insertions(+), 46 deletions(-)

-- 
2.25.0

[bug#39495] [PATCH 1/8] gnu: rust-regex-syntax: Update to 0.6.14.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-regex-syntax-0.6): Update to 0.6.14.
  (rust-regex-syntax-0.6)[arguments]: Don't skip build.
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d51b63675a..9de7fa1077 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9688,7 +9689,7 @@ uses finite automata and guarantees linear time matching on all inputs.")
 (define-public rust-regex-syntax-0.6
   (package
     (name "rust-regex-syntax")
-    (version "0.6.13")
+    (version "0.6.14")
     (source
       (origin
         (method url-fetch)
@@ -9696,9 +9697,8 @@ uses finite automata and guarantees linear time matching on all inputs.")
         (file-name (string-append name "-" version ".crate"))
         (sha256
          (base32
-          "141xi6yiji0bc04c4skamd4ny9vnd1jrwc7qzfga425lyn8yhd77"))))
+          "01myl8xqpbnird23xnsb92sjmz1cmp69r6m7y3dwbpmsx4zzx3dj"))))
     (build-system cargo-build-system)
-    (arguments '(#:skip-build? #t))
     (home-page "https://github.com/rust-lang/regex")
     (synopsis "Regular expression parser")
     (description
-- 
2.25.0

[bug#39492] [PATCH 2/8] gnu: rust-regex: Update to 1.3.4.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-regex-1.3): Update to 1.3.4.
  (rust-regex-1.3)[arguments]: Don't skip build.
---
 gnu/packages/crates-io.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9de7fa1077..54db0a9862 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9566,7 +9566,7 @@ functionality.")
 (define-public rust-regex-1.3
   (package
     (name "rust-regex")
-    (version "1.3.3")
+    (version "1.3.4")
     (source
      (origin
        (method url-fetch)
@@ -9575,11 +9575,10 @@ functionality.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "11syqmfvbsah805z6ih8vxf8p6jssdsz1gjsjqcwprz484cqql5m"))))
+         "1a1mh9mgr8jipnxdaykla6xlw4a6kjn2bzkq3cifx8xy4ivzjb1j"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-aho-corasick" ,rust-aho-corasick-0.7)
         ("rust-memchr" ,rust-memchr-2.2)
         ("rust-regex-syntax" ,rust-regex-syntax-0.6)
-- 
2.25.0

[bug#39493] [PATCH 3/8] gnu: rust-aho-corasick: Update to 0.7.8.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-aho-corasick-0.7): Update to 0.7.8.
  (rust-aho-corasick-0.7)[arguments]: Don't skip build.
---
 gnu/packages/crates-io.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 54db0a9862..128de60c90 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -138,7 +138,7 @@ Rust, using gimli.")
 (define-public rust-aho-corasick-0.7
   (package
     (name "rust-aho-corasick")
-    (version "0.7.6")
+    (version "0.7.8")
     (source
      (origin
        (method url-fetch)
@@ -147,11 +147,10 @@ Rust, using gimli.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0b8dh20fhdc59dhhnfi89n2bi80a8zbagzd5c122hf1vv2amxysq"))))
+         "048q5vr1qac4lf90z80lw8kcya6qmlxw857xhwxsssk832jdafkl"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-memchr" ,rust-memchr-2.2))
+     `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.2))
        #:cargo-development-inputs
        (("rust-doc-comment" ,rust-doc-comment-0.3))))
     (home-page "https://github.com/BurntSushi/aho-corasick")
-- 
2.25.0

[bug#39499] [PATCH 4/8] gnu: rust-grep-matcher: Update to 0.1.3.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-grep-matcher-0.1): Update to 0.1.3.
  (rust-grep-matcher-0.1)[arguments]: Don't skip build.
---
 gnu/packages/crates-io.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 128de60c90..c96ffa4289 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4448,7 +4448,7 @@ loading crate.")
 (define-public rust-grep-matcher-0.1
   (package
     (name "rust-grep-matcher")
-    (version "0.1.2")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
@@ -4457,11 +4457,10 @@ loading crate.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "03j26zygfgwyam66bl5g922gimrvp4yyzl8qvaykyklnf247bl3r"))))
+         "113lafx3abrr96ahpz6yn905ian1w3qsr5hijbb909p2j0xgmhkm"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-memchr" ,rust-memchr-2.2))
        #:cargo-development-inputs
        (("rust-regex" ,rust-regex-1.1))))
-- 
2.25.0

[bug#39494] [PATCH 5/8] gnu: rust-grep-regex: Update to 0.1.4.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-grep-regex-0.1): Update to 0.1.4.
  (rust-grep-regex-0.1)[arguments]: Don't skip build.
---
 gnu/packages/crates-io.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c96ffa4289..56636d543c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4536,7 +4536,7 @@ standard printing of search results, similar to grep itself.")
 (define-public rust-grep-regex-0.1
   (package
     (name "rust-grep-regex")
-    (version "0.1.3")
+    (version "0.1.4")
     (source
      (origin
        (method url-fetch)
@@ -4545,11 +4545,10 @@ standard printing of search results, similar to grep itself.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1lbb8837gzy25n706mnidaps4jl63ym679zraj8nfy5g02zbz549"))))
+         "090k1sbn4jq680dmgp1jyqs7f9dzn198k0806kc8f40jcjazd88n"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-aho-corasick" ,rust-aho-corasick-0.7)
         ("rust-grep-matcher" ,rust-grep-matcher-0.1)
         ("rust-log" ,rust-log-0.4)
-- 
2.25.0

[bug#39497] [PATCH 6/8] gnu: rust-ignore: Update to 0.4.9.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-ignore-0.4): Update to 0.4.9.
  (rust-ignore-0.4)[arguments]: Don't skip build. Remove unnecessary
  dependency on winapi.
---
 gnu/packages/crates-io.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 56636d543c..a00036cafb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5113,7 +5113,7 @@ SystemTime}}.")
 (define-public rust-ignore-0.4
   (package
     (name "rust-ignore")
-    (version "0.4.7")
+    (version "0.4.9")
     (source
      (origin
        (method url-fetch)
@@ -5122,11 +5122,10 @@ SystemTime}}.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "00mhksl41dnlsjqmka8c5a0m4spwm70ilm1qd9rngwq552hpzicd"))))
+         "16ziza9gkk30diz1hzmmp06784dqk9mdf3cyakjmzff2jj8q2rjx"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3)
         ("rust-globset" ,rust-globset-0.4)
         ("rust-lazy-static" ,rust-lazy-static-1.3)
@@ -5135,8 +5134,7 @@ SystemTime}}.")
         ("rust-regex" ,rust-regex-1.1)
         ("rust-same-file" ,rust-same-file-1.0)
         ("rust-thread-local" ,rust-thread-local-0.3)
-        ("rust-walkdir" ,rust-walkdir-2.2)
-        ("rust-winapi-util" ,rust-winapi-util-0.1))
+        ("rust-walkdir" ,rust-walkdir-2.2))
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3.0))))
     (home-page "https://github.com/BurntSushi/ripgrep/tree/master/ignore")
-- 
2.25.0

[bug#39498] [PATCH 7/8] gnu: ripgrep: Update to 11.0.2.

[Jakub Kądziołka]

* gnu/packages/rust-apps.scm (ripgrep): Update to 11.0.2.
  [arguments]: Use rust-bstr-0.2 instead of rust-bstr-0.1. Add
  rust-jemallocator-0.3 to inputs. Remove unnecessary
  development-inputs.
---
 gnu/packages/rust-apps.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 5b61cdc542..9e55db567b 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -128,7 +129,7 @@ also knows about symlinks, extended attributes, and Git.")
 (define-public ripgrep
   (package
     (name "ripgrep")
-    (version "11.0.1")
+    (version "11.0.2")
     (source
      (origin
        (method url-fetch)
@@ -137,14 +138,15 @@ also knows about symlinks, extended attributes, and Git.")
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0bn40lz9n08llq615p4qqqbi24zbkf0appfx3zgxg34a86ga9zds"))))
+         "0vqjr96s2rs45715hzf0g0wjahig4zjyiqfijmzzg4jyh9ni80yr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bstr" ,rust-bstr-0.1)
+       (("rust-bstr" ,rust-bstr-0.2)
         ("rust-clap" ,rust-clap-2)
         ("rust-grep" ,rust-grep-0.2)
         ("rust-ignore" ,rust-ignore-0.4)
+        ("rust-jemallocator" ,rust-jemallocator-0.3)
         ("rust-lazy-static" ,rust-lazy-static-1.3)
         ("rust-log" ,rust-log-0.4)
         ("rust-num-cpus" ,rust-num-cpus-1.10)
@@ -152,9 +154,7 @@ also knows about symlinks, extended attributes, and Git.")
         ("rust-serde-json" ,rust-serde-json-1.0)
         ("rust-termcolor" ,rust-termcolor-1.0))
        #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-2)
-        ("rust-lazy-static" ,rust-lazy-static-1.3)
-        ("rust-serde" ,rust-serde-1.0)
+       (("rust-serde" ,rust-serde-1.0)
         ("rust-serde-derive" ,rust-serde-derive-1.0))))
     (home-page "https://github.com/BurntSushi/ripgrep")
     (synopsis "Line-oriented search tool")
-- 
2.25.0

[bug#39496] [PATCH 8/8] gnu: Remove rust-bstr-0.1.

[Jakub Kądziołka]

* gnu/packages/crates-io.scm (rust-bstr-0.1): Remove variable.

All packages are now using rust-bstr-0.2.
---
 gnu/packages/crates-io.scm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a00036cafb..ac32c85df5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1036,21 +1036,6 @@ BLAKE2bp hash functions.")
 UTF-8.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-bstr-0.1
-  (package
-    (inherit rust-bstr-0.2)
-    (name "rust-bstr")
-    (version "0.1.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "bstr" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0nzi9vqhl56ws8gq39f3aj4qjrr4l3g5lbkkcj8xq1x4cb74wq2r"))))))
-
 (define-public rust-byte-tools-0.3
   (package
     (name "rust-byte-tools")
-- 
2.25.0

bug#39500: [PATCH 0/8] Update ripgrep to 11.0.2.

[Efraim Flashner]

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

On Fri, Feb 07, 2020 at 10:23:15PM +0100, Jakub Kądziołka wrote:
> This patchstack updates ripgrep and its closely-tied dependencies to the
> newest versions. #:skip-build? arguments are removed on the modified
> packages.
> 
> Fun fact: rust-regex* and rust-aho-corasick had mentioned some bugfixes
> in their changelog that could potentially be observed by the user.
> 
> All modified packages build after the commits that modify them, moreover
> everything in rust-apps.scm builds properly after the patchstack is
> applied.
> 
> Jakub Kądziołka (8):
>   gnu: rust-regex-syntax: Update to 0.6.14.
>   gnu: rust-regex: Update to 1.3.4.
>   gnu: rust-aho-corasick: Update to 0.7.8.
>   gnu: rust-grep-matcher: Update to 0.1.3.
>   gnu: rust-grep-regex: Update to 0.1.4.
>   gnu: rust-ignore: Update to 0.4.9.
>   gnu: ripgrep: Update to 11.0.2.
>   gnu: Remove rust-bstr-0.1.
> 
>  gnu/packages/crates-io.scm | 59 ++++++++++++--------------------------
>  gnu/packages/rust-apps.scm | 12 ++++----
>  2 files changed, 25 insertions(+), 46 deletions(-)

Thanks! I ended up skipping the commit to remove rust-bstr-0.1. It may
be that another package in the future wants it.

-- 
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 --]