[bug#71052] [PATCH 0/9] gnu: just: Update to 1.26.0.

[bug#71052] [PATCH 0/9] gnu: just: Update to 1.26.0.

[Julian Flake]

This patch series updates 'just' and its dependencies to recent version.

Julian Flake (9):
  Update rust-home
  Update rust-heck
  Update rust-libc
  Update rust-regex(-automata)
  Update rust-rustfix
  Update rust-strum(-macros)
  Update rust-which
  Added rust-winsafe
  Update just

 gnu/packages/crates-io.scm | 135 ++++++++++++++++++++++++++++---------
 gnu/packages/rust-apps.scm |  27 ++++----
 2 files changed, 118 insertions(+), 44 deletions(-)


base-commit: e9b25a6c6c626a560d28a1f732e6e5d362d584a4
-- 
2.41.0

[bug#71057] [PATCH 1/9] Update rust-home

[Julian Flake]

Change-Id: Id7672387f72592e5144a2406ee1168fe471d215a
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cce3e8b0b1..365db079b6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27912,14 +27912,14 @@ (define-public rust-half-1
 (define-public rust-home-0.5
   (package
     (name "rust-home")
-    (version "0.5.5")
+    (version "0.5.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "home" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1nqx1krijvpd03d96avsdyknd12h8hs3xhxwgqghf8v9xxzc4i2l"))))
+        (base32 "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.48))))
-- 
2.41.0

[bug#71056] [PATCH 2/9] Update rust-heck

[Julian Flake]

Change-Id: I7edaffd33fd725a2554e2cc6b89fb88b9e28f73a
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 365db079b6..78b529946a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28512,17 +28512,17 @@ (define-public rust-heapsize-plugin-0.1
 total runtime size of an object on the heap")
     (license license:mpl2.0)))
 
-(define-public rust-heck-0.4
+(define-public rust-heck-0.5
   (package
     (name "rust-heck")
-    (version "0.4.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "heck" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m"))))
+        (base32 "1sjmpsdl8czyh9ywl3qcsfsq9a307dg4ni2vnlwgnzzqhc4y0113"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -28536,6 +28536,19 @@ (define-public rust-heck-0.4
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-heck-0.4
+  (package
+    (inherit rust-heck-0.5)
+    (name "rust-heck")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "heck" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m"))))))
+
 (define-public rust-heck-0.3
   (package
     (inherit rust-heck-0.4)
-- 
2.41.0

[bug#71058] [PATCH 3/9] Update rust-libc

[Julian Flake]

Change-Id: I6c1a6964bcae27070abbbb8814318310b61fe6e1
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 78b529946a..bac96f98aa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33584,14 +33584,14 @@ (define-public rust-lexopt-0.3
 (define-public rust-libc-0.2
   (package
     (name "rust-libc")
-    (version "0.2.151")
+    (version "0.2.155")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1x28f0zgp4zcwr891p8n9ag9w371sbib30vp4y6hi2052frplb9h"))))
+        (base32 "0z44c53z54znna8n322k5iwg80arxxpdzjj5260pxxzc9a58icwp"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
-- 
2.41.0

[bug#71053] [PATCH 4/9] Update rust-regex(-automata)

[Julian Flake]

Change-Id: I271d17efba25a1992c6c549c745858b022f6b9a8
---
 gnu/packages/crates-io.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bac96f98aa..664ab48f70 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54404,14 +54404,14 @@ (define-public rust-refpool-0.4
 (define-public rust-regex-1
   (package
     (name "rust-regex")
-    (version "1.10.2")
+    (version "1.10.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq"))))
+        (base32 "0k5sb0h2mkwf51ab0gvv3x38jp1q7wgxf63abfbhi0wwvvgxn5y1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -54439,14 +54439,14 @@ (define-public rust-regex-0.2
     (name "rust-regex")
     (version "0.2.11")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "regex" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1163ir1k5zjspirfjl4wqbviwrxlhmfwy95xxb69y4irkv4snack"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "regex" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1163ir1k5zjspirfjl4wqbviwrxlhmfwy95xxb69y4irkv4snack"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -54492,14 +54492,14 @@ (define-public rust-regex-0.1
 (define-public rust-regex-automata-0.4
   (package
     (name "rust-regex-automata")
-    (version "0.4.3")
+    (version "0.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex-automata" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z"))))
+        (base32 "0akrxca6lw02y8fgvlypfg24dkfsz0bnnhgxaf9yrqh58h9s2zrv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Not all files included.
-- 
2.41.0

[bug#71059] [PATCH 5/9] Update rust-rustfix

[Julian Flake]

Change-Id: I5fc44ef822bd94066a82f085d282ab4e017b8099
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 664ab48f70..9e729a7e5b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57570,14 +57570,14 @@ (define-public rust-rustfix-0.4
 (define-public rust-rustix-0.38
   (package
     (name "rust-rustix")
-    (version "0.38.28")
+    (version "0.38.30")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rustix" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "05m3vacvbqbg6r6ksmx9k5afpi0lppjdv712crrpsrfax2jp5rbj"))
+        (base32 "1jkb6bzrj2w9ffy35aw4q04mqk1yxqw35fz80x0c4cxgi9c988rj"))
        (snippet
         #~(begin (use-modules (guix build utils))
                  (for-each delete-file (find-files "." "\\.a$"))
-- 
2.41.0

[bug#71054] [PATCH 6/9] Update rust-strum(-macros)

[Julian Flake]

Change-Id: I9db32d170db7c59d6fdbc3aa46aea310297c7151
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9e729a7e5b..50684530a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65606,23 +65606,23 @@ (define-public rust-structopt-derive-0.2
      "Parse command line argument by defining a struct, derive crate.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-strum-0.25
+(define-public rust-strum-0.26
   (package
     (name "rust-strum")
-    (version "0.25.0")
+    (version "0.26.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"))))
+        (base32 "03kfgifxi4gh8bdq83kzzxp427ilg93k56ckfg3ikk56r0x42z0i"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; unresolved import `strum::EnumIter`
        #:cargo-inputs
        (("rust-phf" ,rust-phf-0.10)
-        ("rust-strum-macros" ,rust-strum-macros-0.25))
+        ("rust-strum-macros" ,rust-strum-macros-0.26))
        #:cargo-development-inputs
        (("rust-strum-macros" ,rust-strum-macros-0.25))))
     (home-page "https://github.com/Peternator7/strum")
@@ -65632,6 +65632,19 @@ (define-public rust-strum-0.25
 easier in Rust.")
     (license license:expat)))
 
+(define-public rust-strum-0.25
+  (package
+    (inherit rust-strum-0.26)
+    (name "rust-strum")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"))))))
+
 (define-public rust-strum-0.24
   (package
     (inherit rust-strum-0.25)
@@ -65720,17 +65733,17 @@ (define-public rust-strum-0.18
      `(#:cargo-inputs
        (("rust-strum-macros" ,rust-strum-macros-0.18))))))
 
-(define-public rust-strum-macros-0.25
+(define-public rust-strum-macros-0.26
   (package
     (name "rust-strum-macros")
-    (version "0.25.3")
+    (version "0.26.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum_macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13"))))
+        (base32 "0in9jvbb3g16x8fj7lf91vwzj98319hj3z8lpaaa9h42ybd5kky6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
@@ -65745,6 +65758,19 @@ (define-public rust-strum-macros-0.25
      "This crate provides helpful macros for working with enums and strings.")
     (license license:expat)))
 
+(define-public rust-strum-macros-0.25
+  (package
+    (inherit rust-strum-macros-0.26)
+    (name "rust-strum-macros")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13"))))))
+
 (define-public rust-strum-macros-0.24
   (package
     (inherit rust-strum-macros-0.25)
-- 
2.41.0

[bug#71052] [PATCH 7/9] Update rust-which

[Julian Flake]

Change-Id: Ib1e9a41dfc121edde6ed980eae3bc44dda090e8b
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 50684530a2..3a07c11996 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77999,17 +77999,17 @@ (define-public rust-wepoll-sys-stjepang-1
 using @code{bindgen}.")
     (license license:mpl2.0)))
 
-(define-public rust-which-5
+(define-public rust-which-6
   (package
     (name "rust-which")
-    (version "5.0.0")
+    (version "6.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "which" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"))
+        (base32 "1mz0vijj9qvsmfqkjqw3wf8zqn19p2x0gg7gzfnhaa1bibsy84c2"))
        (modules '((guix build utils)))
        (snippet
         '(begin (substitute* "Cargo.toml"
@@ -78026,7 +78026,8 @@ (define-public rust-which-5
                        ("rust-once-cell" ,rust-once-cell-1)
                        ("rust-regex" ,rust-regex-1)
                        ("rust-rustix" ,rust-rustix-0.38)
-                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+                       ("rust-windows-sys" ,rust-windows-sys-0.48) ; not needed in 6 anymore
+                       ("rust-winsafe" ,rust-winsafe-0.0.19))
        #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/harryfei/which-rs.git")
     (synopsis "Rust equivalent of @command{which}")
@@ -78036,6 +78037,20 @@ (define-public rust-which-5
 executable.")
     (license license:expat)))
 
+
+(define-public rust-which-5
+  (package
+    (inherit rust-which-6)
+    (name "rust-which")
+    (version "5.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "which" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"))))))
+
 (define-public rust-which-4
   (package
     (inherit rust-which-5)
-- 
2.41.0

[bug#71055] [PATCH 8/9] Added rust-winsafe

[Julian Flake]

Change-Id: Iba8c0af1ffec1d29d2442b09518a8a35e86a14e0
---
 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 3a07c11996..8efbaa67a4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80027,6 +80027,23 @@ (define-public rust-zvariant-utils-1
     (description "Various utilities used internally by the zvariant crate.")
     (license license:expat)))
 
+(define-public rust-winsafe-0.0.19
+  (package
+    (name "rust-winsafe")
+    (version "0.0.19")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "winsafe" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0169xy9mjma8dys4m8v4x0xhw2gkbhv2v1wsbvcjl9bhnxxd2dfi"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrigocfd/winsafe")
+    (synopsis "Windows API and GUI in safe, idiomatic Rust.")
+    (description "Windows API and GUI in safe, idiomatic Rust containing low-level Win32 API constants, functions, structs and high-level structs to build native Win32 GUI application.")
+    (license license:expat)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#71052] [PATCH 9/9] Update just

[Julian Flake]

Change-Id: I975f6559bbb7a9a92f90ae773889e4e77c96d3df
---
 gnu/packages/rust-apps.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d73bd1a030..08cc5228cb 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
+;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -70,6 +71,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages crates-vcs)
   #:use-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages emacs)
@@ -984,13 +986,13 @@ (define-public i3status-rust
 (define-public just
   (package
     (name "just")
-    (version "1.23.0")
+    (version "1.26.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "just" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0wpjv098a2yymsb41h6104cdia4gb6hwwh05pkwj5fx7b7g41a2q"))))
+               (base32 "0mqhjlbp3fdqj3c9s8wib11fxmvvgd9xr9a3i8w5xf1sdpjfk6az"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
@@ -1001,6 +1003,7 @@ (define-public just
        #:cargo-inputs
        (("rust-ansi-term" ,rust-ansi-term-0.12)
         ("rust-atty" ,rust-atty-0.2)
+        ("rust-blake3" ,rust-blake3-1)
         ("rust-camino" ,rust-camino-1)
         ("rust-clap" ,rust-clap-2)
         ("rust-ctrlc" ,rust-ctrlc-3)
@@ -1008,8 +1011,8 @@ (define-public just
         ("rust-dirs" ,rust-dirs-5)
         ("rust-dotenvy" ,rust-dotenvy-0.15)
         ("rust-edit-distance" ,rust-edit-distance-2)
-        ("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-heck" ,rust-heck-0.4)
+        ("rust-env-logger" ,rust-env-logger-0.11)
+        ("rust-heck" ,rust-heck-0.5)
         ("rust-lexiclean" ,rust-lexiclean-0.0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
@@ -1021,7 +1024,7 @@ (define-public just
         ("rust-sha2" ,rust-sha2-0.10)
         ("rust-similar" ,rust-similar-2)
         ("rust-snafu" ,rust-snafu-0.8)
-        ("rust-strum" ,rust-strum-0.25)
+        ("rust-strum" ,rust-strum-0.26)
         ("rust-target" ,rust-target-2)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-typed-arena" ,rust-typed-arena-2)
@@ -1032,7 +1035,7 @@ (define-public just
         ("rust-executable-path" ,rust-executable-path-1)
         ("rust-pretty-assertions" ,rust-pretty-assertions-1)
         ("rust-temptree" ,rust-temptree-0.2)
-        ("rust-which" ,rust-which-5)
+        ("rust-which" ,rust-which-6)
         ("rust-yaml-rust" ,rust-yaml-rust-0.4))
        #:phases
        (modify-phases %standard-phases
@@ -1062,24 +1065,24 @@ (define-public just
                     (elvish-completions-dir
                      (string-append share "/elvish/lib"))
                     (just (if ,(%current-target-system)
-                          (search-input-file native-inputs "/bin/just")
-                          (string-append out "/bin/just"))))
+                              (search-input-file native-inputs "/bin/just")
+                              (string-append out "/bin/just"))))
                (install-file "man/just.1" man1)
                (mkdir-p bash-completions-dir)
                (with-output-to-file
-                 (string-append bash-completions-dir "/just")
+                   (string-append bash-completions-dir "/just")
                  (lambda _ (invoke just "--completions" "bash")))
                (mkdir-p zsh-completions-dir)
                (with-output-to-file
-                 (string-append zsh-completions-dir "/_just")
+                   (string-append zsh-completions-dir "/_just")
                  (lambda _ (invoke just "--completions" "zsh")))
                (mkdir-p fish-completions-dir)
                (with-output-to-file
-                 (string-append fish-completions-dir "/just.fish")
+                   (string-append fish-completions-dir "/just.fish")
                  (lambda _ (invoke just "--completions" "fish")))
                (mkdir-p elvish-completions-dir)
                (with-output-to-file
-                 (string-append elvish-completions-dir "/just")
+                   (string-append elvish-completions-dir "/just")
                  (lambda _ (invoke just "--completions" "elvish")))))))))
     (native-inputs (if (%current-target-system)
                        (list this-package)
-- 
2.41.0

bug#71059: close false issues

[Julian Flake]

should've been part of the series 71052

[bug#71052] [PATCH v2 0/9] gnu: just: Update to 1.26.0.

[Julian Flake]

This patch series updates 'just' and its dependencies to recent version.

Resending as v2, because of a failure in sending the mail correctly at first attempt. Hoping that this is correct now :-)

Julian Flake (9):
  Update rust-home
  Update rust-heck
  Update rust-libc
  Update rust-regex(-automata)
  Update rust-rustfix
  Update rust-strum(-macros)
  Update rust-which
  Added rust-winsafe
  Update just

 gnu/packages/crates-io.scm | 135 ++++++++++++++++++++++++++++---------
 gnu/packages/rust-apps.scm |  27 ++++----
 2 files changed, 118 insertions(+), 44 deletions(-)


base-commit: e9b25a6c6c626a560d28a1f732e6e5d362d584a4
-- 
2.41.0

[bug#71052] [PATCH v2 1/9] Update rust-home

[Julian Flake]

Change-Id: Id7672387f72592e5144a2406ee1168fe471d215a
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cce3e8b0b1..365db079b6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27912,14 +27912,14 @@ (define-public rust-half-1
 (define-public rust-home-0.5
   (package
     (name "rust-home")
-    (version "0.5.5")
+    (version "0.5.9")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "home" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1nqx1krijvpd03d96avsdyknd12h8hs3xhxwgqghf8v9xxzc4i2l"))))
+        (base32 "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.48))))
-- 
2.41.0

[bug#71052] [PATCH v2 2/9] Update rust-heck

[Julian Flake]

Change-Id: I7edaffd33fd725a2554e2cc6b89fb88b9e28f73a
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 365db079b6..78b529946a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28512,17 +28512,17 @@ (define-public rust-heapsize-plugin-0.1
 total runtime size of an object on the heap")
     (license license:mpl2.0)))
 
-(define-public rust-heck-0.4
+(define-public rust-heck-0.5
   (package
     (name "rust-heck")
-    (version "0.4.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "heck" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m"))))
+        (base32 "1sjmpsdl8czyh9ywl3qcsfsq9a307dg4ni2vnlwgnzzqhc4y0113"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -28536,6 +28536,19 @@ (define-public rust-heck-0.4
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-heck-0.4
+  (package
+    (inherit rust-heck-0.5)
+    (name "rust-heck")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "heck" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m"))))))
+
 (define-public rust-heck-0.3
   (package
     (inherit rust-heck-0.4)
-- 
2.41.0

[bug#71052] [PATCH v2 3/9] Update rust-libc

[Julian Flake]

Change-Id: I6c1a6964bcae27070abbbb8814318310b61fe6e1
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 78b529946a..bac96f98aa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33584,14 +33584,14 @@ (define-public rust-lexopt-0.3
 (define-public rust-libc-0.2
   (package
     (name "rust-libc")
-    (version "0.2.151")
+    (version "0.2.155")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1x28f0zgp4zcwr891p8n9ag9w371sbib30vp4y6hi2052frplb9h"))))
+        (base32 "0z44c53z54znna8n322k5iwg80arxxpdzjj5260pxxzc9a58icwp"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
-- 
2.41.0

[bug#71052] [PATCH v2 4/9] Update rust-regex(-automata)

[Julian Flake]

Change-Id: I271d17efba25a1992c6c549c745858b022f6b9a8
---
 gnu/packages/crates-io.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bac96f98aa..664ab48f70 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54404,14 +54404,14 @@ (define-public rust-refpool-0.4
 (define-public rust-regex-1
   (package
     (name "rust-regex")
-    (version "1.10.2")
+    (version "1.10.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq"))))
+        (base32 "0k5sb0h2mkwf51ab0gvv3x38jp1q7wgxf63abfbhi0wwvvgxn5y1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -54439,14 +54439,14 @@ (define-public rust-regex-0.2
     (name "rust-regex")
     (version "0.2.11")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "regex" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1163ir1k5zjspirfjl4wqbviwrxlhmfwy95xxb69y4irkv4snack"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "regex" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1163ir1k5zjspirfjl4wqbviwrxlhmfwy95xxb69y4irkv4snack"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -54492,14 +54492,14 @@ (define-public rust-regex-0.1
 (define-public rust-regex-automata-0.4
   (package
     (name "rust-regex-automata")
-    (version "0.4.3")
+    (version "0.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex-automata" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z"))))
+        (base32 "0akrxca6lw02y8fgvlypfg24dkfsz0bnnhgxaf9yrqh58h9s2zrv"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f          ; Not all files included.
-- 
2.41.0

[bug#71052] [PATCH v2 5/9] Update rust-rustfix

[Julian Flake]

Change-Id: I5fc44ef822bd94066a82f085d282ab4e017b8099
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 664ab48f70..9e729a7e5b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57570,14 +57570,14 @@ (define-public rust-rustfix-0.4
 (define-public rust-rustix-0.38
   (package
     (name "rust-rustix")
-    (version "0.38.28")
+    (version "0.38.30")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rustix" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "05m3vacvbqbg6r6ksmx9k5afpi0lppjdv712crrpsrfax2jp5rbj"))
+        (base32 "1jkb6bzrj2w9ffy35aw4q04mqk1yxqw35fz80x0c4cxgi9c988rj"))
        (snippet
         #~(begin (use-modules (guix build utils))
                  (for-each delete-file (find-files "." "\\.a$"))
-- 
2.41.0

[bug#71052] [PATCH v2 6/9] Update rust-strum(-macros)

[Julian Flake]

Change-Id: I9db32d170db7c59d6fdbc3aa46aea310297c7151
---
 gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9e729a7e5b..50684530a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65606,23 +65606,23 @@ (define-public rust-structopt-derive-0.2
      "Parse command line argument by defining a struct, derive crate.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-strum-0.25
+(define-public rust-strum-0.26
   (package
     (name "rust-strum")
-    (version "0.25.0")
+    (version "0.26.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"))))
+        (base32 "03kfgifxi4gh8bdq83kzzxp427ilg93k56ckfg3ikk56r0x42z0i"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; unresolved import `strum::EnumIter`
        #:cargo-inputs
        (("rust-phf" ,rust-phf-0.10)
-        ("rust-strum-macros" ,rust-strum-macros-0.25))
+        ("rust-strum-macros" ,rust-strum-macros-0.26))
        #:cargo-development-inputs
        (("rust-strum-macros" ,rust-strum-macros-0.25))))
     (home-page "https://github.com/Peternator7/strum")
@@ -65632,6 +65632,19 @@ (define-public rust-strum-0.25
 easier in Rust.")
     (license license:expat)))
 
+(define-public rust-strum-0.25
+  (package
+    (inherit rust-strum-0.26)
+    (name "rust-strum")
+    (version "0.25.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"))))))
+
 (define-public rust-strum-0.24
   (package
     (inherit rust-strum-0.25)
@@ -65720,17 +65733,17 @@ (define-public rust-strum-0.18
      `(#:cargo-inputs
        (("rust-strum-macros" ,rust-strum-macros-0.18))))))
 
-(define-public rust-strum-macros-0.25
+(define-public rust-strum-macros-0.26
   (package
     (name "rust-strum-macros")
-    (version "0.25.3")
+    (version "0.26.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum_macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13"))))
+        (base32 "0in9jvbb3g16x8fj7lf91vwzj98319hj3z8lpaaa9h42ybd5kky6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
@@ -65745,6 +65758,19 @@ (define-public rust-strum-macros-0.25
      "This crate provides helpful macros for working with enums and strings.")
     (license license:expat)))
 
+(define-public rust-strum-macros-0.25
+  (package
+    (inherit rust-strum-macros-0.26)
+    (name "rust-strum-macros")
+    (version "0.25.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13"))))))
+
 (define-public rust-strum-macros-0.24
   (package
     (inherit rust-strum-macros-0.25)
-- 
2.41.0

[bug#71052] [PATCH v2 7/9] Update rust-which

[Julian Flake]

Change-Id: Ib1e9a41dfc121edde6ed980eae3bc44dda090e8b
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 50684530a2..3a07c11996 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77999,17 +77999,17 @@ (define-public rust-wepoll-sys-stjepang-1
 using @code{bindgen}.")
     (license license:mpl2.0)))
 
-(define-public rust-which-5
+(define-public rust-which-6
   (package
     (name "rust-which")
-    (version "5.0.0")
+    (version "6.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "which" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"))
+        (base32 "1mz0vijj9qvsmfqkjqw3wf8zqn19p2x0gg7gzfnhaa1bibsy84c2"))
        (modules '((guix build utils)))
        (snippet
         '(begin (substitute* "Cargo.toml"
@@ -78026,7 +78026,8 @@ (define-public rust-which-5
                        ("rust-once-cell" ,rust-once-cell-1)
                        ("rust-regex" ,rust-regex-1)
                        ("rust-rustix" ,rust-rustix-0.38)
-                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+                       ("rust-windows-sys" ,rust-windows-sys-0.48) ; not needed in 6 anymore
+                       ("rust-winsafe" ,rust-winsafe-0.0.19))
        #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/harryfei/which-rs.git")
     (synopsis "Rust equivalent of @command{which}")
@@ -78036,6 +78037,20 @@ (define-public rust-which-5
 executable.")
     (license license:expat)))
 
+
+(define-public rust-which-5
+  (package
+    (inherit rust-which-6)
+    (name "rust-which")
+    (version "5.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "which" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"))))))
+
 (define-public rust-which-4
   (package
     (inherit rust-which-5)
-- 
2.41.0

[bug#71052] [PATCH v2 8/9] Added rust-winsafe

[Julian Flake]

Change-Id: Iba8c0af1ffec1d29d2442b09518a8a35e86a14e0
---
 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 3a07c11996..8efbaa67a4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -80027,6 +80027,23 @@ (define-public rust-zvariant-utils-1
     (description "Various utilities used internally by the zvariant crate.")
     (license license:expat)))
 
+(define-public rust-winsafe-0.0.19
+  (package
+    (name "rust-winsafe")
+    (version "0.0.19")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "winsafe" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0169xy9mjma8dys4m8v4x0xhw2gkbhv2v1wsbvcjl9bhnxxd2dfi"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rodrigocfd/winsafe")
+    (synopsis "Windows API and GUI in safe, idiomatic Rust.")
+    (description "Windows API and GUI in safe, idiomatic Rust containing low-level Win32 API constants, functions, structs and high-level structs to build native Win32 GUI application.")
+    (license license:expat)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#71052] [PATCH v2 9/9] Update just

[Julian Flake]

Change-Id: I975f6559bbb7a9a92f90ae773889e4e77c96d3df
---
 gnu/packages/rust-apps.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d73bd1a030..08cc5228cb 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
+;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -70,6 +71,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages crates-vcs)
   #:use-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages emacs)
@@ -984,13 +986,13 @@ (define-public i3status-rust
 (define-public just
   (package
     (name "just")
-    (version "1.23.0")
+    (version "1.26.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "just" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0wpjv098a2yymsb41h6104cdia4gb6hwwh05pkwj5fx7b7g41a2q"))))
+               (base32 "0mqhjlbp3fdqj3c9s8wib11fxmvvgd9xr9a3i8w5xf1sdpjfk6az"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags
@@ -1001,6 +1003,7 @@ (define-public just
        #:cargo-inputs
        (("rust-ansi-term" ,rust-ansi-term-0.12)
         ("rust-atty" ,rust-atty-0.2)
+        ("rust-blake3" ,rust-blake3-1)
         ("rust-camino" ,rust-camino-1)
         ("rust-clap" ,rust-clap-2)
         ("rust-ctrlc" ,rust-ctrlc-3)
@@ -1008,8 +1011,8 @@ (define-public just
         ("rust-dirs" ,rust-dirs-5)
         ("rust-dotenvy" ,rust-dotenvy-0.15)
         ("rust-edit-distance" ,rust-edit-distance-2)
-        ("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-heck" ,rust-heck-0.4)
+        ("rust-env-logger" ,rust-env-logger-0.11)
+        ("rust-heck" ,rust-heck-0.5)
         ("rust-lexiclean" ,rust-lexiclean-0.0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-log" ,rust-log-0.4)
@@ -1021,7 +1024,7 @@ (define-public just
         ("rust-sha2" ,rust-sha2-0.10)
         ("rust-similar" ,rust-similar-2)
         ("rust-snafu" ,rust-snafu-0.8)
-        ("rust-strum" ,rust-strum-0.25)
+        ("rust-strum" ,rust-strum-0.26)
         ("rust-target" ,rust-target-2)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-typed-arena" ,rust-typed-arena-2)
@@ -1032,7 +1035,7 @@ (define-public just
         ("rust-executable-path" ,rust-executable-path-1)
         ("rust-pretty-assertions" ,rust-pretty-assertions-1)
         ("rust-temptree" ,rust-temptree-0.2)
-        ("rust-which" ,rust-which-5)
+        ("rust-which" ,rust-which-6)
         ("rust-yaml-rust" ,rust-yaml-rust-0.4))
        #:phases
        (modify-phases %standard-phases
@@ -1062,24 +1065,24 @@ (define-public just
                     (elvish-completions-dir
                      (string-append share "/elvish/lib"))
                     (just (if ,(%current-target-system)
-                          (search-input-file native-inputs "/bin/just")
-                          (string-append out "/bin/just"))))
+                              (search-input-file native-inputs "/bin/just")
+                              (string-append out "/bin/just"))))
                (install-file "man/just.1" man1)
                (mkdir-p bash-completions-dir)
                (with-output-to-file
-                 (string-append bash-completions-dir "/just")
+                   (string-append bash-completions-dir "/just")
                  (lambda _ (invoke just "--completions" "bash")))
                (mkdir-p zsh-completions-dir)
                (with-output-to-file
-                 (string-append zsh-completions-dir "/_just")
+                   (string-append zsh-completions-dir "/_just")
                  (lambda _ (invoke just "--completions" "zsh")))
                (mkdir-p fish-completions-dir)
                (with-output-to-file
-                 (string-append fish-completions-dir "/just.fish")
+                   (string-append fish-completions-dir "/just.fish")
                  (lambda _ (invoke just "--completions" "fish")))
                (mkdir-p elvish-completions-dir)
                (with-output-to-file
-                 (string-append elvish-completions-dir "/just")
+                   (string-append elvish-completions-dir "/just")
                  (lambda _ (invoke just "--completions" "elvish")))))))))
     (native-inputs (if (%current-target-system)
                        (list this-package)
-- 
2.41.0