From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp10.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms5.migadu.com with LMTPS
	id eLsUKxqwhWNlBgEAbAwnHQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 29 Nov 2022 08:09:14 +0100
Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp10.migadu.com with LMTPS
	id eKFIKhqwhWOy1wAAG6o9tA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 29 Nov 2022 08:09:14 +0100
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 62AF013DF0
	for <larch@yhetil.org>; Tue, 29 Nov 2022 08:09:14 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1ozueD-0003ZT-MP; Tue, 29 Nov 2022 02:03:17 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ozue1-0003VY-MV
 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:03:06 -0500
Received: from debbugs.gnu.org ([209.51.188.43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ozue0-00048Q-Vv
 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:03:05 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ozue0-0004uM-SR
 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:03:04 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#59670] [PATCH 50/50] gnu: zoxide: Update to 0.8.3.
Resent-From: "(" <paren@disroot.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 29 Nov 2022 07:03:04 +0000
Resent-Message-ID: <handler.59670.B59670.166970534718783@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 59670
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 59670@debbugs.gnu.org
Cc: "\(" <paren@disroot.org>
Received: via spool by 59670-submit@debbugs.gnu.org id=B59670.166970534718783
 (code B ref 59670); Tue, 29 Nov 2022 07:03:04 +0000
Received: (at 59670) by debbugs.gnu.org; 29 Nov 2022 07:02:27 +0000
Received: from localhost ([127.0.0.1]:53792 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1ozudO-0004so-Oe
 for submit@debbugs.gnu.org; Tue, 29 Nov 2022 02:02:27 -0500
Received: from knopi.disroot.org ([178.21.23.139]:54352)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <paren@disroot.org>) id 1ozucS-0004h4-1Q
 for 59670@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:29 -0500
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id CC38C41446;
 Tue, 29 Nov 2022 08:01:27 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id AMmtnluIRfOm; Tue, 29 Nov 2022 08:01:26 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1669705283; bh=xT1gGSDOOaGUKSP50d6XYH0ymqCdc8NFjM8EPqkgg7g=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=Q9ndgGZlBvDYMMuAs2cSd3bP43h7Tx99ZBnnIyLRR2/+Kx0PMoiqME2KscRU+MKcA
 ImqPdCHXgXmHeHYbyodDzQPiO2BxFciwN+L04uneKbqmJVhdt67DRoJn2Nd/IA/ixr
 8LeaPyiCimtzaT/9L6PfL0kM6UMg/pZTTl7ROJrREcRTua6vRkSvh9UKa+wDzB9u0Q
 XrSvLZUa3sFbWNI3AzaxwO8T7LTdSqTOxP0FsA4zJLZjFKan24rVPAS7X3YrPrEc+o
 O2BfMFNWCQvma8fg33k45kIrE8o08LyrKLMfwLrqjI96a6uBxQ7da4gBNqcXniPxUx
 PqncwwZLHXQmA==
Date: Tue, 29 Nov 2022 07:01:04 +0000
Message-Id: <20221129070104.8007-50-paren@disroot.org>
In-Reply-To: <20221129070104.8007-1-paren@disroot.org>
References: <20221129070104.8007-1-paren@disroot.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Reply-to:  "\(" <paren@disroot.org>
X-ACL-Warn: ,  "\( via Guix-patches" <guix-patches@gnu.org>
From:  "\( via Guix-patches" via <guix-patches@gnu.org>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1669705754;
	h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=GGz6TiLTL6D/GBGcznflch2GNBEHEDn1Wsmi8srKxgs=;
	b=KIHbCWqiggLcjfw+JNBkqsA6AhXlhSVLAs1F8kgqQLgSZ2SfzWDI3mZGZhTh8BFUityaSm
	2rv6u3TpoEJ13fei2MH0EyvTXVD8vtw1kXFFcUF16BJLxK6bcvumI/er+S8dcmW0RBbb0y
	nYCNhnJY9B+OkBiFpEbE3LMwQEVs5gijh5DGoVSzzK1dxrF895TNQgb0zDrY0X1V8dXK2P
	3RV9/GpzF43Bi6u7xobUIcnPqoog+f+9sB0TSuzawlrlRXJZMRQur4ATKFwGlcOpRO0Gcs
	vp+nz6D9WtyDYZ7u7Zks0CtVntfWxrzqkoejVhrKhkpmZZ8fN/rcDIs9xBmYvQ==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669705754; a=rsa-sha256; cv=none;
	b=unBU0gAbcs7Bk7NX3JYz9QJI9IgxyOlcu0Yw1DITCRgAZfofHNJjvz2LPKk/CLkQGRTeCR
	LxdbMguBBzRahC7HZU0Y5Hsw29/F/CkwAg5QggChdPzVAbBvgK3mEJl1JQU+2dCaFf1RU+
	TtbG3ZcOqf2pyiL35t/i8GIQocWapm+Gup19fZh7WI/te1GhaO2+IvuY4COcFSVhvj9HdD
	+b21qBhrJ8QSQgOYXULpkyLL/T1dFZRd0jOfO5Ddq1YSuhFkZ9S1QPMGpZk2vnRne0OT67
	K3o5/JcdyGuLXadpkzCx/oUQogwY8O+S8FpjKDdxfK2/gbFzLLjd+VQR0A2CGA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Q9ndgGZl;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
X-Migadu-Spam-Score: -3.76
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Q9ndgGZl;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
X-Migadu-Queue-Id: 62AF013DF0
X-Spam-Score: -3.76
X-Migadu-Scanner: scn0.migadu.com
X-TUID: VZ+ye57ZS0ei

* 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