From patchwork Thu Mar 27 08:46:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40875 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 1409927BBEA; Thu, 27 Mar 2025 08:50: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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 6CF1427BBE2 for ; Thu, 27 Mar 2025 08:50:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwM-0004IK-Og; Thu, 27 Mar 2025 04:50:18 -0400 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 1txiwJ-0004H2-Ll for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:16 -0400 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 1txiwJ-0003TV-AL for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=yppARz+PdwovWudEwKHNrAJuBPgyDDFIN4d2fscLVUs=; b=oGyZI9LKpl5p6IL+osENe+ISFFoBldsytF/5lc2xcfRjdk1YtB9dkheqrrU76fKZyqlp+5NtGZjeQ25dnOW7TSP1oyTnAbg1ixxIo5UXCLjnwOJE6Y0sySg59IC1O/VQiPLQYT6PsgJ5sfIiU7IYl1+Uej4O3w7pPup7rXQbLPynw2iSl4vSmr/9WNs5vB3oUlkpUwidh5ZEbUBh/Zjj8UYEW6V/D3bi9gl/xpazf4AuifZ/a1IohJ1xbpzKYwWY48jD2jYbEhDmGAjaH22ZVQ71msGE4S2sgCNl/qAJ158j4QvrCQ1l/jjgpvzRd3IwwzpbHAPb1zpWGJy8ADtgCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwE-0002tV-Kn; Thu, 27 Mar 2025 04:50:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 4/6] gnu: git-delta: Fix shell completion directories. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 08:50:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77181@debbugs.gnu.org Cc: 45mg <45mg.writes@gmail.com>, Ian Eure , Divya Ranjan Pattanaik , Efraim Flashner , Steve George X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Steve George Received: via spool by 77181-submit@debbugs.gnu.org id=B77181.174306535410523 (code B ref 77181); Thu, 27 Mar 2025 08:50:10 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:14 +0000 Received: from localhost ([127.0.0.1]:47415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivH-0002jE-BA for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:14 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:56667) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiuz-0002fC-Vq for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:48:57 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43948021a45so7062115e9.1 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065328; x=1743670128; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=yppARz+PdwovWudEwKHNrAJuBPgyDDFIN4d2fscLVUs=; b=lbyvLfVTxdKUcHgqYHKqrnKDp5uTebZmmKsoYcHst2y727r8GyPogW+vnTXMlCpfUT FUly5SvzawJKq2egoEkU/YBaTneV5vafaG9jlANKOhvEvHzgcGR9vgj9eu+hN1zflAWk HWs+GRE1xJrb56u2fhkVzGqvDgfG2txkzB2If7zDENGWUBRWyfrrlV8C9aZ4XQFydSo7 9tMXJvP2T8yFsSLb2c1cysACJRoQl+plTzOrZvOK5B/UsBpPhAW6ut9g5ezLPWRXzdXD NyWuixg7vTvVyGUuJdWBQYVeMHLnUdDrrowJ8yFgElU/ZXtWRep5dlmMrYpWkuUK+Jf8 nDwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065328; x=1743670128; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yppARz+PdwovWudEwKHNrAJuBPgyDDFIN4d2fscLVUs=; b=HQ8jfc4I92QxO8GnLdwxwXJ/abfU9uutMOb0M1/MGfVHQl7FTYGyb731x8DppEo9ow 0Cu6AThajhPAG7W/myb0S6cqFWFp3HMJXKh2ny4aUcIiFHaG2xfxnmr+u4SR9iUH2Ylk aoXkqu6QrbE10YrwWQCi9E7zZabfd9V/6f598Mo6FnDwT18pMoynNb0UCVxpeF33v7Dv sTi7fKcBK0IUG84Z1KqGx2tXLvmQK6XrO0iEA033D3gj+FOfgRiyuOJQY/MuymSyBzJ8 ijbw689VcwFjyctRjw8c64AShuIbOlxD51Skoj6FmQgoiB30/DfolAAjQ/vhRhuukf4b TUoA== X-Gm-Message-State: AOJu0YzPhV5SemFUROlmqPhdGfSKbRorHzzDPaloBasVB10R+wX0axy4 ASvEJRMio9EuRAi+zhMq6D4dVzwtr5LCjL//2HKK/I/b08F9xd2AgMZTNia/ X-Gm-Gg: ASbGnctqteS8TbWOWGQsLvy54AgJzjq7u4HV631gnLzzFBCSxZxthBjxyc1r/hl3NS0 td4G+JGsQ3AQVlE2ViOrFXRRA+nX7wz9KqOs0Kdl1EPJYVEnWst5EUy6acMU9Q4ISR6bc2gOoLP NpfeRolPUSoyDeUvM4ReQtmc7oQMMZ0N1Lnwss/T4Ja7ko0jdHjdTYv0jyYGrCVfrhxRP4ieyLX ruK6ruWrEtZB6CZ4Op/INaF/O7AVJswZf0zfOv9BPJ12O7JyLn6yTvQRI20FD8UDjQPDRYyxfFc 3GXLI+Rj7ZIH/9AIktqeelxOGNVFBGLzJnraPzSvmF42z5XP X-Google-Smtp-Source: AGHT+IGbihPH8dlRximRPz9TroEMS2eQyAO+Iv1DKiMLpk/zFSDyzRAv4ojfDufhjlpSZUoGtxMcdA== X-Received: by 2002:a05:600c:3ac6:b0:43b:ce3c:19d0 with SMTP id 5b1f17b1804b1-43d85096658mr25066295e9.29.1743065327464; Thu, 27 Mar 2025 01:48:47 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d82f3235asm30207525e9.31.2025.03.27.01.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:47 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:43 +0200 Message-ID: X-Mailer: git-send-email 2.49.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: , 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 From: 45mg <45mg.writes@gmail.com> * gnu/packages/rust-apps.scm (git-delta) [arguments]: Use the shell completion directory variables. Change-Id: I7825607cc15df5b6fec8322740d303b38842e401 --- gnu/packages/rust-apps.scm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 0371fd4c264..55861ecc924 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -4550,23 +4550,16 @@ (define-public git-delta #~(modify-phases %standard-phases (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 out "/etc/bash-completion.d")) - (zsh-completions-dir - (string-append share "/zsh/site-functions")) - (fish-completions-dir - (string-append share "/fish/vendor_completions.d"))) - (mkdir-p bash-completions-dir) - (mkdir-p zsh-completions-dir) - (mkdir-p fish-completions-dir) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out #$bash-completion-dir)) + (mkdir-p (string-append out #$fish-completion-dir)) + (mkdir-p (string-append out #$zsh-completion-dir)) (copy-file "etc/completion/completion.bash" - (string-append bash-completions-dir "/delta")) + (string-append out #$bash-completion-dir "/delta")) (copy-file "etc/completion/completion.zsh" - (string-append zsh-completions-dir "/_delta")) + (string-append out #$zsh-completion-dir "/_delta")) (copy-file "etc/completion/completion.fish" - (string-append fish-completions-dir "/delta.fish")))))))) + (string-append out #$fish-completion-dir "/delta.fish")))))))) (native-inputs (list git-minimal pkg-config)) (inputs (list libgit2-1.7 openssl zlib)) (home-page "https://github.com/dandavison/delta")