From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8ANNLdMGS2flRQAAe85BDQ:P1 (envelope-from ) for ; Sat, 30 Nov 2024 12:36:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8ANNLdMGS2flRQAAe85BDQ (envelope-from ) for ; Sat, 30 Nov 2024 13:36:35 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=m7bSd6a7; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=L7GiYSiV; 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" 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 D2E8775FED for ; Sat, 30 Nov 2024 13:36:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHMhg-0000oT-Di; Sat, 30 Nov 2024 07:36:04 -0500 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 1tHMhf-0000oH-5Z for guix-patches@gnu.org; Sat, 30 Nov 2024 07:36:03 -0500 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 1tHMhe-0002mA-Sm for guix-patches@gnu.org; Sat, 30 Nov 2024 07:36:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=9QIWvEWze6W0CxKiJZXVhyt1xVJV+sohXrzDO+K4B3U=; b=m7bSd6a7Az/DyK66AaESJQwk8ljBsKQ9DWBAPg0Z6GAUaernQ++bN+mzVW7LAx1rOpZaVvAC9gYvHGosoxWjcy5XxunpsIaEiB/VuxOUVTESw4EDswh4tPsrhRotRITGqam04sr8V/7e5dA4/2+gqG6MuZjjOpUvZXSHxqYxhF5IuFPBGyUWgrAR/FJ9k98yuUk5nz0kSF8/hdW5HanWKqmAN36ov/adA+NZzWjBMgaH9EZdQxuAMi36iyp21z94Y0IYk4p3fTvPy9zhrCMu7rF4Bb6xQTROX2QygC+cbi2E5W+elve7l+B/yidddvZIuJbttEWelQ2d3jY1pDBsrw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHMhe-0006qZ-MY for guix-patches@gnu.org; Sat, 30 Nov 2024 07:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74611] [PATCH v2] gnu: ugrep: Update to 7.1.1. References: <01914ee4fb95ab9df4b9f13c207c72b0f160e3b5.1732922038.git.ashish.is@lostca.se> In-Reply-To: <01914ee4fb95ab9df4b9f13c207c72b0f160e3b5.1732922038.git.ashish.is@lostca.se> Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2024 12:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74611 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74611@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 74611-submit@debbugs.gnu.org id=B74611.173297012926250 (code B ref 74611); Sat, 30 Nov 2024 12:36:02 +0000 Received: (at 74611) by debbugs.gnu.org; 30 Nov 2024 12:35:29 +0000 Received: from localhost ([127.0.0.1]:45878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHMh7-0006pJ-Fu for submit@debbugs.gnu.org; Sat, 30 Nov 2024 07:35:29 -0500 Received: from anamika.lostca.se ([65.21.75.227]:43500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHMh5-0006oz-R7 for 74611@debbugs.gnu.org; Sat, 30 Nov 2024 07:35:28 -0500 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:c000:f92a:f4db:1b6a:42ad]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 80BB63ECA4; Sat, 30 Nov 2024 12:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1732970091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9QIWvEWze6W0CxKiJZXVhyt1xVJV+sohXrzDO+K4B3U=; b=L7GiYSiV2uptWVo+hDc4LwnSbu14b6NyfBPqnZPBIm+zV3FJlvRokLyD2DyZYQd7wx2FdC TLKHtzW0kyrAsZ30q26uaoaVq0a66p9rktIiQWq2AH3aS8Dp5rxYjYkxRw5TsTP/H67ZSB G60ZevDT7jPHCbjGPXdQX7+AxZaGmYk= Date: Sat, 30 Nov 2024 13:33:05 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches From: Ashish SHUKLA 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.91 X-Spam-Score: -2.91 X-Migadu-Queue-Id: D2E8775FED X-Migadu-Scanner: mx10.migadu.com X-TUID: gkt5w5uJoXii * gnu/packages/search.scm (ugrep): Update to 7.1.1. [arguments]: Add fix-ug+ phase to wrap ugrep+, and ug+ binaries. Change-Id: I5292ace64c4d8457748018d852145324b981e9b0 --- Hi, This revision also wraps the programs ug+, and ugrep+ which expect ugrep in the PATH. Thanks! gnu/packages/search.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index bd24d98639..e1f498446a 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -739,14 +739,14 @@ (define-public xapers (define-public ugrep (package (name "ugrep") - (version "7.1.0") + (version "7.1.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Genivia/ugrep") (commit (string-append "v" version)))) (sha256 - (base32 "0py6yyjdabgxdlidiq30432b4drd2821d3k68zq373v0jwz3crqz")) + (base32 "0x162hf65fwx21ld3ac73sblj1vxvmaqicz3220bw8wb8fvhgw4p")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -773,6 +773,13 @@ (define-public ugrep #:test-target "test" #:phases #~(modify-phases %standard-phases + (add-after 'install 'fixup-ug+ + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (for-each (lambda (f) + (wrap-program (string-append bin "/" f) + `("PATH" ":" prefix (,bin)))) + (list "ug+" "ugrep+"))))) (add-before 'check 'check-setup (lambda _ ;; Unpatch shebangs in tests. base-commit: f129a6cc591817c5c51770d5b8712eeb344ba4e4 -- 2.47.1