guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

310/311: gnu: zoxide: Remove old rust version workaround.


From: guix-commits
Subject: 310/311: gnu: zoxide: Remove old rust version workaround.
Date: Sat, 28 Oct 2023 16:39:48 -0400 (EDT)

efraim pushed a commit to branch rust-team
in repository guix.

commit a06ddd2c470c25c176be88f75e61a88fcad613fa
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sat Oct 28 16:46:57 2023 +0300

    gnu: zoxide: Remove old rust version workaround.
    
    * gnu/packages/rust-apss.scm (zoxide)[arguments]: Remove custom phases.
    
    Change-Id: I11ee4cc8376c7b825359816dea4053dff18531a8
---
 gnu/packages/rust-apps.scm | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index f17db24806..37d3c91d2e 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -2445,26 +2445,7 @@ It will then write @code{fixup!} commits for each of 
those changes.")
            `(("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();")))))))
+             ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://github.com/ajeetdsouza/zoxide/";)
     (synopsis "Fast way to navigate your file system")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]