From unknown Fri Jun 20 07:23:32 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#56995 <56995@debbugs.gnu.org> To: bug#56995 <56995@debbugs.gnu.org> Subject: Status: [PATCH] gnu: ugrep: Use gexps and add zstd to inputs. Reply-To: bug#56995 <56995@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:23:32 +0000 retitle 56995 [PATCH] gnu: ugrep: Use gexps and add zstd to inputs. reassign 56995 guix-patches submitter 56995 kiasoc5 severity 56995 normal tag 56995 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 05 00:33:33 2022 Received: (at submit) by debbugs.gnu.org; 5 Aug 2022 04:33:33 +0000 Received: from localhost ([127.0.0.1]:55624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJp1h-0001Kp-Ee for submit@debbugs.gnu.org; Fri, 05 Aug 2022 00:33:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:60858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJp1f-0001Kg-PJ for submit@debbugs.gnu.org; Fri, 05 Aug 2022 00:33:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJp1f-0008JQ-KY for guix-patches@gnu.org; Fri, 05 Aug 2022 00:33:31 -0400 Received: from knopi.disroot.org ([178.21.23.139]:42618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJp1c-0002Og-Qg for guix-patches@gnu.org; Fri, 05 Aug 2022 00:33:31 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6DAFE40F26; Fri, 5 Aug 2022 06:33:25 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A1V2zF63E6QK; Fri, 5 Aug 2022 06:33:24 +0200 (CEST) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659674004; bh=eqM4igRf0NLNr4Nspn3pG8fsmal/nNIH64Gz7Nw95Ao=; h=From:To:Cc:Subject:Date; b=KKh/EjjH7ACX9Wz7H2nEuJ0BI8bMR/rP2pKKkQECTxkuCFeufzQYOlERiWKBAdjF1 ufTJ8hrO0cWcfv7MwGwvH0xNqXHyHsa0wQUJbvp6NGmcpd1TE/TbNEN9sygJXBKhHF Czsjs76PQDokMgVjyOKq6dK85JNBUY1r4UK4MOdXQaELnh9F0DV4GrWcD1Zb39l9Fl zxmqtIWVimiLBDtkjiP46EW0MQ+QUMqy9y7XT7z98fxcfPEPV4YRuX0V8SFv4KBvFZ mQoRLyjp37zeyxAb35HGdY6O1Zv7XIJ/Gx3QFXIBFNq2THkAJVUwTGel908Fht/jvX EkZjjTpN7Yw2Q== To: guix-patches@gnu.org Subject: [PATCH] gnu: ugrep: Use gexps and add zstd to inputs. Date: Fri, 5 Aug 2022 00:32:56 -0400 Message-Id: <20220805043256.286451-1-kiasoc5@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.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_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: kiasoc5 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 (--) * gnu/packages/search.scm (ugrep)[snippets]: Remove trailing #t. [arguments]: Use gexps. [inputs]: Add zstd. --- gnu/packages/search.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index db5579a708..620c8dbe1f 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -32,6 +32,7 @@ (define-module (gnu packages search) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -687,8 +688,7 @@ (define-public ugrep (delete-file-recursively "bin") ; pre-built executables (for-each delete-file (find-files "tests" "^archive\\..*")) (for-each delete-file (find-files "tests" "^.*\\.pdf$")) - (for-each delete-file (find-files "tests" "^.*\\.class$")) - #t)))) + (for-each delete-file (find-files "tests" "^.*\\.class$")))))) (build-system gnu-build-system) (inputs (list bzip2 @@ -696,18 +696,20 @@ (define-public ugrep lz4 lzip ;; lzma pcre2 - zlib)) + zlib + zstd)) (arguments - `(#:tests? #f ; no way to rebuild the binary input files - #:test-target "test" - #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; Unpatch shebangs in tests. - (substitute* '("tests/Hello.bat" - "tests/Hello.sh") - (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) + (list + #:tests? #f ; no way to rebuild the binary input files + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; Unpatch shebangs in tests. + (substitute* '("tests/Hello.bat" + "tests/Hello.sh") + (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) (home-page "https://github.com/Genivia/ugrep/") (synopsis "Faster grep with an interactive query UI") (description "Ugrep is a ultra fast searcher of file systems, text -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 05 01:15:04 2022 Received: (at 56995) by debbugs.gnu.org; 5 Aug 2022 05:15:04 +0000 Received: from localhost ([127.0.0.1]:55691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJpfr-0002ay-K3 for submit@debbugs.gnu.org; Fri, 05 Aug 2022 01:15:04 -0400 Received: from knopi.disroot.org ([178.21.23.139]:49548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJpfq-0002aP-61 for 56995@debbugs.gnu.org; Fri, 05 Aug 2022 01:15:02 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7225940D7D; Fri, 5 Aug 2022 07:15:01 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NhFSaSOxOxu5; Fri, 5 Aug 2022 07:15:00 +0200 (CEST) Date: Fri, 5 Aug 2022 05:14:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659676500; bh=UCh//byvpMi6TwZHtY/k7vgQWAI8aBBeLrEm7mZbDwE=; h=Date:From:To:Subject:In-Reply-To:References; b=JXBE4UENNBjDUFKkCYkKZYNyacQfTouKNAm2UhfnRIrMs6KfBSIzcx2vjjH8ZmpPY NRFZd27hgqvNH8AEIIujjcpHzZAKGjfc/eTONn3DCl0RS/gABzeNa/LbRb+zQT1X5+ 2q+hT9X0NqmAy1cAfr37E4BxNYucc67wqxvdb5YWLM2EtlaA/WOF6mj7GTQYiBlGms 4h49OAHbwP5mRQrFBeFroTiYuyVexecCqiyF7CX/I4n9C8Xj4BvbKMeGW+pUFQQkDS HMAM3jkwltne6h/bjlUIE0bP1f22SWPK9fKXp/K0xmORE4f4tz+SBJg7LTtcs0uFH8 +f14mZ3Zj7Ucg== From: kiasoc5 To: paren@disroot.org, 56995@debbugs.gnu.org Subject: Re: [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs. Message-ID: <20220805051456.11725518@aria> In-Reply-To: <20220805050959.344944-1-kiasoc5@disroot.org> References: <20220805050959.344944-1-kiasoc5@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56995 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 (-) On Fri, Aug 05 2022, 01:10:00 AM -0400 kiasoc5 wrote: > Last email had old version of patch, please use this one. Sorry paren > for using cc instead of reply-to. Also forgot to check my git-send email arguments. Sending to the correct issue. > * gnu/packages/search.scm (ugrep)[snippets]: Use gexps. Remove > trailing #t. [snippets]: Use gexps. > [arguments]: Likewise. > [inputs]: Add zstd lib. > --- > gnu/packages/search.scm | 33 +++++++++++++++++---------------- > 1 file changed, 17 insertions(+), 16 deletions(-) > > diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm > index db5579a708..65a642c259 100644 > --- a/gnu/packages/search.scm > +++ b/gnu/packages/search.scm > @@ -32,6 +32,7 @@ (define-module (gnu packages search) > #:use-module (guix packages) > #:use-module (guix download) > #:use-module (guix git-download) > + #:use-module (guix gexp) > #:use-module (guix utils) > #:use-module (guix build-system gnu) > #:use-module (guix build-system perl) > @@ -681,14 +682,12 @@ (define-public ugrep > (sha256 > (base32 > "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57")) (file-name > (git-file-name name version)) > - (modules '((guix build utils))) > - (snippet > - '(begin > + (snippet #~(begin > + (use-modules (guix build utils)) > (delete-file-recursively "bin") ; pre-built > executables (for-each delete-file (find-files "tests" > "^archive\\..*")) (for-each delete-file (find-files "tests" > "^.*\\.pdf$")) > - (for-each delete-file (find-files "tests" > "^.*\\.class$")) > - #t)))) > + (for-each delete-file (find-files "tests" > "^.*\\.class$")))))) (build-system gnu-build-system) > (inputs > (list bzip2 > @@ -696,18 +695,20 @@ (define-public ugrep > lz4 > lzip ;; lzma > pcre2 > - zlib)) > + zlib > + `(,zstd "lib")) > (arguments > - `(#:tests? #f ; no way to rebuild the binary > input files > - #:test-target "test" > - #:phases > - (modify-phases %standard-phases > - (add-before 'check 'check-setup > - (lambda _ > - ;; Unpatch shebangs in tests. > - (substitute* '("tests/Hello.bat" > - "tests/Hello.sh") > - (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) > + (list > + #:tests? #f ; no way to rebuild the binary > input files > + #:test-target "test" > + #:phases > + #~(modify-phases %standard-phases > + (add-before 'check 'check-setup > + (lambda _ > + ;; Unpatch shebangs in tests. > + (substitute* '("tests/Hello.bat" > + "tests/Hello.sh") > + (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) > (home-page "https://github.com/Genivia/ugrep/") > (synopsis "Faster grep with an interactive query UI") > (description "Ugrep is a ultra fast searcher of file systems, > text From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 05 03:36:07 2022 Received: (at 56995) by debbugs.gnu.org; 5 Aug 2022 07:36:07 +0000 Received: from localhost ([127.0.0.1]:56009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJrsN-0004aS-8x for submit@debbugs.gnu.org; Fri, 05 Aug 2022 03:36:07 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:25250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJrsK-0004aH-RQ for 56995@debbugs.gnu.org; Fri, 05 Aug 2022 03:36:05 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4LzcpS5ntbz1LXt0; Fri, 5 Aug 2022 09:36:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4LzcpS5ntbz1LXt0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1659684960; bh=TkLNiVovQfiguuY9zPeyyaIh06qEn2DomlcZIXQezo4=; h=Subject:From:To:Date:In-Reply-To:References:From; b=VZ5fU8D9zk5/B/hEMPht0KRWjIK4CL1pjfuMqwBgrgGGwcf6hm24BmJyKg1jOyl21 TCCGx/oLb3xC+o0JNdNqNJA7+a0zKTe7YSshkhi8RD6Wh+PbaKkiigGFFKdWotgk2p n5VWdTg3DfPd2ZYI8nPECiaMaWpldjS04OWb4agw= Message-ID: <8f611a9aa9447906a46bb59a6371ee8059362e0d.camel@ist.tugraz.at> Subject: Re: [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs. From: Liliana Marie Prikler To: kiasoc5 , paren@disroot.org, 56995@debbugs.gnu.org Date: Fri, 05 Aug 2022 09:35:59 +0200 In-Reply-To: <20220805051456.11725518@aria> References: <20220805050959.344944-1-kiasoc5@disroot.org> <20220805051456.11725518@aria> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56995 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: -3.3 (---) Am Freitag, dem 05.08.2022 um 05:14 +0000 schrieb kiasoc5: > Use gexps and add zstd lib to inputs. Useful hint: If your patch title contains "and", it probably should be a series of two or more patches. 😉️ Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 06 01:38:10 2022 Received: (at 56995) by debbugs.gnu.org; 6 Aug 2022 05:38:10 +0000 Received: from localhost ([127.0.0.1]:60943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKCVm-0002Z4-6A for submit@debbugs.gnu.org; Sat, 06 Aug 2022 01:38:10 -0400 Received: from knopi.disroot.org ([178.21.23.139]:46568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKCVk-0002Yw-HU for 56995@debbugs.gnu.org; Sat, 06 Aug 2022 01:38:08 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E022440F1A; Sat, 6 Aug 2022 07:38:07 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gtyjRS24Y0Bs; Sat, 6 Aug 2022 07:38:07 +0200 (CEST) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659764285; bh=1128XuPLuVyxq+Ur8BCE7u0uRxMo8CFusdZsxodOTp4=; h=From:To:Cc:Subject:Date; b=gLJfUE4L83fxeh+5hbhH4qiwnJk3G5tqwfOg+a+KjAdGfSndoAi3H8K1aiQFBdZFx QaZAJ+63vQQ/S/RFjOEf/MUpnfTTpm0D3HrzuEJu0S3r2a3Gxk1sb+aYYCyHMAHhtH aWdyd6p7xJaH7p3BY9FgYccgMLQV2budQzqr4xuQvZuPDWqCWApRQsLPKLVZ8P/bDH FZBygugREY7xFfcdRD0P8K5xCywaDJt56f+ABOmD7KO5uaNRRzafnZ9nTP6NHzE9cz a+CLcaJ9FdvqHg4FOXRu9LLW9dEvQt9TrZLb0ft4Pfxsa1SXzUEV9UpjggBmMY1X+5 OCIHOnHWAtmQA== To: 56995@debbugs.gnu.org Subject: [PATCH 1/2] gnu: ugrep: Add zstd lib to inputs. Date: Sat, 6 Aug 2022 01:37:50 -0400 Message-Id: <20220806053750.184243-1-kiasoc5@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56995 Cc: kiasoc5 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/search.scm (ugrep)[inputs]: Add zstd lib. --- gnu/packages/search.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index db5579a708..175a31cd5d 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -696,7 +696,8 @@ (define-public ugrep lz4 lzip ;; lzma pcre2 - zlib)) + zlib + `(,zstd "lib")) (arguments `(#:tests? #f ; no way to rebuild the binary input files #:test-target "test" -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 06 01:38:16 2022 Received: (at 56995) by debbugs.gnu.org; 6 Aug 2022 05:38:16 +0000 Received: from localhost ([127.0.0.1]:60946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKCVs-0002ZN-F6 for submit@debbugs.gnu.org; Sat, 06 Aug 2022 01:38:16 -0400 Received: from knopi.disroot.org ([178.21.23.139]:47218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKCVq-0002ZF-Bi for 56995@debbugs.gnu.org; Sat, 06 Aug 2022 01:38:14 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B219440DCB; Sat, 6 Aug 2022 07:38:13 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zXYI7Lryiir9; Sat, 6 Aug 2022 07:38:12 +0200 (CEST) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659764292; bh=YhYeYTpKQET9FgBk+5CU0YioHDLE1DekQu54PwGWevI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JK9TDQohREqlbfY0NunNlxKssRWAvIlYPv/E6Kt5s+ExA9CL4fIrLj3dOE82+nkAG rhSAze23Ed/yfHwm/mu5bEd6Qrlubsg6Ng05qPTEiRuqEMGPRP7EpnjwNWcz6CYbEz gnt4T1LRRXhlxEcmuXu2eC3vNww818k5uRI4Z5+epgF9uMmoL6RvqNYIhRc5XEzdUr rM2mjWrP/97lSj9053W8MaRomDU+Ds2Q6k/YVMqZwB8Kmn4t1UD8PFxdOGXgOX+n1P nuCF3W2yKOdNH86mfScVvtl2XePisc1qOudARs5adXSp8f4bPUlJmrE0VJku1Kk7Hu VEiKzpz3vSwNQ== To: 56995@debbugs.gnu.org Subject: [PATCH 2/2] gnu: ugrep: Use gexps. Date: Sat, 6 Aug 2022 01:37:52 -0400 Message-Id: <20220806053750.184243-2-kiasoc5@disroot.org> In-Reply-To: <20220806053750.184243-1-kiasoc5@disroot.org> References: <20220806053750.184243-1-kiasoc5@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56995 Cc: kiasoc5 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/search.scm (ugrep)[source]: Convert snippet to gexp. [arguments]: Use gexps. --- gnu/packages/search.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 175a31cd5d..34dc6d5faf 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -32,6 +32,7 @@ (define-module (gnu packages search) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -681,14 +682,12 @@ (define-public ugrep (sha256 (base32 "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57")) (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "bin") ; pre-built executables - (for-each delete-file (find-files "tests" "^archive\\..*")) - (for-each delete-file (find-files "tests" "^.*\\.pdf$")) - (for-each delete-file (find-files "tests" "^.*\\.class$")) - #t)))) + (snippet #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "bin") ; pre-built executables + (for-each delete-file (find-files "tests" "^archive\\..*")) + (for-each delete-file (find-files "tests" "^.*\\.pdf$")) + (for-each delete-file (find-files "tests" "^.*\\.class$")))))) (build-system gnu-build-system) (inputs (list bzip2 @@ -698,18 +697,19 @@ (define-public ugrep pcre2 zlib `(,zstd "lib")) - (arguments - `(#:tests? #f ; no way to rebuild the binary input files + (arguments + (list + #:tests? #f ; no way to rebuild the binary input files #:test-target "test" #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - ;; Unpatch shebangs in tests. - (substitute* '("tests/Hello.bat" - "tests/Hello.sh") - (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) - (home-page "https://github.com/Genivia/ugrep/") + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; Unpatch shebangs in tests. + (substitute* '("tests/Hello.bat" + "tests/Hello.sh") + (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) + (home-page "https://github.com/Genivia/ugrep/") (synopsis "Faster grep with an interactive query UI") (description "Ugrep is a ultra fast searcher of file systems, text and binary files, source code, archives, compressed files, documents, and -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 06 10:41:25 2022 Received: (at 56995-done) by debbugs.gnu.org; 6 Aug 2022 14:41:25 +0000 Received: from localhost ([127.0.0.1]:35217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKKzV-0004Qm-1U for submit@debbugs.gnu.org; Sat, 06 Aug 2022 10:41:25 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKKzS-0004QY-2p for 56995-done@debbugs.gnu.org; Sat, 06 Aug 2022 10:41:23 -0400 Received: by mail-ed1-f66.google.com with SMTP id t5so6491476edc.11 for <56995-done@debbugs.gnu.org>; Sat, 06 Aug 2022 07:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=4Ws56yw97//Wia5jbIc/0AXaVnhNjnN5YtsjKLrRDCI=; b=XDe/YL84wupqc6R+gqlH47H3ANHO+op31RzM/1GSCB6MJUvCjmizzIuMnms4jQhQZq DIOz4erbkFyDQS9hWb71ap4MiuvrRjsq1cUz89HJrURjTAkoDpaiwvEVrXwsRWln0ZjJ u4l3uh0KCVw/8freThIsRl4hMUHD0pZlyeU94D8IDEYyakpfT9CriT72ArxoZQd0f7Xr OO9sPZwi7IGxV3Av+cUZdFdY1QhXUbNfRCcGknhZiHC/hNmlvq0EqS0xFvDgjp6c45QH Y2bP6GImIkM3azlHqG7RhJbEdKOWNRuY4S8z5B2l7sDbcLWrxpSkyREztA+i08doL5/J kfpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=4Ws56yw97//Wia5jbIc/0AXaVnhNjnN5YtsjKLrRDCI=; b=Wk0YtpqTKM0nRE8EE87D0FrArtfL85EKAMb1ZhZZYpih9/z/ls418rUot5iLuGn8bk QLy65aV5t7J8rq8xDDhmgE8eqb36Cl7g0pm3Y1pHizhXhkRG8/TTMWZnNfav1lRbv2+W OeGxneyORxLNd7hWYTGn1uXIIAbCIPpHb3fmfVzfNelFGKZVk+fgS2abXDk94GUBiJq/ AF55CDKryv5cqfRY5lddF2x2/9AX1j2HZAiLIAywI7ubaAhelMvTec9r/3+0DmtSCNOi bYK6TO16LY/I4t5lVlNJHEKqCag89lYiqjgRMcUwxL5BbrYFTifr+7ejpNHq6L64eHRK KJqg== X-Gm-Message-State: ACgBeo3duFMs2yb9h/iNvNs8LtwKt2myaW/50iPYQpi3XBACGK8Hy7IZ sIRJ4nMaL6xuj4oOZUuE8h12f48B1wg= X-Google-Smtp-Source: AA6agR6a8p+sBISqy8j3MUuWDkpXb8NcwUD4bHAGYec/YQTMKGj8SynrcMd3aUjgrknEZUXr+4V2oQ== X-Received: by 2002:a05:6402:42c3:b0:43d:682f:c0ca with SMTP id i3-20020a05640242c300b0043d682fc0camr10926544edc.334.1659796876561; Sat, 06 Aug 2022 07:41:16 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s2-20020a056402036200b0043e581c30eesm1590809edw.31.2022.08.06.07.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 07:41:16 -0700 (PDT) Message-ID: Subject: Re: [PATCH 2/2] gnu: ugrep: Use gexps. From: Liliana Marie Prikler To: kiasoc5 , 56995-done@debbugs.gnu.org Date: Sat, 06 Aug 2022 16:41:15 +0200 In-Reply-To: <20220806053750.184243-2-kiasoc5@disroot.org> References: <20220806053750.184243-1-kiasoc5@disroot.org> <20220806053750.184243-2-kiasoc5@disroot.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56995-done 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 (-) Am Samstag, dem 06.08.2022 um 01:37 -0400 schrieb kiasoc5: > * gnu/packages/search.scm (ugrep)[source]: Convert snippet to gexp. > [arguments]: Use gexps. Pushed with a fix on the first patch and slightly modified ChangeLog. Cheers From unknown Fri Jun 20 07:23:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 04 Sep 2022 11:24:11 +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