From patchwork Wed Dec 20 03:55:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 57920 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 1C20627BBEA; Wed, 20 Dec 2023 04:14:16 +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=ham 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 36B3B27BBE2 for ; Wed, 20 Dec 2023 04:14:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFny5-0004ob-87; Tue, 19 Dec 2023 23:14:01 -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 1rFny3-0004o3-0U for guix-patches@gnu.org; Tue, 19 Dec 2023 23:13:59 -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 1rFny2-000800-O1 for guix-patches@gnu.org; Tue, 19 Dec 2023 23:13:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFny5-00051n-LI; Tue, 19 Dec 2023 23:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67919] [PATCH 55/55] gnu: eza: Refactor package definition. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Wed, 20 Dec 2023 04:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67919 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67919@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 67919-submit@debbugs.gnu.org id=B67919.170304558719261 (code B ref 67919); Wed, 20 Dec 2023 04:14:01 +0000 Received: (at 67919) by debbugs.gnu.org; 20 Dec 2023 04:13:07 +0000 Received: from localhost ([127.0.0.1]:38432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFnxC-00050a-NN for submit@debbugs.gnu.org; Tue, 19 Dec 2023 23:13:07 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:32962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFnxA-0004zY-GY for 67919@debbugs.gnu.org; Tue, 19 Dec 2023 23:13:05 -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 1rFnx1-00FQl3-R6 for 67919@debbugs.gnu.org; Wed, 20 Dec 2023 05:12:55 +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=W1btAlMcJ3PorqmO6F28IZmOb4gdpg+NbvS+Ugdggys=; b=qsjETO6xzxlqq5uk3r5nX1TKl8 GuMu/qZ+VBJmwSuESYUBHm4rYLmEcAHTixnBPLw3h+1bt4H8qmWGeYQMy1QXY/KdMG/ffixVkyZvf 2aF83ZwqAt1kaECt6W9WiVhe2gRHvebnv7Gw8NHc4w9eprS4sF6wVFuYGMT1Wvxhp9VIyYrAc7LgR +MKPMcoaUIzeodZmi7ls3ibDzWLHT0DAX4/LPpOFthf1qM09BmT8z30YwRIBf58pyoUuaksqtB2py X0tKaayOy8TpYxSqdtTXDH8rjjkpj7qa/apz4zRB97Lt8Fxo5ly4+rP2apeXgYKLPBHnfWpqWHXQ/ R336Uyyw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rFnx1-0002d1-Hn for 67919@debbugs.gnu.org; Wed, 20 Dec 2023 05:12:55 +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 1rFnwv-0066Gp-Hn; Wed, 20 Dec 2023 05:12:49 +0100 Date: Tue, 19 Dec 2023 22:55:17 -0500 Message-ID: <72f385c7d91ab049b73989b3b1ca83c1e4e1b62e.1703044085.git.jaeme@runbox.com> 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 (eza): Refactor package definition. [arguments]: Made 'install-extras phase clearer. Change-Id: I4df0fdcde11d8ab07eed5aeeb1d14a6fe5fe55c3 --- gnu/packages/rust-apps.scm | 45 ++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index cf29cf051c..2f339f55d7 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -404,7 +404,6 @@ (define-public eza #:install-source? #f #:cargo-inputs `(("rust-ansiterm" ,rust-ansiterm-0.12) - ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4) ("rust-git2" ,rust-git2-0.18) ("rust-glob" ,rust-glob-0.3) @@ -438,40 +437,44 @@ (define-public eza (map (lambda (page) (with-output-to-file page (lambda _ - (invoke "pandoc" "--standalone" - "-f" "markdown" - "-t" "man" + (invoke "pandoc" + "--standalone" + "-f" + "markdown" + "-t" + "man" (string-append "man/" page ".md"))))) (list "eza.1" "eza_colors.5"))))) (add-after 'install 'install-extras (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share")) + (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")) (man1 (string-append share "/man/man1")) (man5 (string-append share "/man/man5"))) (when (file-exists? "eza.1") (install-file "eza.1" man1)) (when (file-exists? "eza_colors.5") (install-file "eza_colors.5" man5)) - (mkdir-p (string-append out "/etc/bash_completion.d")) - (mkdir-p (string-append - share "/fish/vendor_completions.d")) - (mkdir-p (string-append share "/zsh/site-functions")) + (mkdir-p bash-completions-dir) + (mkdir-p zsh-completions-dir) + (mkdir-p fish-completions-dir) (copy-file "completions/bash/eza" - (string-append - out "/etc/bash_completion.d/eza")) - (copy-file "completions/fish/eza.fish" - (string-append - share "/fish/vendor_completions.d/eza.fish")) + (string-append bash-completions-dir "/eza")) (copy-file "completions/zsh/_eza" - (string-append - share "/zsh/site-functions/_eza")))))))) - (native-inputs - (append - (list pkg-config) - (if (supported-package? pandoc) - (list pandoc) - '()))) + (string-append zsh-completions-dir "/_eza")) + (copy-file "completions/fish/eza.fish" + (string-append fish-completions-dir + "/eza.fish")))))))) + (native-inputs (append (list pkg-config) + (if (supported-package? pandoc) + (list pandoc) + '()))) (inputs (list libgit2-1.7 zlib)) (home-page "https://github.com/eza-community/eza") (synopsis "Modern replacement for ls")