From patchwork Thu Mar 27 08:46:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40871 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 D753D27BBE2; Thu, 27 Mar 2025 08:49: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=-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=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 61B4727BBE2 for ; Thu, 27 Mar 2025 08:49:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txivG-000418-UD; Thu, 27 Mar 2025 04:49:10 -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 1txivE-00040h-QW for guix-patches@gnu.org; Thu, 27 Mar 2025 04:49:09 -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 1txivD-0003Cw-Ij; Thu, 27 Mar 2025 04:49:07 -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=P1LbC7KsgcgiMFqLwNtWCzK14nopyLN3+2Vd56PV994=; b=enNqa9RnK0kDJSgsb7gsFWshp6L/5Nm4+URURs89gIO13h61w4oMX2nk2LFolM5+m4mzKUgkEu3Rd+Jvenz+qd0Eaiv4F2PbxqlPZQkuZ4wmv4E3lKJEmPrKC3wHBPtPB4+Jwhcx7u1xjULCND5p33Q/nifEtOHwsk660p0aPYGgl/VB7+EIcIWIrFF2Sqrc1j1tf2n/+nSK6tqOiEKAm9CQmWGehiQSDvevNWz+8edHybW3LCZsTRwN4BiposhtjaHJyVhRE1OxrZ2/UMesjxl4bUzi8Jfulzf9AZJ4u1tRDRVHVk7VlbMHbzwg9p3HuXh+knNtZzHmS9mbkJv8FA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiv9-0002hn-CA; Thu, 27 Mar 2025 04:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 1/6] guix: Add shell completion directories. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 08:49:03 +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>, Efraim Flashner , Ian Eure , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 77181-submit@debbugs.gnu.org id=B77181.174306533010266 (code B ref 77181); Thu, 27 Mar 2025 08:49:03 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:48:50 +0000 Received: from localhost ([127.0.0.1]:47399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txiut-0002f1-5I for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:48:50 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:43128) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiuo-0002dL-Om for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:48:44 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cf680d351so10347715e9.0 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065316; x=1743670116; 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=P1LbC7KsgcgiMFqLwNtWCzK14nopyLN3+2Vd56PV994=; b=h6tBosxBFBbk7+pg7ZYtVHnEXhSmIkVDA97EV0VwEYyrdf6DZRzmvyibkv5Z9tTDtc IenNzoDK2vT2C06QusvSRf6yWh6VJ9GRovWHC+0pD6W4C66jAeYIEeoRlpumrtzlIa25 Z1XdojWRPpsJdXbFTay52q4kOYn4fMqx1QrhaD+3QUb9dcPQSDz1aFLrUJNLl3k2OCQv PhWYkJlJRwDhknLJVF1NLXhxhZ+JASHiEwg8HMcs61aNDIfax+nnP475OTse2EXFk7DL zL73QBnL6yw7wZtrNwXi0gLNcpKVtYNIHlw1EwKxaaGL16POQpcs3BrPCvNMgb85FmIa bPlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065316; x=1743670116; 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=P1LbC7KsgcgiMFqLwNtWCzK14nopyLN3+2Vd56PV994=; b=t91HBvRWM9fn/pXxZScTJ8cfUM28RHjIzcNCmOBnOZlZDzC/aVBhKAuM80133D8o4f DR9+dtyDdct/KFJ8v6lYLiz9H9pfZBtzkUgUmKS5VunSjxDFDnCEtA2Qb4JOziUXrT88 44ZI5WuhSB1ykDpNPkMjWjEVqWw5bXE1zxrM18j1zUaHp3osFVbYsktHa4n3RN+qMtiu fKXoYyzGprdNGnjaPjZsuqKMFwmN0X0GmjS1re4pZovT/PVmiYoTK5a0jXTHg9KcDCaA 1+U9Mx1yLAMR0+sDHyYoTU7FpaoSOMzgy4OojiSEn4AB81FFuqU+902A5WSfXKUjyGsM omBA== X-Gm-Message-State: AOJu0YzWLk7iOgUy08Ax0DBDasMbpRpFSRS6z+9Kr2+qNZnXPAQ1DVXv aF6XUVBBanjFTrODaO3GG7wLwhDe/XLNKAqvVZ3FB65Wqve/A7uohobdAdkT X-Gm-Gg: ASbGnctgDx/2I0GaIT1Z6c1qiW2iQQAIwSI/N0aLVyyxxkH/KYz/H3d6hzIjWxIODuA DyP7Ocl0Ow7iZAGcL2ogOD7z5TmBSmU/T52Z9MJnS2Apbqat5BLdRGwUiP4YO3ESWuu3WI6gAb1 ncVBLcHQcTkc6etxPXs8cANZvr1IGhyT8fMm5vofGUI7nrIGDaVso4Z6EGk1q3lM+hFEiiREZvq mV1+FO9+BFJh4GNqEkA7zVO5f76j1KjO9UcRGxHIP/tWLh7CpBMSymsRzZmFwyr0nrMUCSXHruF Ft52NtZx8PefZVACHMGHd6llbUehzEMwE2LFncldNYofdg/f3aEXQ1NPVNk= X-Google-Smtp-Source: AGHT+IFQLx6HMrILILwoBHy9lROA1JWaGGH1lvwaQIjy2H2DsQ38R2dJWOdx9kaN/7r4AisEy/pOLg== X-Received: by 2002:a05:6000:1fa5:b0:39a:c6c4:f87b with SMTP id ffacd0b85a97d-39acc444a34mr5842621f8f.5.1743065316151; Thu, 27 Mar 2025 01:48:36 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d8314b9e9sm29941685e9.37.2025.03.27.01.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:35 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:40 +0200 Message-ID: <3c72e49e718f95b1836b22289dc2209550d146a8.1743065002.git.efraim@flashner.co.il> 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 * guix/utils.scm (bash-completion-dir, fish-completion-dir, zsh-completion-dir, elvish-completion-dir, nu-completion-dir): New variables. Change-Id: I076bd26a87f196a32fb9542cd8058fc1d2a12aa9 --- guix/utils.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/guix/utils.scm b/guix/utils.scm index c7c23d9d5ba..2108eff7a75 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018, 2020 Marius Bakke -;;; Copyright © 2020, 2021, 2024 Efraim Flashner +;;; Copyright © 2020, 2021, 2024, 2025 Efraim Flashner ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Chris Marusich @@ -149,6 +149,12 @@ (define-module (guix utils) config-directory cache-directory + bash-completion-dir + fish-completion-dir + zsh-completion-dir + elvish-completion-dir + nu-completion-dir + readlink* go-to-location edit-expression @@ -1193,6 +1199,36 @@ (define-syntax current-source-directory ;; raising an error would upset Geiser users #f)))))) + +;;; +;;; Shell completion directories. +;;; + +(define bash-completion-dir + ;; The standard directory for installing bash completions. + ;; https://github.com/scop/bash-completion?tab=readme-ov-file#faq + "/share/bash-completion/completions/") + +(define fish-completion-dir + ;; The standard directory for installing fish completions. + ;; https://fishshell.com/docs/current/completions.html#where-to-put-completions + "/share/fish/vendor_completions.d/") + +(define zsh-completion-dir + ;; The standard directory for installing zsh completions. + ;; https://github.com/z-shell/wiki/blob/main/ecosystem/plugins/zsh_navigation_tools.mdx#install-zsh-navigation-tools + "/share/zsh/site-functions/") + +(define elvish-completion-dir + ;; The standard directory for installing elvish completions. + ;; https://elv.sh/ref/command.html#module-search-directories + "/share/elvish/lib/") + +(define nu-completion-dir + ;; The standard directory for installing nushell completions. + ;; https://www.nushell.sh/book/configuration.html#startup-variables + "/share/nushell/vendor/autoload/") + ;;; ;;; String comparison. From patchwork Thu Mar 27 08:46:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40874 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 CD99027BBEA; Thu, 27 Mar 2025 08:50:47 +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 6780827BBE2 for ; Thu, 27 Mar 2025 08:50:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwK-0004Ey-DZ; Thu, 27 Mar 2025 04:50:16 -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 1txiw9-0004Bd-JJ for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:06 -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 1txiw9-0003SW-33 for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:05 -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=gQy/qi7E+UZbDNyGvJCEILwrpWtfAyxzR6cka7EmnQg=; b=VK8bUvoIr4o5cAesnsAfYz4MQoGk8r3dM2+nkzw9Sr7kX13HjAnTst5f44ES3LWnAUoiaPGu3nZPZTbr9RLhluXd1WIdbTnKwpo2rFODtPBay2XbJEZvcNqIVlwjTo29zip/gJOitYNZYOQ29YEaQYAtrKH7OMAheWdfjVYG1kzqlGVCo5wlVVIPG7zcfYXUZlSebKsgVAohJeLhmxV+iCl1Eqci6xVJslGAQYX4KKDH0HQ5WxZFGrJfwKOLlnbS7fLdop3yM0CK0/9Whecyg0oTzjRxFgfJzezMyK1ZvKFHwKn53MseWsygVD8X8k13wqTb/wVG9zFQ4GZAA6dwZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiw8-0002rd-Nw for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 2/6] gnu: pass-age: Fix shell completion directories. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 08:50:04 +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 Received: via spool by 77181-submit@debbugs.gnu.org id=B77181.174306534710441 (code B ref 77181); Thu, 27 Mar 2025 08:50:04 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:07 +0000 Received: from localhost ([127.0.0.1]:47410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivD-0002iJ-51 for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:07 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:59884) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiuu-0002dx-1k for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:48:50 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-38f2f391864so319244f8f.3 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065322; x=1743670122; 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=gQy/qi7E+UZbDNyGvJCEILwrpWtfAyxzR6cka7EmnQg=; b=ifE6Us2VnU+7hmcsjzGXV5SsVBs9qQPYSTLmxbqp1thcjbv/I0APpbI6sQZrLYiy4r Pj7nPVDxtfGIXRVVM7o8U49zNgN/m1u7f5ECJK1i9sfdqO6pVxUXPHmoBt3ixlYeWCMo QW/t6HE7i+GIuq56tsnaF504KuRS0hH+00WoL/XqvrLrkvCVjpfecOa5BA83KKNFVwE/ UwCZMPXKFfJGoSV9gTY3H4/LdD3H7hE798Nspgs+54BQr2X6oLtbpz7v4FiDhGKfkE5Q nt2xX/Af36U2ZtZu3PKE4n5mNnVBqhaO/p8/S3CM42wED5I3CNkQEzt7f/FeRuMNNIyv p2HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065322; x=1743670122; 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=gQy/qi7E+UZbDNyGvJCEILwrpWtfAyxzR6cka7EmnQg=; b=sk1pdp/juluK84iL8KspVRcJS0q1p5elbHlhRhnItzE7T6/LugY6p0yqKSXTsAOrl3 UEfHBx2Gzb2CAWub6UoIG5Hfex7jBeGXqnLXVWIVX4Flx+zUM18xtco5Qrkf1uOx6yWw VWMj7HOw4pKWW1WL61Pn1AjR7VeulX+q/hXneFHIpNVN00X3Wjo0D0wBKanFe+wc3vmZ zgaxv3zZbQXe1XwLrwFPt3gGtxtjRJnaxlwMvbPxT1QI6uUAVqQJ/AG2dTczIBiV1D+O yUsEdQYfrfHDteEOsBJ/1d0MvtIzV3pMTY+rDaV2NfS5jz6G86ykL47b+U6MoylrgAHC WotQ== X-Gm-Message-State: AOJu0Ywc/IHLuQ6JkgE5bU9Lo7RxcorrOGuUZ4dlFoGB00+3syelgFma UHtAAEFFwIO1oPiZooVrorlSwH6/5MvbEg5BaOeng7VFRL7SA1as19B023Hb X-Gm-Gg: ASbGncueeIhJeJKY+G/eIO63s8315OD1xStqAHc22aSHAJp19N2XW1sZ6BDV4lsA47a OirlzDWlaV5xFeKRMfPRgYc3XYuZKuh2E+RLhyP4JBINBkahAf9oU4rGwvOOVVcVPpTxTfsxLTB ii2DuGWwfozBmzxzyWitS9PBT9TwvHBwdf/vpxxwdObRNE0M0I1doPHkp40QZhJp1OXusMu/Dww GTjt/pVTxL0vaA31lxHnSbZSyCThP/xrx4Tb2GgL1vytbVr6AnueGdeRx7eJL6daFTVEt9A3V6W dSkxapwxpYcaXlO7Y00DT8aEcbAYYyGtyjjOF2f03/QE/7/rLu7nYmRyzZk= X-Google-Smtp-Source: AGHT+IElRjoAUrZD7ChK0lQ9WTLjfRGZQStWl9be/8W0n21ZL3iT3wad5idaWN5lFVDww/uEOU0hng== X-Received: by 2002:a05:6000:400c:b0:391:275a:273f with SMTP id ffacd0b85a97d-39ad17401cbmr2019984f8f.4.1743065321560; Thu, 27 Mar 2025 01:48:41 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f995a10sm19072245f8f.6.2025.03.27.01.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:41 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:41 +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/password-utils.scm (pass-age) [arguments]: Use the shell completion directory variables. Change-Id: I6ed77cff28a1fb7305d8a0357026e518dcc0e11a --- gnu/packages/password-utils.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index bce4af8e5f0..23fa82a2e54 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -845,7 +845,7 @@ (define-public pass-age (base32 "1ap2i08zjvacd2rllrsx9bw3zz5i99bk0i5yxrssvn6w60bwjqdl")))) (build-system copy-build-system) (arguments - '(#:modules + `(#:modules ((guix build copy-build-system) (guix build utils) (srfi srfi-26)) @@ -879,11 +879,11 @@ (define-public pass-age #:install-plan '(("src/passage" "/bin/") ("src/completion/pass.bash-completion" - "/etc/bash-completion.d/passage") + ,(string-append bash-completion-dir "passage")) ("src/completion/pass.fish-completion" - "/share/fish/vendor_completions.d/passage") + ,(string-append fish-completion-dir "passage")) ("src/completion/pass.zsh-completion" - "/share/zsh/site-functions/_passage")))) + ,(string-append zsh-completion-dir "_passage"))))) (inputs (list age coreutils-minimal git-minimal procps qrencode sed tree util-linux)) From patchwork Thu Mar 27 08:46:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40873 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 33C8827BBE2; Thu, 27 Mar 2025 08:50:40 +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=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 74D8F27BBE9 for ; Thu, 27 Mar 2025 08:50:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwM-0004IH-MX; 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 1txiwF-0004Eh-9k for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:12 -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 1txiwE-0003TD-FV for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:10 -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=gXgLDuo2SYsQqX5cdnBp2oKQnTeH3HDJ9mMqRI64ONo=; b=OTqtd0K6kunjjRM1vlS6VB8K7go69hSmXov66H2nVsZXkRGvTYHConol5XrSWl8N3YRwLl6I/O/iSNHgGedbfqCTeoYxVUJdC/4ZSgnp2VUtOMb/i3v24AI/aoStUT+yP7UctL6mqG95480w2BMprj4Lken98TZmmB1NP9R7fDcrMG/oMQQYIYpXNShRlZdbfUcHJszmCfnyCvzo4aHDK5r3ToH3M8LZ+Yu18K/p7kXM7ED9KtY/KhwX/BhwJkxIXRKLY0E490yJOFAxBnLATDofU8C+CMbG/OpinYGQJlCgWo/7wF8gWKoouhbAk7jE10pGa/dImrjjvbayaWOK0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwB-0002sH-AI; Thu, 27 Mar 2025 04:50:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 3/6] gnu: ouch: 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:07 +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.174306535210496 (code B ref 77181); Thu, 27 Mar 2025 08:50:07 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:12 +0000 Received: from localhost ([127.0.0.1]:47413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivD-0002iR-MT for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:11 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:47471) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiuw-0002ec-MQ for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:48:53 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso7266785e9.3 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065324; x=1743670124; 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=gXgLDuo2SYsQqX5cdnBp2oKQnTeH3HDJ9mMqRI64ONo=; b=IkPe9xie0zDNc/jf7HJOsxPdWRWBOAbGDqGQEN1kGJYOYnxCfPnI0Kg1pw8p8/WN73 0RIGMFNrhZcY8KLqjtmV31oVrjvQDuQvSDw+1mzZlZ1dLe/BvtFCZWgtoTEAJuiUTQjq YXtUmGovy+3X2SUd7qHZFAdru3o2EMm5hp3McUs0BcGilH5i85fpZcZRx6iEEgUqNSsm GZ/Uutq/Z0cVfh3vzXZkYFtukfb5lgGrgOCeBmiSNPKePuT2oxySCplAi/AZDqwvhC52 UVnQsK2+DWWKcZs/5dqUGzlqUxjHZTJr1m6quO8K+J1o/rKSIisjeoFQIBHp7ekrZYzq 7J5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065324; x=1743670124; 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=gXgLDuo2SYsQqX5cdnBp2oKQnTeH3HDJ9mMqRI64ONo=; b=HHamtB/qIn4C0snTJIewt9Sf7tWkxt6hYGsDBDYzK5zzpE08/hnjflBLVUWUAbrr3Z WfSozm2BmFI8McJry3ZVd4iQw2JuLT09erxaLQyDpRDgNx/JUCjjDZe6OpCbUmoSUZKm EV449NTsS2WIdSgRWWSIxURDyMgGip5/aN56qiP1driLWdCGjNAgsJ4xHU2YbgBLCUkM a8aYrl2jzDrarHo6m8T895upHMLIEhYwQD6UJxatR9GZ3jJmk0XT1dY/bA9+1fh4tJcP F/7ZjTYmYL044NZXxuQ/Ew9UnsXJs8hWSEdKrITlxSldDoWcJQVWmuzGQfoFJEiWCi6I Wm4w== X-Gm-Message-State: AOJu0YzOf5DvlHlydJn9WH/4JNYbKFxqMUVYBEQTbpdzIZ+xNJHGeaGa d9nlOcLQ7sdeK0PzLZMoNBQ8n7x+XEI+huIkhkQ6WVKLtajswHRYuJ3vQzPF X-Gm-Gg: ASbGncuhuUcR7L84G02XOcomkXlz0TY/XByFkxikXkFwNUSXBxQ6lgS8q8W2oPNIcug Ky7hyjomgOVdrtymCBeYHW9dBiIQIzfY1PvIDgWbTQHcOrjV9/5XhGwqa5FYH2aXNZ5Y1jgSznG h9RplyVxhid6KyHnBfqJTdrl6F4I+X/GQdK48o/4s48Zug3vn+/+Vyums+wt95H1O+Dv71G1Sui 9KAwyySVsPgfaMivuozdPtnY4WSy4txMol9sjtu8N833+VI8U3l6FHAqRbYaGklKPqWS2lFKcMS Wb8EmJP5SU2MkzbSFnYyAkyz6csWFIs1gCF8yvqDpN+jJbz3 X-Google-Smtp-Source: AGHT+IHa1yWivBzqba0QLRblHPFJoIIydntdFxrlAB3Tm0QrGMZfAK8zV45fI2I/eCdmmjpr3vMziA== X-Received: by 2002:a5d:59a7:0:b0:38d:eb33:79c2 with SMTP id ffacd0b85a97d-39ad174e4famr1965093f8f.32.1743065324231; Thu, 27 Mar 2025 01:48:44 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39abfc2115asm13224512f8f.4.2025.03.27.01.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:43 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:42 +0200 Message-ID: <76d0f9fece99b9f7716fd5b6e166e1b872c64520.1743065002.git.efraim@flashner.co.il> 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 (ouch) [arguments]: Use the shell completion directory variables. Change-Id: I63f2be695e9d8dc15de61bbbb470c54e47a6a197 --- gnu/packages/rust-apps.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 2f933d836c5..0371fd4c264 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2348,25 +2348,17 @@ (define-public ouch (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")) - (elvish-completions-dir - (string-append share "/elvish/lib")) (man1 (string-append share "/man/man1"))) - (mkdir-p bash-completions-dir) - (mkdir-p elvish-completions-dir) + (mkdir-p (string-append out ,bash-completion-dir)) + (mkdir-p (string-append out ,elvish-completion-dir)) (copy-file "target/ouch.bash" - (string-append bash-completions-dir "/ouch")) + (string-append out ,bash-completion-dir "ouch")) (install-file "target/_ouch" - (string-append zsh-completions-dir "/_ouch")) + (string-append out ,zsh-completion-dir)) (install-file "target/ouch.fish" - fish-completions-dir) + (string-append out ,fish-completion-dir)) (copy-file "target/ouch.elv" - (string-append elvish-completions-dir "/ouch")) + (string-append out ,elvish-completion-dir "ouch")) (for-each (lambda (manpage) (install-file manpage man1)) (find-files "target" "\\.1$")))))))) 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") From patchwork Thu Mar 27 08:46:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40876 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 6FE8427BBEA; Thu, 27 Mar 2025 08:51:00 +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 95F0B27BBE2 for ; Thu, 27 Mar 2025 08:50:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwR-0004Jr-5K; Thu, 27 Mar 2025 04:50:23 -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 1txiwI-0004Gx-Px 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 1txiwI-0003TQ-Em for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:14 -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=Duxy7A94xBDehCittGSTp7AqP/60PPHb1igrtIYocmc=; b=beAJiHm8Wqdi+kVRSUjJh/Pi2+1KCcQ5k3Zt+wogJk/yRHxbiw08CXJjeuJ/IytT7kWe183/XKPO3VEp/23LtDMinp8EkMVCMh45HeiWc/yJarQpaZzOS7g87t/2zy1S+/b+k6CbF1+ogSM62mJhg8+BOAIxx/mVLqCqVmZnx9ApLsTqSHRVoXdc1SMiiwITj1Y4Zcz+P9LU8oyRK7YbJMff7zDRL9DpcJQwKlolXTUvLP8YTQzRDX2rHqBgog8cXbFUuMkqz37n7h8tbx1WAO2FmjxuykmF0cEcXgLpoafLE5oHQ5/XW90FFuVHUlpXm0uM2y/cOTPK964SfoWi0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwH-0002v8-UI; Thu, 27 Mar 2025 04:50:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 5/6] gnu: zoxide: 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:13 +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.174306535810555 (code B ref 77181); Thu, 27 Mar 2025 08:50:13 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:18 +0000 Received: from localhost ([127.0.0.1]:47417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivK-0002jf-Ab for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:17 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:51610) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txiv4-0002g1-3a for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:02 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d04ea9d9aso2930775e9.3 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065332; x=1743670132; 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=Duxy7A94xBDehCittGSTp7AqP/60PPHb1igrtIYocmc=; b=M/B5iN7vEUxzW91OjUHz+Q3DK+IBpQuj5RDo2N2tvUXFobQS67yqOJVNkGCqfK100P qz6p/E8mvrYZba/Yc5jDWLo14rT4cXMhg8vUNYn3SPisbOCAKptH9wdoFDeWt9WP3yXJ ZHtIF2Nzdh+HeyO3q2hJj2BqxJA5JND6I1gFWcSkrOReSVPInf3fxYlzMHNHGQr771+t kNNqnnlfPeiR//Kc/GRkv/P0RTP8owOqehOomxm7ptC8rXukq+HWQT3kQ8PBZv4wd/G3 Fpw/J8iK5rcaDoY5RABAsO/3aJjd87s6a1q1TkjhD+1wY9GYK9FkN/m5AtCIPVjI3vkB 09Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065332; x=1743670132; 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=Duxy7A94xBDehCittGSTp7AqP/60PPHb1igrtIYocmc=; b=AsuxeMZqVwUJxUjB8ogmoVqU1UAZe1xXViY++77mTMzJyRrUOdjYCJfsE4xz6QqH2Q 90oBiLJG6G8H5GGIw6Zf5e7CTbTNRNR4BJN9NWw3hGJYeYBaIXSEX5dhJjz8PRo3pOQp edK3miozX/kmuyaqVmYEk59doSDzasriP4ghiJanQ5IemJtI75EnuGCqosXFXu1ehAwr fgsvJo7BHW+FI1O7QqnRZpmhvKDTZTLiO6od3vgiSTUfMZC2hthn8/emvU6hjTsi3YwL G4DX1onkxbNxbI4LJSAwVi/AU5+JVDuYQVXusda1NBDy3Rm+Uzski/7x7xySWKOtqD/h k7wQ== X-Gm-Message-State: AOJu0Yzsg6e895+sTDlM0492ENbq3WOCo84CQz3ewHxAlIhBiqkUfcbq kBN1g7k4S8bkYxi2Bul3NK87CUGgDBwNz41hfWXJI9lpGhpb1PPAtbUFGxEd X-Gm-Gg: ASbGncsghXzPOsd5T4KAEGOUP6Op51bRcloZUohqNNEb5jinV/aazN6PR4kf3dlP4Xn Gd5aetdrJAG2cSOMAo1MZaCWF6g0+G7nSLJpN1dKgDaTB9wVBuadxTg/3lHJIrocQoqX7yjMeui tls/htqkg6GOzHSZBu40eOuUmgdOq7EIeV4fNT/zzfj1Wm2ekK1Emu6mBLwVzXCA77UcTLgZglR vB3SiEL9DyDjJEwbYz7SJbn2nf4rKnJ00bDXq9JV6k3lhfUQhGb3dr/Tc2QVd+z3qsJTzfVY6E5 oeKdVHgVae5b7bq/jJo2u4UgR4v3qPwg3mNP8E8AUBhiH36n X-Google-Smtp-Source: AGHT+IHBdVhdoHD6a7NG0Go4B83pMDqGKzK35Zv0PT209FuLLyS1xt1v0XXau0r3zas43dftlyQm6Q== X-Received: by 2002:a5d:59ae:0:b0:391:4873:7943 with SMTP id ffacd0b85a97d-39ad175004emr2195790f8f.32.1743065331623; Thu, 27 Mar 2025 01:48:51 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d82a041d4sm32103515e9.0.2025.03.27.01.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:51 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:44 +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 (zoxide) [arguments]: Use the shell completion directory variables. Change-Id: I55f1a9f5c37a6b795f0021ea8b08f472c16847e9 --- gnu/packages/rust-apps.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 55861ecc924..48fefd3064a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -4864,30 +4864,22 @@ (define-public zoxide (lambda _ (let* ((out #$output) (share (string-append out "/share")) - (man1 (string-append share "/man/man1")) - (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")) - (elvish-completions-dir - (string-append share "/elvish/lib"))) + (man1 (string-append share "/man/man1"))) ;; The completions are generated in build.rs. (mkdir-p man1) - (mkdir-p bash-completions-dir) - (mkdir-p elvish-completions-dir) + (mkdir-p (string-append out #$bash-completion-dir)) + (mkdir-p (string-append out #$elvish-completion-dir)) (for-each (lambda (file) (install-file file man1)) (find-files "man/man1")) (copy-file "contrib/completions/zoxide.bash" - (string-append bash-completions-dir "/zoxide")) + (string-append out #$bash-completion-dir "/zoxide")) (install-file "contrib/completions/zoxide.fish" - fish-completions-dir) + (string-append out #$fish-completion-dir)) (install-file "contrib/completions/_zoxide" - zsh-completions-dir) + (string-append out #$zsh-completion-dir)) (copy-file "contrib/completions/zoxide.elv" - (string-append elvish-completions-dir + (string-append out #$elvish-completion-dir "/zoxide")))))))) (home-page "https://github.com/ajeetdsouza/zoxide/") (synopsis "Fast way to navigate your file system") From patchwork Thu Mar 27 08:46:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 40872 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 765F927BBEA; Thu, 27 Mar 2025 08:50:32 +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 E331027BBE2 for ; Thu, 27 Mar 2025 08:50:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txiwO-0004J2-LV; Thu, 27 Mar 2025 04:50:20 -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 1txiwM-0004IF-KT for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:18 -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 1txiwL-0003Tf-Hp for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:18 -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=7BrhaAT3/iL9Z1vX86cHiQ0qtQtFXyL98U58EpkAdXE=; b=ZdtToLzLVwvkUys3k3ud/WPoig+bKCZ/td431YCv7NxhnM93YfEKu8fmRF6FpbdUtD7NKb/+ufOXTUw5GQdnF3oB4O6G0qN2nN3wZQSwCeb6XF/+BlyoN3NuGVohxmxKJSHL/X2QjRKvYXTCu/hsel2zHPJQ70+CpkVyXBbVAVyxdsyWIBTs97jYujTjX8Of+EuOdP7czHxIwE4Bmr2G7DUFOSFCBWTRqVd8AaalQjnns9Pg9CtpHWs9KFkMHz3vSaR1q4Xqr2uxPUBCL4mwDBaSlwKimsXBQrUYov6DqC+qUXKyjkNg+leJXrVRZdR/rEPiDk5NYmEc7Kb1KgWMXA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txiwL-0002wO-6W for guix-patches@gnu.org; Thu, 27 Mar 2025 04:50:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77181] [PATCH v2 6/6] gnu: starship: Fix shell completion directories. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 08:50:16 +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 Received: via spool by 77181-submit@debbugs.gnu.org id=B77181.174306535910569 (code B ref 77181); Thu, 27 Mar 2025 08:50:16 +0000 Received: (at 77181) by debbugs.gnu.org; 27 Mar 2025 08:49:19 +0000 Received: from localhost ([127.0.0.1]:47419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txivN-0002kC-T4 for submit@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:18 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:52573) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txivA-0002h3-89 for 77181@debbugs.gnu.org; Thu, 27 Mar 2025 04:49:04 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3913cf69784so456678f8f.1 for <77181@debbugs.gnu.org>; Thu, 27 Mar 2025 01:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743065338; x=1743670138; 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=7BrhaAT3/iL9Z1vX86cHiQ0qtQtFXyL98U58EpkAdXE=; b=i+dRSwOZJkhgmJyU2bW4OgfZjwxW45lTsPcfB2mcU3EHQxj/tGRflznU2eM/vFvXKJ ssyak+Er1Y50j+YPZgugK4V+RsumPjeypqNEecUN29+MZmjIaVgAybt4pJTWzOTvADAk Egckvu43qxj9dHYN/ZxxJX1rDy5cVmvUahgSD1yYx6rpKPqfcJ7WkR2sDGFuLDZT0dAC wUBpNqUGmP0yYnQtfKOpWjqM79Ultuegy1edMs9nkWtTBYpvHI2xwTSoLqO+Sh2U1SEx IB4ouDSdFgnCZ6tckli57Gaxt+elK+xttaeDQP/0oepkT2qobsSD0F5Mri7zuuZVo5RA 8PoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743065338; x=1743670138; 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=7BrhaAT3/iL9Z1vX86cHiQ0qtQtFXyL98U58EpkAdXE=; b=Uij/tAknWCmwzzUtb04MSz7NVEOIARqRgy2YdcUvuUwU6KXSDIiLnMuzTQ1zvv3lba zWIzs5z4G9ndRCFIOO5kf+7tJyd+zoJdmsc0+FQAYIE8R8Krl1AVZgt1pgjjLMPzgXX7 RG4+Or4daehyMJIqddHqiRp9Hx8O/vsutPLxC1QRhXpOiRBY/xfclcn25vkKrqiOU54Y muqtPFJ0A+h9Dm6VxDkuUj+RVNx9b605lIs+fNpJCb854/IF2UoSbXs6lUHISA0TV6jv /9ZMUMk1ZqSzuWBmVWx7uZFI/6hcEiO+qBumK83d1Cxy8HF8upAU2mtCDip2AVjE7P9G NAVw== X-Gm-Message-State: AOJu0Yxw4cqeFm/y9f1/0uxa2nMvSt5xx1pxntQk+qHQKNjLj2rTfSRR vsMaiDj6SG8bEUX1pbzjM3MzCgK+EIhW0dezeyVobA1ils8i9FDVC78pZg1W X-Gm-Gg: ASbGncvpc1AxdAXqxWz598cKDIRTfAN5xiQwQSnYxcwrI/JfvrOYjhRdnm3NdGfebur HsHcT942V5DU32/vy64Dejc5v+w8DSesnEh9rBPk/7XKTdyUVPkiRO+02tCgtOwCEhaQ3va5ZVe CesQ/nueS3e6zGB8yiwryI8+D1ZTaKIT4AYRWQDvmvix+7qwCSylGNjBmAC6Qco+GVcxPwl4YjK kph+gLU6sbx5z7ivUCEjL4iNpD8nAmckOZD/wMjF+9EXTo3JXSfHhAKoDat3PkTWYVvDPgyEbKy PJo54swOedZ0tB0F6rctVmtwQO8SEJJ+q6RURCFIUZl+r3la X-Google-Smtp-Source: AGHT+IGgHXcjGWLqC7ExkK4jt+FfF7sgxBkBxHM4HXBLdB98SBu0Gg50urz5qscK749q9gU/uq3gng== X-Received: by 2002:a5d:6c6c:0:b0:38c:2745:2df3 with SMTP id ffacd0b85a97d-39ad17845f7mr2226725f8f.37.1743065337920; Thu, 27 Mar 2025 01:48:57 -0700 (PDT) Received: from localhost ([141.226.15.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d82f32573sm29655025e9.32.2025.03.27.01.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 01:48:57 -0700 (PDT) From: Efraim Flashner Date: Thu, 27 Mar 2025 10:46:45 +0200 Message-ID: <4f04fc067b4ce22ceb22154d89fcf1c58f8931dd.1743065002.git.efraim@flashner.co.il> 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/shellutils.scm (starship) [arguments]: Use the shell completion directory variables. Change-Id: Ie286218d636a56745013ebdb23461691fdf16d11 --- gnu/packages/shellutils.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 28c8af8685a..c7723cb2e04 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -496,33 +496,24 @@ (define-public starship (starship-bin (if #$(%current-target-system) (search-input-file native-inputs "/bin/starship") - (string-append out "/bin/starship"))) - (share (string-append out "/share")) - (bash-completion-dir - (string-append out "/etc/bash-completion.d/")) - (zsh-completion-dir - (string-append share "/zsh/site-functions/")) - (fish-completion-dir - (string-append share "/fish/vendor_completions.d/")) - (elvish-completion-dir - (string-append share "/elvish/lib"))) + (string-append out "/bin/starship")))) ;; Make the directories - (mkdir-p bash-completion-dir) - (mkdir-p zsh-completion-dir) - (mkdir-p fish-completion-dir) - (mkdir-p elvish-completion-dir) + (mkdir-p (string-append out #$bash-completion-dir)) + (mkdir-p (string-append out #$zsh-completion-dir)) + (mkdir-p (string-append out #$fish-completion-dir)) + (mkdir-p (string-append out #$elvish-completion-dir)) ;; Use the built starship to generate the completions. (with-output-to-file - (string-append bash-completion-dir "/starship") + (string-append out #$bash-completion-dir "/starship") (lambda _ (invoke starship-bin "completions" "bash"))) (with-output-to-file - (string-append zsh-completion-dir "/_starship") + (string-append out #$zsh-completion-dir "/_starship") (lambda _(invoke starship-bin "completions" "zsh"))) (with-output-to-file - (string-append fish-completion-dir "/starship.fish") + (string-append out #$fish-completion-dir "/starship.fish") (lambda _ (invoke starship-bin "completions" "fish"))) (with-output-to-file - (string-append elvish-completion-dir "/starship") + (string-append out #$elvish-completion-dir "/starship") (lambda _ (invoke starship-bin "completions" "elvish")))))) ;; Some tests require a writable home directory (add-after 'unpack 'patch-test-shell