From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eJmWOUjc3GQEIAEASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 16:25:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oClwOUjc3GQ5qAAAauVa8A (envelope-from ) for ; Wed, 16 Aug 2023 16:25:12 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 79237340EC for ; Wed, 16 Aug 2023 16:25:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=oJ89GPg3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692195912; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=GiqCSgkee9wcuhJQGL+KP6OjNFii/gv6JU2QCTLsJNA=; b=UueqNVe000TqBvUArRYcwtm9TU+c2nbLRN/Z+oPyZ3S5V1FZOTiMUuR7j9o5cKLbIoIYrg 7kpUu+QpJU2np/jf2ZjwubPvXffOBhXDMUWH8C+i+OqB8MZwOoTPpia+sCmw2Y0jh1y7th Q7NstsBD8LDgkSodSdPFKQlH7dqyN2OuIMDW90MBFXqw88x3LXN/QIRXNAMxNKHCrkCRHo sgpqwisfDEeVKJbg5TY6q6V4gvtjAEQgPiRrFj499Qn27wslYxvC0KemTmoPFPLgcubOG1 ojfZ10UNukJ7PoPNLefMzLGWVGaY4yA+9dvbE0DJOPqH2QyYqz4H4CvvXzu/5A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=oJ89GPg3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692195912; a=rsa-sha256; cv=none; b=pe9TNsaBL+63bWRMtS1/Q87nxUVZHrcDThLD4BSNQ3+MdOLEL1SJy3pSzYDZ4xsWr0HJOI iywzWthTApzSNOskWeY0PiGQB1iFM1ieWJFgKp+GGxFdoj532DZuTR4n6L9Vn1lt6PzCO3 OVuGkigYuUCA1FUjxsgyyGK7Ih4u7nYlt7KCkFBBb9a3GkEPX8HFOwNRVAv6YDj4CpCSPe QLBaX3KRWpv26yMpDk/g/0yeUgb7L5EpRQDuOk3jFRgzLlCkccOCrlbbtzBTeHRvDHYdbM xoEIXF9Na9EL0plAtBDs8v6gYEvKBWk1j8OiKkZsyRhMZK1tbZ2lvRzReFOeUQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWHSK-0003lV-Tl; Wed, 16 Aug 2023 10:25:04 -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 1qWHSJ-0003l6-0s for guix-patches@gnu.org; Wed, 16 Aug 2023 10:25:03 -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 1qWHSI-0003Or-Nn for guix-patches@gnu.org; Wed, 16 Aug 2023 10:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWHSI-0004Dh-6k for guix-patches@gnu.org; Wed, 16 Aug 2023 10:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65107] [PATCH v2] gnu: Add gf. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 14:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: dan Cc: 65107@debbugs.gnu.org Received: via spool by 65107-submit@debbugs.gnu.org id=B65107.169219588416194 (code B ref 65107); Wed, 16 Aug 2023 14:25:02 +0000 Received: (at 65107) by debbugs.gnu.org; 16 Aug 2023 14:24:44 +0000 Received: from localhost ([127.0.0.1]:41782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWHRz-0004D7-Vh for submit@debbugs.gnu.org; Wed, 16 Aug 2023 10:24:44 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWHRx-0004Cy-Fa for 65107@debbugs.gnu.org; Wed, 16 Aug 2023 10:24:42 -0400 Date: Wed, 16 Aug 2023 22:23:27 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1692195862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GiqCSgkee9wcuhJQGL+KP6OjNFii/gv6JU2QCTLsJNA=; b=oJ89GPg39yvUckWD35RrsPFV2rXaiQyg/WU5D1jSbjhcbEnsPvYNQyqOnMe8MT5Si2WHv6 qNRj6BEfn7pco6k5riiDnQnO4M3TjX1x3y0otpN3my5izoHOs+EeGIvGxdpwpXm8jwq9WS UgKLTxkDL9/V+a3epOcYKoiBO96fpUWmu+j2fQ1fE3Hd0ZdVn6AUz3Qf/ilQB953V78GH6 QptITRw+qk7fnNlMqFSkeOOwb9ic1utZQB2/7q4sLZNp7wgjHgzAjS0+IEQPy8eMQ6tITn p+CESrrhqcEXzQiKNumyF08B+u31b1QTtsP1S2T8c5NRYUrjDQ8aKlH7Cn+mqg== Message-ID: <87y1ibqd5s.wl-hako@ultrarare.space> In-Reply-To: <20230808015808.5485-1-i@dan.games> References: <20230806055213.29704-1-i@dan.games> <20230808015808.5485-1-i@dan.games> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.68 X-Spam-Score: -6.68 X-Migadu-Queue-Id: 79237340EC X-Migadu-Scanner: mx2.migadu.com X-TUID: etFvluoOfRbG Hi dan, On Tue, 08 Aug 2023 09:57:59 +0800, dan wrote: > > The following is the updated patch changed according to Hilton's > suggestion. Note that for the vim version in guix we don't have `--servername' > support, but I patched it anyway. > > --- If you want to add explanation which isn't part of the commit message to a patch, you can add it below the first "---" (i.e. here). Content above that line is used as git commit message. And in Guix there's a vim-full package. > gnu/packages/debug.scm | 91 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 91 insertions(+) > > diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm > index e2a29a3ae9..57d0d3b479 100644 > --- a/gnu/packages/debug.scm > +++ b/gnu/packages/debug.scm [...] > + #:phases #~(modify-phases %standard-phases > + (add-after 'unpack 'patch-path > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (substitute* "gf2.cpp" > + (("\"gdb\";") > + (format #f "\"~a\";" > + (search-input-file inputs "/bin/gdb"))) > + (("\"vim ") > + (format #f "\"~a " > + (search-input-file inputs "/bin/vim"))) > + (("grep") > + (format #f "~a" > + (search-input-file inputs "/bin/grep"))) > + (("fc-list") > + (format #f "~a" > + (search-input-file inputs > + "/bin/fc-list"))) > + (("fc-match") > + (format #f "~a" > + (search-input-file inputs > + "/bin/fc-match"))) > + (("awk") > + (format #f "~a" > + (search-input-file inputs "/bin/awk")))))) Then here, search-input-file returns a string so those (format #f "~a" ...) invocations are unnecessary, some of the substitutions can be merged into one as well: --8<---------------cut here---------------start------------->8--- (("grep|fc-list|fc-match|awk" cmd) (search-input-file inputs (string-append "/bin/" cmd))) --8<---------------cut here---------------end--------------->8--- Thanks