From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oCYEFwSo7GKtNAAAbAwnHQ (envelope-from ) for ; Fri, 05 Aug 2022 07:17:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 3gQUFgSo7GJaqwAAG6o9tA (envelope-from ) for ; Fri, 05 Aug 2022 07:17:56 +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 21606283A6 for ; Fri, 5 Aug 2022 07:17:56 +0200 (CEST) Received: from localhost ([::1]:34512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJpic-00068k-Tr for larch@yhetil.org; Fri, 05 Aug 2022 01:17:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJpgq-0005ap-QN for guix-patches@gnu.org; Fri, 05 Aug 2022 01:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJpgo-0000zC-Mm for guix-patches@gnu.org; Fri, 05 Aug 2022 01:16:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJpgo-0002ch-Hw for guix-patches@gnu.org; Fri, 05 Aug 2022 01:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56995] [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Aug 2022 05:16: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: paren@disroot.org, 56995@debbugs.gnu.org Received: via spool by 56995-submit@debbugs.gnu.org id=B56995.16596765049984 (code B ref 56995); Fri, 05 Aug 2022 05:16:02 +0000 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== 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-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=1659676676; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=qIl8ZDXB9wtb0hVkgufZrwk59XAWhkX7yFYtk23UP8A=; b=b7JmB/taa0Cn84KnjsTMW99CLrvUwFSe41LI0JHXd1Ps4dkBmC+tuKbZac/Idonm+wgqJ0 1fJTbnETgHzm2B+G/AOBc+QS32ICnMH/lYdKZ0wZXIPfvSDv98mP4N72JbusVuXVZY72II M9hrcReuEnsnV3gbjicU2vGoGVzgm0KP4cOKWNNT79FLQVXy3qOK9qx9vB5dERoO1XYC08 o+K49ADo5miPjOEoj9O3b4Vb0ljNh/Z+xWrhWzR8WUwevigvfVzqFpf+J34bCjy1Q53Bt3 B2u9TiTo9JRiHb6hLoCwLPa9t5mQX0XHMP8Cz2fMe+tF0i4m4WA1LD5HnIhRjg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659676676; a=rsa-sha256; cv=none; b=lhCNyf5Z6VCz2TLW21J2H2WKKpf7V8ut8SkV5Brp+Qo+yNIVwwqYy4Hygc5qIiYk6lORo6 9fC5cRLMK3W/vI2VDNu1uUC5RdIB0IM2/bd50HXPih/CcQkIMfezDaDGl2o+buLiQolly7 j9ojaVO0sk5NT5LlWMp7Hbl5DBhZi2jPfMbfeDT13aqsrjh3zpWJhZJENupMo+FfWGesBJ HpWP0MGhXSPlo4IkQ7e0gXMlAF/yZt8e4i+CE/NPcr7o4cBxEDkWn3c4PvQHJJjkWyZuNr D2vxyDo2S4e0zq5oRHPsrRmMz78MEhDKJyJBSXg6gubsYUPvw5UVBa0McOOT9A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=JXBE4UEN; 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.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=JXBE4UEN; 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: 21606283A6 X-Spam-Score: -2.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: ZLVDFqxucH0c 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