From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 18 13:59:42 2021 Received: (at submit) by debbugs.gnu.org; 18 Jan 2021 18:59:42 +0000 Received: from localhost ([127.0.0.1]:48479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Zkc-00041m-2r for submit@debbugs.gnu.org; Mon, 18 Jan 2021 13:59:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:40188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Zka-00041e-8A for submit@debbugs.gnu.org; Mon, 18 Jan 2021 13:59:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1ZkZ-0001R7-VS for guix-patches@gnu.org; Mon, 18 Jan 2021 13:59:39 -0500 Received: from box.euandre.org ([46.101.160.115]:40423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1ZkX-0008RO-JF for guix-patches@gnu.org; Mon, 18 Jan 2021 13:59:39 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 2F411FC3F9; Mon, 18 Jan 2021 15:59:31 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1610996373; bh=9gU8A6UaeOenC0nJh1Gp0yL2Rn7sVHrOWNiXq3D1XSs=; h=From:To:Cc:Subject:Date:From; b=UQsR0V+oQLkilc4wLPBeBxw0Q34kUNW+CFWQdsOYMksJAnrfKTfLJxB9avCtk1GNk V69Vrs02mZ3H6OYeM2NKSfAizcj/IBFNiEO2Zwx8l4oNhD9lcCM8QGWV36kIazUdDS WFPIPAg1+NGMuLhUXrEcVFGuawJJlh8CLaEw8PxIUezq7ZmZZmg3gtb0KMU4Hnbb50 fiIvYplIAmKaZ8D5H+MmtQ3seYh3ZxjsIF/cdaEMdJ92BczZ5o/Gtff+d1aDr7PtJd C2bYR5yMobFZh4X3JMYFIlJAAMRR2tFFVo7gmTshf2B61VtyWN7Am2uphAMeEOcqqZ dve0Z19N4u5JQ== From: EuAndreh To: guix-patches@gnu.org Subject: [PATCH 0/2] Update fzf, include binaries and install completions Date: Mon, 18 Jan 2021 15:59:25 -0300 Message-Id: <20210118185925.24412-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=46.101.160.115; envelope-from=eu@euandre.org; helo=box.euandre.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) I've tested both the package update and the extra phases added. The Bash completions are being installed properly, but I haven't tested the zsh ones. I remember seeing somewhere a discussion on aliasing this type of package, so that the "go-github-com-junegunn-fzf" is the default imported Go module, to be used as input for other packages, and adding a top-level "fzf" package, which does the ad-hoc packaging code I've added, so that a user can install the "fzf" package with Bash integration and similar features. I couldn't find anything on the manual also, I welcome comments on this :) EuAndreh (2): gnu: go-github-com-junegunn-fzf: Copy binaries and install shell completions. gnu: go-github-com-junegunn-fzf: Update to 0.25.0. gnu/packages/terminals.scm | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 18 14:05:13 2021 Received: (at 45965) by debbugs.gnu.org; 18 Jan 2021 19:05:13 +0000 Received: from localhost ([127.0.0.1]:48487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Zpw-0004Bd-Ph for submit@debbugs.gnu.org; Mon, 18 Jan 2021 14:05:13 -0500 Received: from box.euandre.org ([46.101.160.115]:39923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Zpt-0004BF-RY for 45965@debbugs.gnu.org; Mon, 18 Jan 2021 14:05:10 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 0B41CFD45A; Mon, 18 Jan 2021 16:05:02 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1610996704; bh=H/qw+HiIDitapABDW73Ckv6zzm3wLr78sBeJZE9IxdM=; h=From:To:Cc:Subject:Date:From; b=QnIPvid+uP8p0rT7ApZd9qIAelcjfNkDkXsVUtAVenAf/WeV/sqQCRV+5DQApCGMT nCMP48va73Dnb9j7spioU0os062LvDah7YZNnN1Tcu/yJGvpBh5JLlhXcpKywNvBTD r71hWde8W9eplW5NYRiXAf5R2UPgAkX2r4bMGqcCMQQCwVDiKWYCXl3GSfWk2DPRI1 wMGmMpkBEfll6tjkSLRi7F6t4770NJrXSEK4OAA1B3bGLTEJBZghWUahYhXuNpP2+7 WTp9uYgnqCMvDYBQkXVRb22dcgULSpq9lQuUa1U6i/mc2zyT2QAlXx13gVdYDveUxV glrwOjWJDdIXg== From: EuAndreh To: 45965@debbugs.gnu.org Subject: [PATCH 1/2] gnu: go-github-com-junegunn-fzf: Copy binaries and install shell completions. Date: Mon, 18 Jan 2021 16:04:58 -0300 Message-Id: <20210118190459.27787-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45965 Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/terminals.scm (go-github-com-junegunn-fzf)[arguments]: Add copy-binaries, wrap-programs and install-completion phases. --- gnu/packages/terminals.scm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 74e1937bbc..308ff99bf0 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -813,7 +813,33 @@ programmer to write text-based user interfaces.") "0n0cy5q2r3dm1a3ivlzrv9c5d11awxlqim5b9x8zc85dlr73n35l")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/junegunn/fzf")) + `(#:import-path "github.com/junegunn/fzf" + #:phases + (modify-phases %standard-phases + (add-after 'install 'copy-binaries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "src/github.com/junegunn/fzf" + (install-file "bin/fzf-tmux" + (string-append out "/bin")))))) + (add-after 'copy-binaries 'wrap-programs + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses"))) + (wrap-program (string-append out "/bin/fzf-tmux") + `("PATH" ":" prefix (,(string-append ncurses "/bin"))))))) + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash-completion (string-append out "/etc/bash_completion.d")) + (zsh-completion (string-append out "/share/zsh/site-functions"))) + (with-directory-excursion "src/github.com/junegunn/fzf" + (mkdir-p bash-completion) + (copy-file "shell/completion.bash" + (string-append bash-completion "/fzf")) + (mkdir-p zsh-completion) + (copy-file "shell/completion.zsh" + (string-append zsh-completion "/_fzf"))))))))) (inputs `(("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth) ("go-github-com-mattn-go-shellwords" ,go-github-com-mattn-go-shellwords) @@ -821,7 +847,8 @@ programmer to write text-based user interfaces.") ("go-github-com-gdamore-tcell" ,go-github-com-gdamore-tcell) ("go-github-com-saracen-walker" ,go-github-com-saracen-walker) ("go-golang.org-x-sync-errgroup" ,go-golang.org-x-sync-errgroup) - ("go-golang-org-x-crypto" ,go-golang-org-x-crypto))) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("ncurses" ,ncurses))) (home-page "https://github.com/junegunn/fzf") (synopsis "Command-line fuzzy-finder") (description "This package provides an interactive command-line filter -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 18 14:05:13 2021 Received: (at 45965) by debbugs.gnu.org; 18 Jan 2021 19:05:13 +0000 Received: from localhost ([127.0.0.1]:48489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Zpx-0004Bf-2T for submit@debbugs.gnu.org; Mon, 18 Jan 2021 14:05:13 -0500 Received: from box.euandre.org ([46.101.160.115]:44663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Zpv-0004BH-0S for 45965@debbugs.gnu.org; Mon, 18 Jan 2021 14:05:11 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 9078AFD45B; Mon, 18 Jan 2021 16:05:04 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1610996705; bh=gIZucQtbYT+qyfidQATwPycxZLpYmHX05ejOXnCXnCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DRvjmbcOh/xBx9jc54LBTWg7wczzH//qousm276ALWU7PUuhc6dbOUo5Jk1mOcigM KxUg0w/RqJELCQfhzWb/4fHb1uiUkaVda/w2H+JQYfn86/zcwbLXIgOZLRfKW6INuj 0Bd8XnRaVS54ZxWUX73K+yyb58Wvrh11w9mfxVdiAOahfJm0PHCk+ISqZshV225S7+ 3ENcORP6mLPVaVMk4o3iTh9kdmAhPc3qpr459Ykf7Ei8WiAuUOnHmJdeLvzJoeoVlu TuRs1iTbPY6wxf23PmKBlYO4jRTYwJJuF2YQMNvWpHYCrWGihiuzixipzozgC+/5mn dFdZiFxr/hN7g== From: EuAndreh To: 45965@debbugs.gnu.org Subject: [PATCH 2/2] gnu: go-github-com-junegunn-fzf: Update to 0.25.0. Date: Mon, 18 Jan 2021 16:04:59 -0300 Message-Id: <20210118190459.27787-2-eu@euandre.org> In-Reply-To: <20210118190459.27787-1-eu@euandre.org> References: <20210118190459.27787-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45965 Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/terminals.scm (go-github-com-junegunn-fzf): Update to 0.25.0. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 308ff99bf0..9c89134aaa 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -800,7 +800,7 @@ programmer to write text-based user interfaces.") (define-public go-github-com-junegunn-fzf (package (name "go-github-com-junegunn-fzf") - (version "0.22.0") + (version "0.25.0") (source (origin (method git-fetch) @@ -810,7 +810,7 @@ programmer to write text-based user interfaces.") (file-name (git-file-name name version)) (sha256 (base32 - "0n0cy5q2r3dm1a3ivlzrv9c5d11awxlqim5b9x8zc85dlr73n35l")))) + "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8")))) (build-system go-build-system) (arguments `(#:import-path "github.com/junegunn/fzf" -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 05 15:57:53 2021 Received: (at submit) by debbugs.gnu.org; 5 Feb 2021 20:57:53 +0000 Received: from localhost ([127.0.0.1]:44712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l88Ar-0006Sj-6t for submit@debbugs.gnu.org; Fri, 05 Feb 2021 15:57:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:53396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l88Ap-0006SZ-Ki for submit@debbugs.gnu.org; Fri, 05 Feb 2021 15:57:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l88Am-0007n1-1E for guix-patches@gnu.org; Fri, 05 Feb 2021 15:57:51 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:40281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l88Ae-0006Md-L0 for guix-patches@gnu.org; Fri, 05 Feb 2021 15:57:46 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 1B44F1BF204; Fri, 5 Feb 2021 20:57:33 +0000 (UTC) From: Nicolas Goaziou To: guix-patches--- via Subject: Re: [bug#45965] [PATCH 0/2] Update fzf, include binaries and install completions References: <20210118185925.24412-1-eu@euandre.org> Date: Fri, 05 Feb 2021 21:57:33 +0100 In-Reply-To: <20210118185925.24412-1-eu@euandre.org> (guix-patches@gnu.org's message of "Mon, 18 Jan 2021 15:59:25 -0300") Message-ID: <87y2g2w7uq.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=217.70.183.201; envelope-from=mail@nicolasgoaziou.fr; helo=relay8-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: 45965@debbugs.gnu.org, EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hello, guix-patches--- via writes: > I've tested both the package update and the extra phases added. > The Bash completions are being installed properly, but I haven't tested > the zsh ones. > > I remember seeing somewhere a discussion on aliasing this type of package, > so that the "go-github-com-junegunn-fzf" is the default imported Go module, > to be used as input for other packages, and adding a top-level "fzf" package, > which does the ad-hoc packaging code I've added, so that a user can install > the "fzf" package with Bash integration and similar features. Indeed, having to install "go-github-com-junegunn-fzf" when you are really looking for "fzf" is not very intuitive. So, "fzf" could inherit from "go-github-com-junegunn-fzf" and add all the bells and whistles. Would you want to provide a patch for that? Meanwhile, I'm going to apply the update and leave the first patch out. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 05 17:37:01 2021 Received: (at 45965) by debbugs.gnu.org; 5 Feb 2021 22:37:01 +0000 Received: from localhost ([127.0.0.1]:44788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l89in-0000Mq-5y for submit@debbugs.gnu.org; Fri, 05 Feb 2021 17:37:01 -0500 Received: from box.euandre.org ([46.101.160.115]:48793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l89il-0000Mc-8t for 45965@debbugs.gnu.org; Fri, 05 Feb 2021 17:37:00 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 1DF3FFC3F9; Fri, 5 Feb 2021 19:36:50 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1612564612; bh=CGgDA1b/H+luGeVZDE7QvD7FlIEkYnvQ0jsEERBFMw0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=YqCeTSoQUuRVUOxYWrWxtkO1MYWgHQi/oLC9uhy84z5ivvljDxXPxKPY6H7iYP/Q8 vWQlkizRNbNruuPFJCG1HyqCxC8RKulBms6Ewnyo2nDQEw+b0ztbziFI//UP1FIFjP +25Y6YOBv/Fuskn5f12tFxTIftT2jjtkSWWSLY8cQYpRURz9q9NAq/l4z9MoV82Q79 zsFnXDw1ndaSfYs4R5kZrNSXdAq66v3TDJuRzI/bp3cGhGoPKD9mz7y+AEs04/DpMB PJutjDXPLtA2tdyDVTPmv6l6OOewgmaMqCnf2Yh8lqvex0h1fOjHztfW/KwdiWS7Vb Xixbh/vX7nxsw== From: EuAndreh To: Nicolas Goaziou , 45965@debbugs.gnu.org Subject: Re: [bug#45965] [PATCH 0/2] Update fzf, include binaries and install completions In-Reply-To: <87y2g2w7uq.fsf@nicolasgoaziou.fr> References: <20210118185925.24412-1-eu@euandre.org> <87y2g2w7uq.fsf@nicolasgoaziou.fr> Date: Fri, 05 Feb 2021 19:31:46 -0300 Message-ID: <87v9b6ywml.fsf@euandre.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45965 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Nicolas Goaziou writes: > Would you want to provide a patch for that? Sure, I'll do it in the next few days. From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 08 12:08:41 2021 Received: (at 45965) by debbugs.gnu.org; 8 Feb 2021 17:08:41 +0000 Received: from localhost ([127.0.0.1]:51795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9A1g-0004bm-Ol for submit@debbugs.gnu.org; Mon, 08 Feb 2021 12:08:40 -0500 Received: from box.euandre.org ([46.101.160.115]:55875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9A1e-0004bZ-3Q for 45965@debbugs.gnu.org; Mon, 08 Feb 2021 12:08:39 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 06B61FC3F7; Mon, 8 Feb 2021 14:08:30 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1612804112; bh=SGC67XDans0fk8MAcaMolNlzE6CVYYQrnQvXhOU+w84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qjUmr4Hn9uW2OdJ/1DcG492qkSEUUmbcL8mUjB5x2L/siM3pbdejJvbl+EjeklkWK cucS6wPYIkuS5XlUTTk7Dsd2+I4c8QRNvG7sG9kQthn4oNbE39jMm0JU4N3aXjkRB/ v68Qq0T9o7pvurQvCH2Wd895YhbcFwu0rue3huWfpGmm0RS3e1lsho8r6W25oOt0b7 ONn3vvu+g03aAuxJDa3tpq+jiCxPH7KHkh+EAn6lWNCmPuq6GAKitma2R6ASowtpXq AeqYwwRoKlklVPTYoLC9l24uoBOa58XJdXeyHJSj3ASr/dESVojeXfyBCzVXHkF5sd hxoXIgCphdTYg== From: EuAndreh To: mail@nicolasgoaziou.fr, 45965@debbugs.gnu.org Subject: [PATCH] gnu: Add fzf. Date: Mon, 8 Feb 2021 14:08:27 -0300 Message-Id: <20210208170827.29641-1-eu@euandre.org> In-Reply-To: <87v9b6ywml.fsf@euandre.org> References: <87v9b6ywml.fsf@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45965 Cc: EuAndreh X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/terminals.scm (fzf): New variable, which inherits from the existing go-github-com-junegunn-fzf package, but also install other binary, and completion for direct usage. --- Done as discussed. gnu/packages/terminals.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index a9897ec623..7ccba97968 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -824,6 +824,43 @@ programmer to write text-based user interfaces.") usable with any list--including files, command history, processes and more.") (license license:expat))) +(define-public fzf + (package + (inherit go-github-com-junegunn-fzf) + (name "fzf") + (arguments + `(,@(ensure-keyword-arguments + (package-arguments go-github-com-junegunn-fzf) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'copy-binaries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "src/github.com/junegunn/fzf" + (install-file "bin/fzf-tmux" + (string-append out "/bin")))))) + (add-after 'copy-binaries 'wrap-programs + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses"))) + (wrap-program (string-append out "/bin/fzf-tmux") + `("PATH" ":" prefix (,(string-append ncurses "/bin"))))))) + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash-completion (string-append out "/etc/bash_completion.d")) + (zsh-completion (string-append out "/share/zsh/site-functions"))) + (with-directory-excursion "src/github.com/junegunn/fzf" + (mkdir-p bash-completion) + (copy-file "shell/completion.bash" + (string-append bash-completion "/fzf")) + (mkdir-p zsh-completion) + (copy-file "shell/completion.zsh" + (string-append zsh-completion "/_fzf"))))))))))) + (inputs + `(,@(package-inputs go-github-com-junegunn-fzf) + ("ncurses" ,ncurses))))) + (define-public go-github.com-howeyc-gopass (let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8") (revision "0")) -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 19 17:16:07 2021 Received: (at 45965-done) by debbugs.gnu.org; 19 Mar 2021 21:16:08 +0000 Received: from localhost ([127.0.0.1]:51127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNMTX-0006c0-Lm for submit@debbugs.gnu.org; Fri, 19 Mar 2021 17:16:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNMTV-0006VP-QS for 45965-done@debbugs.gnu.org; Fri, 19 Mar 2021 17:16:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43616) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNMTP-0007oB-FD; Fri, 19 Mar 2021 17:15:59 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59476 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lNMTP-0003gZ-1k; Fri, 19 Mar 2021 17:15:59 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: EuAndreh Subject: Re: bug#45965: [PATCH 0/2] Update fzf, include binaries and install completions References: <87v9b6ywml.fsf@euandre.org> <20210208170827.29641-1-eu@euandre.org> Date: Fri, 19 Mar 2021 22:15:56 +0100 In-Reply-To: <20210208170827.29641-1-eu@euandre.org> (EuAndreh's message of "Mon, 8 Feb 2021 14:08:27 -0300") Message-ID: <87o8fec0ab.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45965-done Cc: 45965-done@debbugs.gnu.org, mail@nicolasgoaziou.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, EuAndreh skribis: > * gnu/packages/terminals.scm (fzf): New variable, which inherits > from the existing go-github-com-junegunn-fzf package, but also > install other binary, and completion for direct usage. I think it had fallen through the cracks; applied! > + (arguments > + `(,@(ensure-keyword-arguments ^^^ I simplified this to: (arguments (ensure-keyword-arguments =E2=80=A6)) Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 21 09:42:53 2021 Received: (at 45965-done) by debbugs.gnu.org; 21 Mar 2021 13:42:53 +0000 Received: from localhost ([127.0.0.1]:53762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNyM1-0001Dd-Kb for submit@debbugs.gnu.org; Sun, 21 Mar 2021 09:42:53 -0400 Received: from box.euandre.org ([46.101.160.115]:60951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNyLw-0001DA-4B for 45965-done@debbugs.gnu.org; Sun, 21 Mar 2021 09:42:49 -0400 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 8A4D0FC3F1; Sun, 21 Mar 2021 10:42:40 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1616334161; bh=/olLKZA5yVgQspEHT+5Zphv/JyzdgiTIXe8zovEp9ck=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=eFxSXH7lMNbAVV1FlygIkUhONVclBo+u6o3BVpPbEb/rYTWgslGez8dHj7ycULnwk K5DkUfGBC83wWilTiqeU3o4RzhST+DOnWvdC1x/jhjmkrLJLUxxYXhMclWQMlr+2ky mSgJ2CTjySPOVsJBmT8c0eUVwrf0/Ye4asjUZZ/xyEsE13mK0USY7CDBFcL1/9MTom x/OxpAfMoqqsVvmBKgCPP/tLKb44VfvotboGEEZCkCZ0JSdd5EjfGZIv90HvZhWsiP sYgLpOGA0lSd9nGBFYmh5KgN+EVPAEvfeJEsxnuqaxWqPHETSBN3CAkIj3Fwsq+rQk /a4E6Pav6k00g== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <87o8fec0ab.fsf_-_@gnu.org> References: <87v9b6ywml.fsf@euandre.org> <20210208170827.29641-1-eu@euandre.org> <87o8fec0ab.fsf_-_@gnu.org> Subject: Re: bug#45965: [PATCH 0/2] Update fzf, include binaries and install completions From: EuAndreh To: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 21 Mar 2021 10:42:35 -0300 Message-ID: <161633415545.27353.16979333116852472176@localhost> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45965-done Cc: 45965-done@debbugs.gnu.org, mail@nicolasgoaziou.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thanks :) From unknown Thu Jun 19 14:25:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 19 Apr 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator