[bug#66134] [PATCH 00/12] Add just

[bug#66134] [PATCH 00/12] Add just

[Andrew Jose]

The following patches add the crates required
for just (https://github.com/casey/just) in
dependency order, a patch to make the tests pass,
and finally, just in rust-apps.scm

Andrew Jose (12):
  gnu: add rust-executable-path-1
  gnu: add rust-snafu-derive-0.7
  gnu: add rust-snafu-0.7
  gnu: add rust-lexiclean-0.0.1
  gnu: add rust-strum-macros-0.24
  gnu: add rust-strum-0.24
  gnu: add rust-dotenvy-0.15
  gnu: add rust-cradle-0.2
  gnu: add rust-target-2
  gnu: add rust-temptree-0.2
  gnu: add patch for just
  gnu: add just

 gnu/packages/crates-io.scm                  | 224 +++++++++++++++++++-
 gnu/packages/patches/just-remove-test.patch |  61 ++++++
 gnu/packages/rust-apps.scm                  |  71 +++++++
 3 files changed, 348 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/just-remove-test.patch


base-commit: 15c5f1a2c20b21de0f19f42db1ccab4c42117ebb
-- 
2.34.1

[bug#66134] [PATCH 01/12] gnu: add rust-executable-path-1

[Andrew Jose]

---
 gnu/packages/crates-io.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3c83563c45..eaeeb1fa00 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -23179,6 +23179,24 @@ (define-public rust-event-listener-2
 blocking data structures.")
     (license (list license:asl2.0 license:expat))))
 
+
+(define-public rust-executable-path-1
+  (package
+    (name "rust-executable-path")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "executable-path" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0y0lhhrx9f9q1f81am3b20f8znixjcvqfg7kx220pjg3i5nmmg1y"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/casey/rust-executable-path")
+    (synopsis "Get the path of a binary target's executable")
+    (description "Get the path of a binary target's executable")
+    (license license:cc0)))
+
 (define-public rust-executors-0.9
   (package
     (name "rust-executors")
-- 
2.34.1

[bug#66134] [PATCH 02/12] gnu: add rust-snafu-derive-0.7

[Andrew Jose]

inherit from rust-snafu-derive-0.6
[cargo-inputs]: add rust-heck-0.4
---
 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 eaeeb1fa00..8ea1d7be50 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62843,6 +62843,23 @@ (define-public rust-snafu-derive-0.6
 package provides derive macros.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-snafu-derive-0.7
+  (package
+    (inherit rust-snafu-derive-0.6)
+    (version "0.7.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "snafu-derive" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1gzy9rzggs090zf7hfvgp4lm1glrmg9qzh796686jnq7bxk7j04r"))))
+    (arguments
+     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-snafu-0.6
   (package
     (name "rust-snafu")
-- 
2.34.1

[bug#66134] [PATCH 03/12] gnu: add rust-snafu-0.7

[Andrew Jose]

rust-snafu-0.7: inherit from rust-snafu-0.6
[cargo-inputs]: use only rust-futures-0.3, use rust-snafu-derive-0.7

rust-snafu-derive-0.7: indent cargo-inputs like rest of file
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8ea1d7be50..1c47b0e53b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62855,10 +62855,11 @@ (define-public rust-snafu-derive-0.7
                (base32
                 "1gzy9rzggs090zf7hfvgp4lm1glrmg9qzh796686jnq7bxk7j04r"))))
     (arguments
-     `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
-                       ("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1)
-                       ("rust-syn" ,rust-syn-1))))))
+     `(#:cargo-inputs
+       (("rust-heck" ,rust-heck-0.4)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
 
 (define-public rust-snafu-0.6
   (package
@@ -62886,6 +62887,26 @@ (define-public rust-snafu-0.6
     (description "Snafu aims to be an ergonomic error handling library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-snafu-0.7
+  (package
+    (inherit rust-snafu-0.6)
+    (version "0.7.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "snafu" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1mj2j2gfbf8mm1hr02zrbrqrh2zp01f61xgkx0lpln2w0ankgpp4"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-backtrace" ,rust-backtrace-0.3)
+        ("rust-doc-comment" ,rust-doc-comment-0.3)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-futures-core" ,rust-futures-core-0.3)
+        ("rust-pin-project" ,rust-pin-project-1)
+        ("rust-snafu-derive" ,rust-snafu-derive-0.7))))))
+
 (define-public rust-snap-1
   (package
     (name "rust-snap")
-- 
2.34.1

[bug#66134] [PATCH 04/12] gnu: add rust-lexiclean-0.0.1

[Andrew Jose]

---
 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 1c47b0e53b..b7c188ca49 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34552,6 +34552,23 @@ (define-public rust-lexical-6
 nor a system allocator.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-lexiclean-0.0.1
+  (package
+    (name "rust-lexiclean")
+    (version "0.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "lexiclean" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1rb8sky7gi75a7xxn6xrfkrbqkp465npm54p5s89ysqhgc0ja4j4"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/casey/lexiclean")
+    (synopsis "Lexically clean paths")
+    (description "Lexically clean paths")
+    (license license:cc0)))
+
 (define-public rust-lexopt-0.3
   (package
     (name "rust-lexopt")
-- 
2.34.1

[bug#66134] [PATCH 05/12] gnu: add rust-strum-macros-0.24

[Andrew Jose]

rust-strum-macros-0.21: inherit from rust-strum-macros-0.24
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b7c188ca49..4230a1b7a8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65175,24 +65175,25 @@ (define-public rust-strum-0.18
      `(#:cargo-inputs
        (("rust-strum-macros" ,rust-strum-macros-0.18))))))
 
-(define-public rust-strum-macros-0.21
+(define-public rust-strum-macros-0.24
   (package
     (name "rust-strum-macros")
-    (version "0.21.1")
+    (version "0.24.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum_macros" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1v55b1in7dn07s6vxr8dajqpvxkxjbfq6qamnjgcbnq9x3pawsnh"))))
+        (base32 "0naxz2y38kwq5wgirmia64vvf6qhwy8j367rw966n62gsbh5nf0y"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
+       (("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-1))))
     (home-page "https://github.com/Peternator7/strum")
     (synopsis "Set of macros for working with enums and strings")
@@ -65200,6 +65201,26 @@ (define-public rust-strum-macros-0.21
      "This crate provides helpful macros for working with enums and strings.")
     (license license:expat)))
 
+(define-public rust-strum-macros-0.21
+  (package
+    (inherit rust-strum-macros-0.24)
+    (name "rust-strum-macros")
+    (version "0.21.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v55b1in7dn07s6vxr8dajqpvxkxjbfq6qamnjgcbnq9x3pawsnh"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-heck" ,rust-heck-0.3)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))))))
+
 (define-public rust-strum-macros-0.20
   (package
     (inherit rust-strum-macros-0.21)
-- 
2.34.1

[bug#66134] [PATCH 06/12] gnu: add rust-strum-0.24

[Andrew Jose]

[cargo-inputs]: add rust-phf-0.10
rust-strum-0.24 inherit from rust-strum-0.24
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4230a1b7a8..7be551e89d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65101,22 +65101,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.21
+(define-public rust-strum-0.24
   (package
     (name "rust-strum")
-    (version "0.21.0")
+    (version "0.24.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "strum" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1qnd2by1zrwgx7li0hmwy7jbzjwz1ky697qjg85nga8zzny6py5a"))))
+        (base32 "0gz6cjhlps5idwasznklxdh2zsas6mxf99vr0n27j876q12n0gh6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-strum-macros" ,rust-strum-macros-0.21))))
+       (("rust-phf" ,rust-phf-0.10)
+        ("rust-strum-macros" ,rust-strum-macros-0.24))))
     (home-page "https://github.com/Peternator7/strum")
     (synopsis "Set of traits for working with enums and strings")
     (description
@@ -65124,6 +65125,24 @@ (define-public rust-strum-0.21
 easier in Rust.")
     (license license:expat)))
 
+(define-public rust-strum-0.21
+  (package
+    (inherit rust-strum-0.24)
+    (name "rust-strum")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "strum" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qnd2by1zrwgx7li0hmwy7jbzjwz1ky697qjg85nga8zzny6py5a"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-strum-macros" ,rust-strum-macros-0.21))))))
+
 (define-public rust-strum-0.20
   (package
     (inherit rust-strum-0.21)
-- 
2.34.1

[bug#66134] [PATCH 07/12] gnu: add rust-dotenvy-0.15

[Andrew Jose]

---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7be551e89d..57e03dad70 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20966,6 +20966,28 @@ (define-public rust-dotenv-0.10
         ("rust-regex" ,rust-regex-0.2)
         ("rust-syn" ,rust-syn-0.11))))))
 
+(define-public rust-dotenvy-0.15
+  (package
+    (name "rust-dotenvy")
+    (version "0.15.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dotenvy" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "16s3n973n5aqym02692i1npb079n5mb0fwql42ikmwn8wnrrbbqs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-clap" ,rust-clap-3))
+       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/allan2/dotenvy")
+    (synopsis "A well-maintained fork of the dotenv crate")
+    (description
+     "This package provides a well-maintained fork of the dotenv crate")
+    (license license:expat)))
+
 (define-public rust-draw-state-0.8
   (package
     (name "rust-draw-state")
-- 
2.34.1

[bug#66134] [PATCH 08/12] gnu: add rust-cradle-0.2

[Andrew Jose]

rust-dotenvy-0.15: indent cargo-inputs
---
 gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 57e03dad70..7561e0d3a9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -15421,6 +15421,36 @@ (define-public rust-uom-0.34
 mile, ...).")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-cradle-0.2
+  (package
+    (name "rust-cradle")
+    (version "0.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "cradle" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "16n04y60jps91dsw5fs6p8zash052y82aclg57kkvm9320n155kh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-executable-path" ,rust-executable-path-1)
+        ("rust-gag" ,rust-gag-0.1)
+        ("rust-nix" ,rust-nix-0.22)
+        ("rust-rustversion" ,rust-rustversion-1))
+       #:cargo-development-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-executable-path" ,rust-executable-path-1)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-unindent" ,rust-unindent-0.1))))
+    (home-page "https://github.com/soenkehahn/cradle")
+    (synopsis "Execute child processes with ease")
+    (description "Execute child processes with ease")
+    (license license:cc0)))
+
 (define-public rust-crates-index-0.18
   (package
     (name "rust-crates-index")
@@ -20979,9 +21009,11 @@ (define-public rust-dotenvy-0.15
                 "16s3n973n5aqym02692i1npb079n5mb0fwql42ikmwn8wnrrbbqs"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-clap" ,rust-clap-3))
-       #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
+     `(#:cargo-inputs
+       (("rust-clap" ,rust-clap-3))
+       #:cargo-development-inputs
+       (("rust-once-cell" ,rust-once-cell-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/allan2/dotenvy")
     (synopsis "A well-maintained fork of the dotenv crate")
     (description
-- 
2.34.1

[bug#66134] [PATCH 09/12] gnu: add rust-target-2

[Andrew Jose]

---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7561e0d3a9..a3ea71e4ab 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -66897,6 +66897,27 @@ (define-public rust-target-lexicon-0.12
 tools.")
     (license license:asl2.0)))
 
+(define-public rust-target-2
+  (package
+    (name "rust-target")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "target" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0p5hi5vxcs8w95qmg9hsv985g8kaxjrzjlgsybmf4h13a1qjx1ds"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-executable-path" ,rust-executable-path-1)
+        ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))
+    (home-page "https://github.com/casey/target")
+    (synopsis "Get information on compilation target")
+    (description "Get information on compilation target")
+    (license license:cc0)))
+
 (define-public rust-tectonic-bridge-core-0.3
   (package
     (name "rust-tectonic-bridge-core")
-- 
2.34.1

[bug#66134] [PATCH 10/12] gnu: add rust-temptree-0.2

[Andrew Jose]

---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a3ea71e4ab..b5cfd9cf64 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67712,6 +67712,26 @@ (define-public rust-tempfile-fast-0.3
      "This package provides support for Linux-specific tempfile extensions.")
     (license license:expat)))
 
+(define-public rust-temptree-0.2
+  (package
+    (name "rust-temptree")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "temptree" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0c461j4xrjp1mz89fb3rmv8w36m1dm1nymv9ny60hh0v4pc99nlg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/casey/temptree")
+    (synopsis "Temporary trees of files")
+    (description "Temporary trees of files")
+    (license license:cc0)))
+
 (define-public rust-tendril-0.4
   (package
     (name "rust-tendril")
-- 
2.34.1

[bug#66134] [PATCH 11/12] gnu: add patch for just

[Andrew Jose]

---
 gnu/packages/patches/just-remove-test.patch | 61 +++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 gnu/packages/patches/just-remove-test.patch

diff --git a/gnu/packages/patches/just-remove-test.patch b/gnu/packages/patches/just-remove-test.patch
new file mode 100644
index 0000000000..1a0e9ade94
--- /dev/null
+++ b/gnu/packages/patches/just-remove-test.patch
@@ -0,0 +1,61 @@
+From f38e27675f320366dbfda02348c8f4731d55d464 Mon Sep 17 00:00:00 2001
+From: Andrew Jose <arnav.jose@gmail.com>
+Date: Thu, 21 Sep 2023 17:43:49 +0530
+Subject: [PATCH] remove broken tests
+
+---
+ tests/functions.rs | 15 ---------------
+ tests/string.rs    | 14 --------------
+ 2 files changed, 29 deletions(-)
+
+diff --git a/tests/functions.rs b/tests/functions.rs
+index 5511329..56f3c09 100644
+--- a/tests/functions.rs
++++ b/tests/functions.rs
+@@ -25,21 +25,6 @@ foo:
+   stderr:   format!("echo {} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
+ }
+ 
+-#[cfg(not(windows))]
+-test! {
+-  name:     env_var_functions,
+-  justfile: r#"
+-p := env_var('USER')
+-b := env_var_or_default('ZADDY', 'HTAP')
+-x := env_var_or_default('XYZ', 'ABC')
+-
+-foo:
+-  /bin/echo '{{p}}' '{{b}}' '{{x}}'
+-"#,
+-  stdout:   format!("{} HTAP ABC\n", env::var("USER").unwrap()).as_str(),
+-  stderr:   format!("/bin/echo '{}' 'HTAP' 'ABC'\n", env::var("USER").unwrap()).as_str(),
+-}
+-
+ #[cfg(not(windows))]
+ test! {
+   name: path_functions,
+diff --git a/tests/string.rs b/tests/string.rs
+index a7e0894..a9fc852 100644
+--- a/tests/string.rs
++++ b/tests/string.rs
+@@ -366,17 +366,3 @@ test! {
+   "#,
+   stdout: "\n\nfoo\\n\nbar",
+ }
+-
+-test! {
+-  name:     shebang_backtick,
+-  justfile: "
+-    x := `#!/usr/bin/env sh`
+-  ",
+-  stderr:   "
+-    error: Backticks may not start with `#!`
+-      |
+-    1 | x := `#!/usr/bin/env sh`
+-      |      ^^^^^^^^^^^^^^^^^^^
+-  ",
+-  status:   EXIT_FAILURE,
+-}
+-- 
+2.34.1
+
-- 
2.34.1

[bug#66134] [PATCH 12/12] gnu: add just

[Andrew Jose]

added name at top of file
---
 gnu/packages/rust-apps.scm | 71 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 76d48e55f1..933da7fe3a 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -737,6 +738,76 @@ (define-public i3status-rust
 bar.  It is also compatible with sway.")
     (license license:gpl3)))
 
+(define-public just
+  (package
+    (name "just")
+    (version "1.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "just" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (patches
+        (search-patches
+         ;; two tests are broken
+         "just-remove-test.patch"))
+       (sha256
+        (base32
+         "0kafd87zmjf7wswyiqakqd2r5b8q3a761ipsihmrg9wr57k5zlis"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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))
+       #: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))
+       #:phases
+       (modify-phases %standard-phases
+	 (add-after 'unpack 'replace-hardcoded-paths
+	   (lambda* _
+	     (for-each
+              (lambda (filename)
+                (substitute* filename
+                  (("/usr/bin/env")
+                   (which "env"))
+                  (("/bin/echo")
+                   (which "echo"))
+                  (("/bin/sh")
+                   (which "sh"))))
+		       (cons "src/justfile.rs" (find-files "tests/" "\\.rs$"))))))))
+    (home-page "https://github.com/casey/just")
+    (synopsis "Just a command runner")
+    (description "Just a command runner. @code{just} is a handy way to save and run project-specific commands.")
+    (license license:cc0)))
+
 (define-public maturin
   (package
     (name "maturin")
-- 
2.34.1

bug#66134: [PATCH 00/12] Add just

[Efraim Flashner]

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

Thanks for the patches! I applied them, with a few minor changes.

On Thu, Sep 21, 2023 at 06:11:25PM +0530, Andrew Jose wrote:
> The following patches add the crates required
> for just (https://github.com/casey/just) in
> dependency order, a patch to make the tests pass,
> and finally, just in rust-apps.scm
> 
> Andrew Jose (12):
>   gnu: add rust-executable-path-1
>   gnu: add rust-snafu-derive-0.7
>   gnu: add rust-snafu-0.7
>   gnu: add rust-lexiclean-0.0.1
>   gnu: add rust-strum-macros-0.24
>   gnu: add rust-strum-0.24

I combined these two so we could build and run the tests on them both,
since they depended on each other.

>   gnu: add rust-dotenvy-0.15
>   gnu: add rust-cradle-0.2
>   gnu: add rust-target-2
>   gnu: add rust-temptree-0.2
>   gnu: add patch for just
>   gnu: add just

I started by combining these two, but then I removed the one adding a
patch and added cargo-test-flags to skip those two tests. I also made
some minor adjustments to the substitutions to try and more closely
match the exectuables.

I followed up with 2 more patches, one to install the manpage, another
to install the shell completions.

I saw that there were more shebangs in src/shebangs.rs and src/parser.sh
but I didn't adjust those. I wasn't sure if they were supposed to remain
as-is or be patched to refer to paths in the store.

>  gnu/packages/crates-io.scm                  | 224 +++++++++++++++++++-
>  gnu/packages/patches/just-remove-test.patch |  61 ++++++
>  gnu/packages/rust-apps.scm                  |  71 +++++++
>  3 files changed, 348 insertions(+), 8 deletions(-)
>  create mode 100644 gnu/packages/patches/just-remove-test.patch
> 
> 
> base-commit: 15c5f1a2c20b21de0f19f42db1ccab4c42117ebb
> -- 
> 2.34.1
> 
> 
> 
> 

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