From patchwork Sat Jan 20 17:55:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 59246 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DD9B527BBE9; Sat, 20 Jan 2024 17:57:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC2D527BBE2 for ; Sat, 20 Jan 2024 17:57:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRFad-0004lA-M8; Sat, 20 Jan 2024 12:57:07 -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 ) id 1rRFaY-0004ho-Lx for guix-patches@gnu.org; Sat, 20 Jan 2024 12:57:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRFaY-0003pP-DK for guix-patches@gnu.org; Sat, 20 Jan 2024 12:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRFab-000894-AZ; Sat, 20 Jan 2024 12:57:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68616] [PATCH 13/13] gnu: fd: Update to 9.0.0. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 17:57:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68616 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68616@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68616-submit@debbugs.gnu.org id=B68616.170577338431161 (code B ref 68616); Sat, 20 Jan 2024 17:57:05 +0000 Received: (at 68616) by debbugs.gnu.org; 20 Jan 2024 17:56:24 +0000 Received: from localhost ([127.0.0.1]:35658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRFZv-00086R-2B for submit@debbugs.gnu.org; Sat, 20 Jan 2024 12:56:23 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:37434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRFZq-00084W-5q for 68616@debbugs.gnu.org; Sat, 20 Jan 2024 12:56:19 -0500 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rRFZh-008ndO-Hf for 68616@debbugs.gnu.org; Sat, 20 Jan 2024 18:56:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector1; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-ID:Date:Subject:Cc:To:From; bh=mDHlgHYvhgzSjuGAmC7AXuPZwt3TZR6QbfJ80XrLcvM=; b=bY4wgt63iB9lW3FtwvlAxDEcIF xVZ/QQSRJPu0BkdzEOjyYoLcY5iib6hJXukNtMnMw3ac88By43LTv9MySt0VR5lqK7Ry0gmX9iTBB TPj8CZfaaPo/lejQXwucaZWUlAxKgBrZs1APfWSmDVpx1ldsbY3nAFfsaViZv5yDb7sOgB6iXyqDV q56RJH6SLDi+zAEnMpZcTd/ywMFMaUsuqfLSUU+ZnGQFPmplsIlTyIwbR9WWm9q4wFG+3q7zFSt67 DQjjFA8Sb1z932NRE1aFf5Wv+oK+3xvcHavq0RgEQxXoyGIJFc9A82M+rlaLDY1q1ulqaqa2ige20 XK8ziBug==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rRFZh-00056f-8o for 68616@debbugs.gnu.org; Sat, 20 Jan 2024 18:56:09 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rRFZf-009FnS-2u; Sat, 20 Jan 2024 18:56:07 +0100 Date: Sat, 20 Jan 2024 12:55:31 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (fd): Update to 9.0.0. [arguments]: Use gexps. Change-Id: I8ce2d61e668cceafc49c9aa29c00703344f6b0b0 --- gnu/packages/rust-apps.scm | 120 ++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 0df46b9b1d..a67255623a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -525,7 +525,7 @@ (define-public exa (define-public fd (package (name "fd") - (version "8.7.0") + (version "9.0.0") (source (origin (method url-fetch) @@ -534,85 +534,81 @@ (define-public fd (string-append name "-" version ".tar.gz")) (sha256 (base32 - "186217yyb0znfn4jcc9l3i51fhfyb23lhbm3gg084sdrbj6bdnbg")))) + "1is6xrsnbiy4la3lrmxzl3pzzkygnx9mp8h5k8gfrc29bq8m7891")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags - '("--release" - "--" - ;; No user 'root' in the build environment. - "--skip=test_owner_root") - #:install-source? #f - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) + (list + #:cargo-test-flags + ;; No user 'root' in the build environment. + '(list "--release" "--" + "--skip=test_owner_root") + #:cargo-inputs + `(("rust-aho-corasick" ,rust-aho-corasick-1) + ("rust-anyhow" ,rust-anyhow-1) ("rust-argmax" ,rust-argmax-0.3) - ("rust-atty" ,rust-atty-0.2) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-4) ("rust-clap-complete" ,rust-clap-complete-4) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-ctrlc" ,rust-ctrlc-3) - ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-etcetera" ,rust-etcetera-0.8) ("rust-faccess" ,rust-faccess-0.2) ("rust-globset" ,rust-globset-0.4) ("rust-humantime" ,rust-humantime-2) ("rust-ignore" ,rust-ignore-0.4) ("rust-jemallocator" ,rust-jemallocator-0.5) ("rust-libc" ,rust-libc-0.2) - ("rust-lscolors" ,rust-lscolors-0.13) - ("rust-nix" ,rust-nix-0.26) - ("rust-normpath" ,rust-normpath-0.3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.46) - ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-once-cell" ,rust-once-cell-1) + ("rust-lscolors" ,rust-lscolors-0.16) + ("rust-nix" ,rust-nix-0.27) + ("rust-normpath" ,rust-normpath-1) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49) ("rust-regex" ,rust-regex-1) - ("rust-regex-syntax" ,rust-regex-syntax-0.6) - ("rust-users" ,rust-users-0.11) + ("rust-regex-syntax" ,rust-regex-syntax-0.8) ("rust-version-check" ,rust-version-check-0.9)) - #:cargo-development-inputs - (("rust-diff" ,rust-diff-0.1) + #:cargo-development-inputs + `(("rust-diff" ,rust-diff-0.1) ("rust-filetime" ,rust-filetime-0.2) ("rust-tempfile" ,rust-tempfile-3) - ("rust-test-case" ,rust-test-case-2)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'override-jemalloc - (lambda* (#:key inputs #:allow-other-keys) - (let ((jemalloc (assoc-ref inputs "jemalloc"))) - ;; This flag is needed when not using the bundled jemalloc. - ;; https://github.com/tikv/jemallocator/issues/19 - (setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1") - (setenv "JEMALLOC_OVERRIDE" - (string-append jemalloc "/lib/libjemalloc.so"))))) - (add-after 'unpack 'adjust-feature-flags - (lambda _ - ;; unstable-grouped was stablized in rust-clap 4.2.0 - (substitute* "Cargo.toml" - ((".*unstable-grouped.*") "")))) - (add-after 'install 'install-extra - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Manpages - (install-file "doc/fd.1" (string-append out "/share/man/man1")) - ;; Completions require running the built binary. - (unless ,(%current-target-system) - (invoke "make" "completions") - (install-file "autocomplete/fd.bash" - (string-append out "/etc/bash_completion.d")) - (install-file "autocomplete/fd.fish" - (string-append out "/share/fish/vendor_completions.d")) - (install-file "autocomplete/_fd" - (string-append out "/share/zsh/site-functions")) - (rename-file (string-append out "/etc/bash_completion.d/fd.bash") - (string-append out "/etc/bash_completion.d/fd"))))))))) - (inputs (list jemalloc)) - (home-page "https://github.com/sharkdp/fd") - (synopsis "Simple, fast and user-friendly alternative to find") - (description - "@code{fd} is a simple, fast and user-friendly alternative to @code{find}. -While it does not seek to mirror all of find's powerful functionality, it -provides defaults for 80% of the use cases.") - (license (list license:expat license:asl2.0)))) + ("rust-test-case" ,rust-test-case-3)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + ;; This flag is needed when not using the bundled jemalloc. + ;; https://github.com/tikv/jemallocator/issues/19 + (setenv "CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS" "1") + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc.so"))))) + (add-after 'unpack 'adjust-feature-flags + (lambda _ + ;; unstable-grouped was stablized in rust-clap 4.2.0 + (substitute* "Cargo.toml" + ((".*unstable-grouped.*") "")))) + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Manpages + (install-file "doc/fd.1" (string-append out "/share/man/man1")) + ;; Completions require running the built binary. + (unless #$(%current-target-system) + (invoke "make" "completions") + (install-file "autocomplete/fd.bash" + (string-append out "/etc/bash_completion.d")) + (install-file "autocomplete/fd.fish" + (string-append out "/share/fish/vendor_completions.d")) + (install-file "autocomplete/_fd" + (string-append out "/share/zsh/site-functions")) + (rename-file (string-append out "/etc/bash_completion.d/fd.bash") + (string-append out "/etc/bash_completion.d/fd"))))))))) + (inputs (list jemalloc)) + (home-page "https://github.com/sharkdp/fd") + (synopsis "Simple, fast and user-friendly alternative to find") + (description + "@code{fd} is a simple, fast and user-friendly alternative to @code{find}. +While it does not seek to mirror all of find's powerful functionality, it provides +defaults for 80% of the use cases.") + (license (list license:expat license:asl2.0)))) (define-public hexyl (package