From: "\( via Guix-patches" via <guix-patches@gnu.org>
To: 59670@debbugs.gnu.org
Cc: "\(" <paren@disroot.org>
Subject: [bug#59670] [PATCH 50/50] gnu: zoxide: Update to 0.8.3.
Date: Tue, 29 Nov 2022 07:01:04 +0000 [thread overview]
Message-ID: <20221129070104.8007-50-paren@disroot.org> (raw)
In-Reply-To: <20221129070104.8007-1-paren@disroot.org>
* gnu/packages/rust-apps.scm: Sort module imports.
(zoxide): Update to 0.8.3.
[arguments]: Use G-expressions.
<#:phases>{'use-older-rust}: New phase.
---
gnu/packages/rust-apps.scm | 76 +++++++++++++++++++++++++-------------
1 file changed, 50 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 66b89a6b2a..f758cd5bc7 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 Mathieu Laparie <mlaparie@disr.it>
+;;; Copyright © 2022 ( <paren@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,11 +38,12 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages rust-apps)
- #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
+ #:use-module (guix deprecation)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
- #:use-module (guix deprecation)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages)
@@ -2066,32 +2068,54 @@ (define-public git-absorb
(define-public zoxide
(package
(name "zoxide")
- (version "0.6.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "zoxide" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "1ih01l3xp8plicxhmyxjkq12ncpdb8954jcj3dh3lwvkhvw29nkk"))))
+ (version "0.8.3")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "zoxide" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0y5v2vgl9f3n0n0w4b3iddbfyxv0hls0vw5406ry0hcvnnjyy2l3"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
- (("rust-anyhow" ,rust-anyhow-1)
- ("rust-askama" ,rust-askama-0.10)
- ("rust-bincode" ,rust-bincode-1)
- ("rust-clap" ,rust-clap-3)
- ("rust-dirs-next" ,rust-dirs-next-2)
- ("rust-dunce" ,rust-dunce-1)
- ("rust-glob" ,rust-glob-0.3)
- ("rust-once-cell" ,rust-once-cell-1)
- ("rust-ordered-float" ,rust-ordered-float-2)
- ("rust-rand" ,rust-rand-0.7)
- ("rust-serde" ,rust-serde-1)
- ("rust-tempfile" ,rust-tempfile-3))
- #:cargo-development-inputs
- (("rust-assert-cmd" ,rust-assert-cmd-1)
- ("rust-seq-macro" ,rust-seq-macro-0.2))))
+ (list #:cargo-inputs
+ `(("rust-anyhow" ,rust-anyhow-1)
+ ("rust-askama" ,rust-askama-0.11)
+ ("rust-bincode" ,rust-bincode-1)
+ ("rust-clap" ,rust-clap-3)
+ ("rust-clap-complete" ,rust-clap-complete-3)
+ ("rust-clap-complete-fig" ,rust-clap-complete-fig-3)
+ ("rust-dirs" ,rust-dirs-4)
+ ("rust-dunce" ,rust-dunce-1)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-glob" ,rust-glob-0.3)
+ ("rust-nix" ,rust-nix-0.24)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-which" ,rust-which-4))
+ #:cargo-development-inputs
+ `(("rust-assert-cmd" ,rust-assert-cmd-2)
+ ("rust-rstest" ,rust-rstest-0.15)
+ ("rust-rstest-reuse" ,rust-rstest-reuse-0.4)
+ ("rust-tempfile" ,rust-tempfile-3))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-older-rust
+ (lambda _
+ (setenv "RUSTC_BOOTSTRAP" "1")
+ (substitute* "Cargo.toml"
+ (("^rust-version = .*$")
+ (string-append
+ "rust-version = \""
+ #$(package-version rust)
+ "\"\n")))
+ (substitute* "src/main.rs"
+ (("#!\\[allow\\(clippy::single_component_path_imports)]")
+ "#![feature(total_cmp)]"))
+ (substitute* "src/cmd/query.rs"
+ (("let handle = &mut io::stdout\\()\\.lock\\();")
+ "\
+let _stdout = io::stdout();
+let handle = &mut _stdout.lock();")))))))
(home-page "https://github.com/ajeetdsouza/zoxide/")
(synopsis "Fast way to navigate your file system")
(description
--
2.38.1
next prev parent reply other threads:[~2022-11-29 7:09 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 6:59 [bug#59670] [PATCH 00/50] gnu: zoxide: Update to 0.8.3 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 01/50] gnu: Add rust-nix-0.24 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 02/50] gnu: Add rust-propfuzz-macro-0.0.1 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 03/50] gnu: Add rust-propfuzz-0.0.1 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 04/50] gnu: Add rust-unicode-categories-0.1 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 05/50] gnu: Add rust-comrak-0.12 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 06/50] gnu: rust-askama-escape: Update to 0.10.3 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 07/50] gnu: Add rust-askama-shared-0.12 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 08/50] gnu: Add rust-askama-derive-0.11 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 09/50] gnu: Add rust-askama-0.11 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 10/50] gnu: Add rust-rstest-macros-0.14 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 11/50] gnu: Add rust-rstest-0.15 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 12/50] gnu: Add rust-parking-lot-0.12 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 13/50] gnu: rust-tokio-1: Update to 1.22.0 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 14/50] gnu: rust-autocfg-1: Update to 1.1.0 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 15/50] gnu: Add rust-fs-err-2 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 16/50] gnu: Add rust-windows-aarch64-gnullvm-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 17/50] gnu: Add rust-windows-aarch64-msvc-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 18/50] gnu: Add rust-windows-i686-gnu-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 19/50] gnu: Add rust-windows-i686-msvc-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 20/50] gnu: Add rust-windows-x86-64-gnu-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 21/50] gnu: Add rust-windows-x86-64-gnullvm-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 22/50] gnu: Add rust-windows-x86-64-msvc-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 23/50] gnu: Add rust-windows-sys-0.42 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 24/50] gnu: rust-async-std-1: Update to 1.12.0 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 25/50] gnu: Add rust-wasi-0.11 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 26/50] gnu: rust-libc-0.2: Update to 0.2.137 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 27/50] gnu: rust-mio-0.8: Update to 0.8.5 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 28/50] gnu: rust-socket2-0.4: Update to 0.4.7 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 29/50] gnu: Add rust-io-lifetimes-0.7 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 30/50] gnu: rust-compiler-builtins-0.1: Update to 0.1.84 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 31/50] gnu: Add rust-linux-raw-sys-0.0.46 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 32/50] gnu: rust-errno-0.2: Update to 0.2.8 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 33/50] gnu: rust-memoffset-0.6: Update to 0.6.5 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 34/50] gnu: rust-ctor-0.1: Update to 0.1.26 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 35/50] gnu: Add rust-rustix-0.35 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 36/50] gnu: Add rust-terminal-size-0.2 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 37/50] gnu: Add rust-clap-lex-0.2 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 38/50] gnu: rust-unicode-linebreak-0.1: Update to 0.1.4 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 39/50] gnu: Add rust-unic-emoji-char-0.9 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 40/50] gnu: Add rust-termion-2 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 41/50] gnu: Add rust-textwrap-0.16 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 42/50] gnu: rust-clap-derive-3: Update to 3.2.18 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 43/50] gnu: rust-clap-3: Update to 3.2.23 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 44/50] gnu: rust-pathdiff-0.2: Update to 0.2.1 ( via Guix-patches via
2022-11-29 7:00 ` [bug#59670] [PATCH 45/50] gnu: rust-unicode-xid-0.2: Update to 0.2.4 ( via Guix-patches via
2022-11-29 7:01 ` [bug#59670] [PATCH 46/50] gnu: Add rust-clap-complete-3 ( via Guix-patches via
2022-11-29 7:01 ` [bug#59670] [PATCH 47/50] gnu: Add rust-clap-complete-fig-3 ( via Guix-patches via
2022-11-29 7:01 ` [bug#59670] [PATCH 48/50] gnu: Add rust-rstest-reuse-0.4 ( via Guix-patches via
2022-11-29 7:01 ` [bug#59670] [PATCH 49/50] gnu: rust-which-4: Update to 4.3.0 ( via Guix-patches via
2022-11-29 7:01 ` ( via Guix-patches via [this message]
2022-11-29 21:22 ` [bug#59670] [PATCH 00/50] gnu: zoxide: Update to 0.8.3 Tobias Geerinckx-Rice via Guix-patches via
2022-11-30 7:08 ` ( via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221129070104.8007-50-paren@disroot.org \
--to=guix-patches@gnu.org \
--cc=59670@debbugs.gnu.org \
--cc=paren@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).