From patchwork Sat Aug 6 05:37:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 41308 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 F14E627BBEA; Sat, 6 Aug 2022 06:39:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 BF96227BBE9 for ; Sat, 6 Aug 2022 06:39:57 +0100 (BST) Received: from localhost ([::1]:58570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKCXU-0001Va-RN for patchwork@mira.cbaines.net; Sat, 06 Aug 2022 01:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKCWc-0001VJ-BN for guix-patches@gnu.org; Sat, 06 Aug 2022 01:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42964) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKCWc-0004L3-13 for guix-patches@gnu.org; Sat, 06 Aug 2022 01:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKCWb-0002aW-TA for guix-patches@gnu.org; Sat, 06 Aug 2022 01:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56995] [PATCH 1/2] gnu: ugrep: Add zstd lib to inputs. References: <20220805043256.286451-1-kiasoc5@disroot.org> In-Reply-To: <20220805043256.286451-1-kiasoc5@disroot.org> Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Aug 2022 05:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56995 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56995@debbugs.gnu.org Cc: kiasoc5 Received: via spool by 56995-submit@debbugs.gnu.org id=B56995.16597642909867 (code B ref 56995); Sat, 06 Aug 2022 05:39:01 +0000 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) 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== Date: Sat, 6 Aug 2022 01:37:50 -0400 Message-Id: <20220806053750.184243-1-kiasoc5@disroot.org> 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" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 X-getmail-retrieved-from-mailbox: Patches * 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" From patchwork Sat Aug 6 05:37:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 41309 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 6B7EA27BBEA; Sat, 6 Aug 2022 06:39:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 2021027BBE9 for ; Sat, 6 Aug 2022 06:39:59 +0100 (BST) Received: from localhost ([::1]:58588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKCXW-0001Wk-9j for patchwork@mira.cbaines.net; Sat, 06 Aug 2022 01:39:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKCWc-0001VQ-Nl for guix-patches@gnu.org; Sat, 06 Aug 2022 01:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKCWc-0004L9-EY for guix-patches@gnu.org; Sat, 06 Aug 2022 01:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKCWc-0002ad-B3 for guix-patches@gnu.org; Sat, 06 Aug 2022 01:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56995] [PATCH 2/2] gnu: ugrep: Use gexps. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Aug 2022 05:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56995 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56995@debbugs.gnu.org Cc: kiasoc5 Received: via spool by 56995-submit@debbugs.gnu.org id=B56995.16597642969885 (code B ref 56995); Sat, 06 Aug 2022 05:39:02 +0000 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) 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== 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 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" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 X-getmail-retrieved-from-mailbox: Patches * 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