From patchwork Thu Dec 21 20:55:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 57967 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 B902527BBE9; Thu, 21 Dec 2023 20:59:20 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 6A50727BBE2 for ; Thu, 21 Dec 2023 20:59:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGQ8B-0001NM-AT; Thu, 21 Dec 2023 15:58:59 -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 1rGQ8A-0001ND-IG for guix-patches@gnu.org; Thu, 21 Dec 2023 15:58:58 -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 1rGQ8A-00078x-AX for guix-patches@gnu.org; Thu, 21 Dec 2023 15:58:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rGQ8E-0006lI-Bz; Thu, 21 Dec 2023 15:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67958] [PATCH 7/7] gnu: just: Update to 1.17.0. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Thu, 21 Dec 2023 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67958@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 67958-submit@debbugs.gnu.org id=B67958.170319230725936 (code B ref 67958); Thu, 21 Dec 2023 20:59:02 +0000 Received: (at 67958) by debbugs.gnu.org; 21 Dec 2023 20:58:27 +0000 Received: from localhost ([127.0.0.1]:45575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGQ7e-0006kG-Kz for submit@debbugs.gnu.org; Thu, 21 Dec 2023 15:58:27 -0500 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:43454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGQ7c-0006k2-GD for 67958@debbugs.gnu.org; Thu, 21 Dec 2023 15:58:25 -0500 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rGQ7S-002OMF-NP for 67958@debbugs.gnu.org; Thu, 21 Dec 2023 21:58:14 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-ID:Date:Subject:Cc:To:From; bh=Ga9o8waGazG9g6HX7eBVAs0OgfVixsj9KTsCl6MXvz8=; b=c9MAKQvqSQzjBfba7ARfgXdErM ++OldouebKt0WQdDP7ZW58Eo3DDJup42rXZYNn9vWopKFpNyoH08hR4nxK9YR35tVCQWH0DV1mH93 HCPAA9LbwCoWxqQ6JhobsBDaR0D+D3TVtdB9Bt/wktFDHCkScQQ/FkeRVKBmAkIMS150iKb4bLw6b RD4Vvm8dpsVeizvS/fPHXYAT49RAgJbu2GzE6wBct6wa7x4ny36kjAi6Y6I7Wu6sLBAwOj/M4HjOX xR2rts6R4RG1J+GIb0onlEBORM2IcHz+LSbOK+sALWbMj4tFEk/J7CP+qxRuLya42iCDum5cmTJxx sNMbsi/Q==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rGQ7S-0000oj-F5 for 67958@debbugs.gnu.org; Thu, 21 Dec 2023 21:58:14 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rGQ7A-00AvtM-Tu; Thu, 21 Dec 2023 21:57:57 +0100 Date: Thu, 21 Dec 2023 15:55:05 -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 (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")