Package: guix-patches;
Reported by: Jaeme Sifat <jaeme <at> runbox.com>
Date: Thu, 21 Dec 2023 20:51:01 UTC
Severity: normal
Tags: patch
Done: Efraim Flashner <efraim <at> flashner.co.il>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Jaeme Sifat <jaeme <at> runbox.com> To: 67958 <at> debbugs.gnu.org Cc: Jaeme Sifat <jaeme <at> runbox.com>, Efraim Flashner <efraim <at> flashner.co.il> Subject: [bug#67958] [PATCH 7/7] gnu: just: Update to 1.17.0. Date: Thu, 21 Dec 2023 15:55:05 -0500
* 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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.