[bug#67958] [PATCH 0/7 rust-team] gnu: just: Update to 1.17.0

[bug#67958] [PATCH 0/7 rust-team] gnu: just: Update to 1.17.0

[Jaeme Sifat via Guix-patches via]

This patch set updates the 'just' build tool to version 1.17. It's
also a version rebump of a Rust binary crate that doesn't hit the
double digits which is always welcomed.

The build code for 'just' was refactored in a similar way to
'ripgrep@14,' adding the binary as a native-input depending on the
target system.

Jaeme Sifat (7):
  gnu: rust-regex-syntax-0.7: Update to 0.7.5.
  gnu: rust-regex-automata-0.3: Update to 0.3.9.
  gnu: Add rust-regex-1.9.
  gnu: Add rust-which-5.
  gnu: rust-heck-0.4: Update to 0.4.1.
  gnu: Add rust-strum-0.25.
  gnu: just: Update to 1.17.0.

 gnu/packages/crates-io.scm | 155 +++++++++++++++++++++++++++--------
 gnu/packages/rust-apps.scm | 163 ++++++++++++++++++++-----------------
 2 files changed, 206 insertions(+), 112 deletions(-)


base-commit: 2f9f39f44108884669e7201c8fbf7f7d39e65ff2
--
2.41.0

[bug#67958] [PATCH 1/7] gnu: rust-regex-syntax-0.7: Update to 0.7.5.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-regex-syntax-0.7): Update to 0.7.5.

Change-Id: Ib71b09c31124530726de473638f575cae725cf11
---
 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 54646a4549..43d8c88200 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62960,14 +62960,14 @@ (define-public rust-regex-syntax-0.7
   (package
     (inherit rust-regex-syntax-0.8)
     (name "rust-regex-syntax")
-    (version "0.7.4")
+    (version "0.7.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "regex-syntax" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1qjczlc2w92kamn9ipjdr5pjql0jnccahpi9l3r6wp0rnsjr5sp5"))))
+                "1nhjmqdlakfi4yb8lh7vbbh71dsy90jjvrjvvnrih6larldgpdfv"))))
     (arguments
      `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1))))))
 
-- 
2.41.0

[bug#67958] [PATCH 2/7] gnu: rust-regex-automata-0.3: Update to 0.3.9.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-regex-automata-0.3): Update to 0.3.9.

Change-Id: Ie7b8863290959112477ca2c315541a8701527607
---
 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 43d8c88200..bb2b188dd6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62887,14 +62887,14 @@ (define-public rust-regex-automata-0.3
   (package
     (inherit rust-regex-automata-0.4)
     (name "rust-regex-automata")
-    (version "0.3.3")
+    (version "0.3.9")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "regex-automata" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "041kj8fnyh3hv8sqmqq1am6agb1ckjxj6swjfcp8qih7vl84qd9r"))))
+                "1agg6ymbgjydj3q31ay6dbzgp3i5cnrnygpylczqj623xs93xcjr"))))
     (arguments
      `(#:tests? #f          ; Not all files included.
        #:cargo-inputs
-- 
2.41.0

[bug#67958] [PATCH 3/7] gnu: Add rust-regex-1.9.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-regex-1.9): New variable.

Change-Id: If52368ce7297a51051dab14f1079bf4ae7ce0fc7
---
 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 bb2b188dd6..8fbbe6a658 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62795,6 +62795,32 @@ (define-public rust-regex-1
 uses finite automata and guarantees linear time matching on all inputs.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-regex-1.9
+  (package
+    (inherit rust-regex-1)
+    (name "rust-regex")
+    (version "1.9.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "regex" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zs4h2swgfqsspj11jqqs7k66vbdmq222rwbid9byva00la21vpb"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-aho-corasick" ,rust-aho-corasick-1)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-regex-automata" ,rust-regex-automata-0.3)
+        ("rust-regex-syntax" ,rust-regex-syntax-0.7))
+       #:cargo-development-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-quickcheck" ,rust-quickcheck-1)
+        ("rust-regex-test" ,rust-regex-test-0.1))))))
+
 (define-public rust-regex-0.2
   (package
     (inherit rust-regex-1)
-- 
2.41.0

[bug#67958] [PATCH 4/7] gnu: Add rust-which-5.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-which-5): New variable.

Change-Id: I6a02f57efc2b80059c8a23ea51bff61cd0713825
---
 gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8fbbe6a658..ea6d6eeb84 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89608,25 +89608,28 @@ (define-public rust-wepoll-sys-stjepang-1
 using @code{bindgen}.")
     (license license:mpl2.0)))
 
-(define-public rust-which-4
+(define-public rust-which-5
   (package
     (name "rust-which")
-    (version "4.3.0")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "which" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0yybp94wikf21vkcl8b6w6l5pnd95nl4fxryz669l4lyxsxiz0qw"))))
+        (base32 "053fpbczryyn8lcbpkvwl8v2rzld0pr30r5lh1cxv87kjs2ymwwv"))))
     (build-system cargo-build-system)
     (arguments
-     (list #:skip-build? #t
-           #:cargo-inputs
-           `(("rust-either" ,rust-either-1)
-             ("rust-libc" ,rust-libc-0.2)
-             ("rust-once-cell" ,rust-once-cell-1)
-             ("rust-regex" ,rust-regex-1))))
+     `(#:cargo-test-flags '("--release" "--"
+                            "--skip=it_works")
+       #:cargo-inputs (("rust-either" ,rust-either-1)
+                       ("rust-home" ,rust-home-0.5)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1.9)
+                       ("rust-rustix" ,rust-rustix-0.38)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/harryfei/which-rs.git")
     (synopsis "Rust equivalent of @command{which}")
     (description
@@ -89635,6 +89638,26 @@ (define-public rust-which-4
 executable.")
     (license license:expat)))
 
+(define-public rust-which-4
+  (package
+    (inherit rust-which-5)
+    (name "rust-which")
+    (version "4.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "which" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0yybp94wikf21vkcl8b6w6l5pnd95nl4fxryz669l4lyxsxiz0qw"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-either" ,rust-either-1)
+             ("rust-libc" ,rust-libc-0.2)
+             ("rust-once-cell" ,rust-once-cell-1)
+             ("rust-regex" ,rust-regex-1))))))
+
 (define-public rust-which-3
   (package
     (inherit rust-which-4)
-- 
2.41.0

[bug#67958] [PATCH 5/7] gnu: rust-heck-0.4: Update to 0.4.1.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-heck-0.4): Update to 0.4.1.
[arguments]: Allow building.
* gnu/packages/crates-io.scm (rust-heck-0.3): Inherit directly from 0.4.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ea6d6eeb84..cb1bdc9962 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35353,19 +35353,17 @@ (define-public rust-heapsize-plugin-0.1
 (define-public rust-heck-0.4
   (package
     (name "rust-heck")
-    (version "0.4.0")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "heck" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1ygphsnfwl2xpa211vbqkz1db6ri1kvkg8p8sqybi37wclg7fh15"))))
+        (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build?
-       #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))
     (home-page "https://github.com/withoutboats/heck")
     (synopsis "Case conversion library")
@@ -35388,11 +35386,7 @@ (define-public rust-heck-0.3
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1b56s2c1ymdd0qmy31bw0ndhm31hcdamnhg3npp7ssrmc1ag9jw7"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
+          "1b56s2c1ymdd0qmy31bw0ndhm31hcdamnhg3npp7ssrmc1ag9jw7"))))))
 
 (define-public rust-hermit-abi-0.3
   (package
-- 
2.41.0

[bug#67958] [PATCH 6/7] gnu: Add rust-strum-0.25.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/crates-io.scm (rust-strum-0.25): New variable.
* gnu/packages/crates-io.scm (rust-strum-macros-0.25): New variable.

Change-Id: I6501b29c09bfd0525336a1e61e8faaba58a6b3a7
---
 gnu/packages/crates-io.scm | 66 ++++++++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cb1bdc9962..4ac932430d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75744,25 +75744,25 @@ (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.24
+(define-public rust-strum-0.25
   (package
     (name "rust-strum")
-    (version "0.24.1")
+    (version "0.25.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gz6cjhlps5idwasznklxdh2zsas6mxf99vr0n27j876q12n0gh6"))))
+        (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f          ; Doc tests fail.
+     `(#:tests? #f
        #:cargo-inputs
        (("rust-phf" ,rust-phf-0.10)
-        ("rust-strum-macros" ,rust-strum-macros-0.24))
+        ("rust-strum-macros" ,rust-strum-macros-0.25))
        #:cargo-development-inputs
-       (("rust-strum-macros" ,rust-strum-macros-0.24))))
+       (("rust-strum-macros" ,rust-strum-macros-0.25))))
     (home-page "https://github.com/Peternator7/strum")
     (synopsis "Set of traits for working with enums and strings")
     (description
@@ -75770,6 +75770,26 @@ (define-public rust-strum-0.24
 easier in Rust.")
     (license license:expat)))
 
+(define-public rust-strum-0.24
+  (package
+    (inherit rust-strum-0.25)
+    (name "rust-strum")
+    (version "0.24.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0gz6cjhlps5idwasznklxdh2zsas6mxf99vr0n27j876q12n0gh6"))))
+    (arguments
+     `(#:tests? #f          ; Doc tests fail.
+       #:cargo-inputs
+       (("rust-phf" ,rust-phf-0.10)
+        ("rust-strum-macros" ,rust-strum-macros-0.24))
+       #:cargo-development-inputs
+       (("rust-strum-macros" ,rust-strum-macros-0.24))))))
+
 (define-public rust-strum-0.21
   (package
     (inherit rust-strum-0.24)
@@ -75838,8 +75858,34 @@ (define-public rust-strum-0.18
      `(#:cargo-inputs
        (("rust-strum-macros" ,rust-strum-macros-0.18))))))
 
+(define-public rust-strum-macros-0.25
+  (package
+    (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"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-rustversion" ,rust-rustversion-1)
+                       ("rust-syn" ,rust-syn-2))
+       #:cargo-development-inputs (("rust-strum" ,rust-strum-0.25))))
+    (home-page "https://github.com/Peternator7/strum")
+    (synopsis "Set of macros for working with enums and strings")
+    (description
+     "This crate provides helpful macros for working with enums and strings.")
+    (license license:expat)))
+
 (define-public rust-strum-macros-0.24
   (package
+    (inherit rust-strum-macros-0.25)
     (name "rust-strum-macros")
     (version "0.24.3")
     (source
@@ -75849,7 +75895,6 @@ (define-public rust-strum-macros-0.24
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0naxz2y38kwq5wgirmia64vvf6qhwy8j367rw966n62gsbh5nf0y"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-heck" ,rust-heck-0.4)
@@ -75858,12 +75903,7 @@ (define-public rust-strum-macros-0.24
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-syn" ,rust-syn-1))
        #:cargo-development-inputs
-       (("rust-strum" ,rust-strum-0.24))))
-    (home-page "https://github.com/Peternator7/strum")
-    (synopsis "Set of macros for working with enums and strings")
-    (description
-     "This crate provides helpful macros for working with enums and strings.")
-    (license license:expat)))
+       (("rust-strum" ,rust-strum-0.24))))))
 
 (define-public rust-strum-macros-0.21
   (package
-- 
2.41.0

[bug#67958] [PATCH 7/7] gnu: just: Update to 1.17.0.

[Jaeme Sifat via Guix-patches via]

* gnu/packages/rust-apps.scm (just): Update to 1.17.0.
[arguments]: Use gexps. Merge 'install-manpage and 'install-completions.
[native-inputs]: New field for cross-compilation.

Change-Id: I33974d48d9d416a02c41c47f035f219ade12de88
---
 gnu/packages/rust-apps.scm | 163 ++++++++++++++++++++-----------------
 1 file changed, 87 insertions(+), 76 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 4454178624..e20fecb87a 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -844,93 +844,104 @@ (define-public i3status-rust
 (define-public just
   (package
     (name "just")
-    (version "1.14.0")
+    (version "1.17.0")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "just" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "0kafd87zmjf7wswyiqakqd2r5b8q3a761ipsihmrg9wr57k5zlis"))))
+               (base32 "1nlwrbawgg6sysfydi2334y4pbsinq50axnqm0cz0m29r8n0ljxd"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=functions::env_var_functions"
-         "--skip=string::shebang_backtick")
+     (list
+      #:cargo-test-flags
+      '(list "--release" "--"
+             "--skip=functions::env_var_functions"
+             "--skip=string::shebang_backtick")
        #:install-source? #f
        #:cargo-inputs
-       (("rust-ansi-term" ,rust-ansi-term-0.12)
-        ("rust-atty" ,rust-atty-0.2)
-        ("rust-camino" ,rust-camino-1)
-        ("rust-clap" ,rust-clap-2)
-        ("rust-ctrlc" ,rust-ctrlc-3)
-        ("rust-derivative" ,rust-derivative-2)
-        ("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-lexiclean" ,rust-lexiclean-0.0.1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-regex" ,rust-regex-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-sha2" ,rust-sha2-0.10)
-        ("rust-similar" ,rust-similar-2)
-        ("rust-snafu" ,rust-snafu-0.7)
-        ("rust-strum" ,rust-strum-0.24)
-        ("rust-target" ,rust-target-2)
-        ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-typed-arena" ,rust-typed-arena-2)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-uuid" ,rust-uuid-1))
+       `(("rust-ansi-term" ,rust-ansi-term-0.12)
+         ("rust-atty" ,rust-atty-0.2)
+         ("rust-camino" ,rust-camino-1)
+         ("rust-clap" ,rust-clap-2)
+         ("rust-ctrlc" ,rust-ctrlc-3)
+         ("rust-derivative" ,rust-derivative-2)
+         ("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-lexiclean" ,rust-lexiclean-0.0.1)
+         ("rust-libc" ,rust-libc-0.2)
+         ("rust-log" ,rust-log-0.4)
+         ("rust-num-cpus" ,rust-num-cpus-1)
+         ("rust-regex" ,rust-regex-1)
+         ("rust-semver" ,rust-semver-1)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-serde-json" ,rust-serde-json-1)
+         ("rust-sha2" ,rust-sha2-0.10)
+         ("rust-similar" ,rust-similar-2)
+         ("rust-snafu" ,rust-snafu-0.7)
+         ("rust-strum" ,rust-strum-0.25)
+         ("rust-target" ,rust-target-2)
+         ("rust-tempfile" ,rust-tempfile-3)
+         ("rust-typed-arena" ,rust-typed-arena-2)
+         ("rust-unicode-width" ,rust-unicode-width-0.1)
+         ("rust-uuid" ,rust-uuid-1))
        #:cargo-development-inputs
-       (("rust-cradle" ,rust-cradle-0.2)
-        ("rust-executable-path" ,rust-executable-path-1)
-        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
-        ("rust-temptree" ,rust-temptree-0.2)
-        ("rust-which" ,rust-which-4)
-        ("rust-yaml-rust" ,rust-yaml-rust-0.4))
+       `(("rust-cradle" ,rust-cradle-0.2)
+         ("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-yaml-rust" ,rust-yaml-rust-0.4))
        #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'replace-hardcoded-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* (cons "src/justfile.rs"
-                                (find-files "tests/" "\\.rs$"))
-               (("/bin/sh")
-                (search-input-file inputs "/bin/sh"))
-               (("/usr/bin/env sh")
-                (search-input-file inputs "/bin/sh"))
-               (("/usr/bin/env")
-                (search-input-file inputs "/bin/env"))
-               (("/bin/echo")
-                (search-input-file inputs "/bin/echo")))))
-         (add-after 'install 'install-manpage
-           (lambda* (#:key outputs #:allow-other-keys)
-             (install-file "man/just.1"
-                           (string-append (assoc-ref outputs "out")
-                                          "/share/man/man1"))))
-         (add-after 'install 'install-completions
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (share (string-append out "/share"))
-                    (just (string-append out "/bin/just")))
-               (mkdir-p (string-append share "/bash-completion/completions"))
-               (with-output-to-file
-                 (string-append share "/bash-completion/completions/just")
-                 (lambda _ (invoke just "--completions" "bash")))
-               (mkdir-p (string-append share "/fish/vendor_completions.d"))
-               (with-output-to-file
-                 (string-append share "/fish/vendor_completions.d/just.fish")
-                 (lambda _ (invoke just "--completions" "fish")))
-               (mkdir-p (string-append share "/zsh/site-functions"))
-               (with-output-to-file
-                 (string-append share "/zsh/site-functions/_just")
-                 (lambda _ (invoke just "--completions" "zsh")))
-               (mkdir-p (string-append share "/elvish/lib"))
-               (with-output-to-file
-                 (string-append share "/elvish/lib/just")
-                 (lambda _ (invoke just "--completions" "elvish")))))))))
+       #~(modify-phases %standard-phases
+           (add-after 'unpack 'replace-hardcoded-paths
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* (cons "src/justfile.rs"
+                                  (find-files "tests/" "\\.rs$"))
+                 (("/bin/sh")
+                  (search-input-file inputs "/bin/sh"))
+                 (("/usr/bin/env sh")
+                  (search-input-file inputs "/bin/sh"))
+                 (("/usr/bin/env")
+                  (search-input-file inputs "/bin/env"))
+                 (("/bin/echo")
+                  (search-input-file inputs "/bin/echo")))))
+           (add-after 'install 'install-extras
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (share (string-append out "/share"))
+                      (man1 (string-append share "/man/man1"))
+                      (bash-completions-dir
+                       (string-append share "/bash-completion/completions"))
+                      (zsh-completions-dir
+                       (string-append share "/zsh/site-functions"))
+                      (fish-completions-dir
+                       (string-append share "/fish/vendor_completions.d"))
+                      (elvish-completions-dir
+                       (string-append share "/elvish/lib"))
+                      (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")
+                   (lambda _ (invoke just "--completions" "bash")))
+                 (mkdir-p zsh-completions-dir)
+                 (with-output-to-file
+                     (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")
+                   (lambda _ (invoke just "--completions" "fish")))
+                 (mkdir-p elvish-completions-dir)
+                 (with-output-to-file
+                     (string-append elvish-completions-dir "/just")
+                   (lambda _ (invoke just "--completions" "elvish")))))))))
+    (native-inputs  (if (%current-target-system)
+                        (list this-package)
+                        '()))
     (inputs (list bash-minimal coreutils-minimal))
     (home-page "https://github.com/casey/just")
     (synopsis "Just a command runner")
-- 
2.41.0

bug#67958: [PATCH 0/7 rust-team] gnu: just: Update to 1.17.0

[Efraim Flashner]

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

Thanks for the patches. I had previously packaged rust-which-5 and made
it build with the newer version of rust-regex-1 so I was able to drop
those patches. I undid the change to gexps on just so I could see a
clearer diff of the version upgrade and I adjusted the 'install-extras
phase to use the native just when creating the shell completions for the
cross-compiled one.

Patches added to the rust-team branch.

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