From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YOr6AMmd7GIDLgEAbAwnHQ (envelope-from ) for ; Fri, 05 Aug 2022 06:34:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OIULAMmd7GLaMAAAG6o9tA (envelope-from ) for ; Fri, 05 Aug 2022 06:34:17 +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 610803AF35 for ; Fri, 5 Aug 2022 06:34:16 +0200 (CEST) Received: from localhost ([::1]:45354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJp2M-0008NW-OS for larch@yhetil.org; Fri, 05 Aug 2022 00:34:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJp2B-0008NB-4t for guix-patches@gnu.org; Fri, 05 Aug 2022 00:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJp2A-0002TU-T1 for guix-patches@gnu.org; Fri, 05 Aug 2022 00:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJp2A-0001Lk-NB for guix-patches@gnu.org; Fri, 05 Aug 2022 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56995] [PATCH] gnu: ugrep: Use gexps and add zstd to inputs. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Aug 2022 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56995 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56995@debbugs.gnu.org Cc: kiasoc5 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16596740135139 (code B ref -1); Fri, 05 Aug 2022 04:34:02 +0000 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) 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== 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches From: kiasoc5 via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659674056; 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-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=vuGLK6BHfeGynNFZrGC7+1AVbai0uTcik9FSAlS+RWA=; b=FDXGk+gHB5a1hX5CUsD0i60OzeO/1kq6nUg4vm2aus628GO92eMUYU218EFlzL7et3UINJ lO3wFLEDc2JYlxvzTsPmu8NJb7PkefcezuhZIFKNzsSxdSq9AUC7uI3ulyvyZfpd1e8rPg 1UTkRjAG6ijnFOy8fJS8WVQtr+ExL61MKWhtDhJsmnVYyuH7srQAy1vtoxPfou+S4mEjZF PU/zLguqSDvFiHkNm5iMXz1ZSBk0LllzuMMT3obYNocSAgYgIfO3fLRyzRC2vXgMBv7hji 7f7WQ5/omiVnXjKJU3FpDO1+BThsg1Y1KCTeH/OYXOJDXO8ZghZZLfFQHJCpbA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659674056; a=rsa-sha256; cv=none; b=UiHxNNkfCbLIlGfiAVRJbIq6+VwebKAnxI2MP11aKrXxawFq4MtnENkN2iXDarol0MZgkS sRI17JFvSqWid6MBwD4NH+WSdzkfTwK3OTjjkdnSBT3ECvx4wIdzikpwBZDPMNtU8Mot8g ErEC+NVhtVp1ju61EBkV/mS7H8ptp/N/d7wNoSX1hu0RbnBy3eq5hdqp/t5ELhBw4d+MAx +SUyFg6Xro2e82xaLe6MjrWEnw7TTQS/Ll74CAcMaErlnDwITEDOvDvCACzdws1NdFYW0y p0XT3GTT8mxAdXNHrqiJaEq24qwamCg3lPzfGQD0YvSD2mf0e9XhufyNEG9E1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="KKh/EjjH"; 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" X-Migadu-Spam-Score: -2.61 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="KKh/EjjH"; 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" X-Migadu-Queue-Id: 610803AF35 X-Spam-Score: -2.61 X-Migadu-Scanner: scn1.migadu.com X-TUID: 8DQ00uwMLpOj * 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