From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qFYQDxMvFWLHEAAAgWs5BA (envelope-from ) for ; Tue, 22 Feb 2022 19:44:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WP+SCxMvFWLYQwAAauVa8A (envelope-from ) for ; Tue, 22 Feb 2022 19:44:35 +0100 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 76ACD23DF4 for ; Tue, 22 Feb 2022 19:44:34 +0100 (CET) Received: from localhost ([::1]:37936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMa9J-0007By-AP for larch@yhetil.org; Tue, 22 Feb 2022 13:44:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMa4z-0005Jn-Uv for guix-patches@gnu.org; Tue, 22 Feb 2022 13:40:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMa4w-0006an-UR for guix-patches@gnu.org; Tue, 22 Feb 2022 13:40:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMa4w-0001sd-FH for guix-patches@gnu.org; Tue, 22 Feb 2022 13:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53920] [PATCH v3] gnu: lesspipe: Update to 2.03. References: <639f99264ee673157112aec54d28c80842e4be52.1644511905.git.h.goebel@crazy-compilers.com> In-Reply-To: <639f99264ee673157112aec54d28c80842e4be52.1644511905.git.h.goebel@crazy-compilers.com> Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 18:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 53920@debbugs.gnu.org Received: via spool by 53920-submit@debbugs.gnu.org id=B53920.16455551597159 (code B ref 53920); Tue, 22 Feb 2022 18:40:02 +0000 Received: (at 53920) by debbugs.gnu.org; 22 Feb 2022 18:39:19 +0000 Received: from localhost ([127.0.0.1]:42650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMa4B-0001rL-Ld for submit@debbugs.gnu.org; Tue, 22 Feb 2022 13:39:19 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:37215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMa4A-0001r6-5N for 53920@debbugs.gnu.org; Tue, 22 Feb 2022 13:39:14 -0500 Received: from hermia.goebel-consult.de ([79.211.184.220]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M7s1M-1nIka92y4w-0050a5 for <53920@debbugs.gnu.org>; Tue, 22 Feb 2022 19:39:07 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id BB97F62204; Tue, 22 Feb 2022 19:39:16 +0100 (CET) From: Hartmut Goebel Date: Tue, 22 Feb 2022 19:39:05 +0100 Message-Id: X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:eyf6f0s66LOc9jTr9Fn7V8+Zj6522RWIPuvjvA/zJ3QxOu8a4v5 t/l/UP/VGw7AGNPmrUi79jAgf/ToulLCkpENCiOO+sep0kY+pfUzI/S6c/VhgftiygU98C+ HgEJZIctcEvXfkKDcWJm+qRXQm0MGIDY98YLyP68T+kXzHlIsBhKwsLzgmRGjVOL3G5Z8FM zpXsdyI7tC0Br5xmIkZPg== X-UI-Out-Filterresults: notjunk:1;V03:K0:tTdK73NNbfI=:IWIZb9j2ctPL+GQVj4Gfqg n6ro6+7V8X1HZiXVKPEp17Rk6SYgVNFN/j3tSyVo3lcnLpaXEweaSz6dzzJGYjxAWgNrqHuiH aoz1hThcr2lDSA9sN0PDJdKqiWFf14ahvLRjPnmR7W40fxZ9PPj/gLpQKMSZnX4r3pHOznxNs hy1glYXHcfWdyyxVLYxHzUtKp0A3GJPdmGZ/zckJV6dUqUNhpk8MmWyUDOg4b0GOVr0lksk09 8udxvTgRThAhDb9MyOxR3x1GZZ6uszgkxTIGJ8l89UgC53e9xg4Jnr4Ks/+8B0K1fGOt0y3se EVrKMU2x2+Rq8460nIhVAMn7NtZzFy9y10yhq3T//EEGH6mLsJDzm73D5414dSSnUa1BrGGYh klIz/+M78bVmJZmBKTjdSD43NAFWYpYPiBvDc8LQSRS/DEH8STq/yuOTbtsa4kRli5n1pjzM3 b52DECOqzInZLhDd/catRwRVvlnAsf++oeTWKZN63nYMiP/hXZcoVDR0bEz+eNeH56niuT0C4 I1Mt/UxFbEblmOcFK5coiKoKkrx+8PjdjTxlRzAI4e37iI3KOaHPbxqz+TsOJBRNA8mIfTCfC 3AK4GG+QPWrm2IFzW4jBQ3sIrpBcyDNjIenQkmIFPMnUJtM+gtDvRQkiEYzDQ/kwVBm5PVveK TX1tJbCKKtVOIN2rtBQCyRDxVIN6zr9Y3SgjC6OT4b6tRBSGzxdJy+65KhB5X3IGLUIaBqVew 33/UHUc3LAJ552ox 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645555474; h=from:from:sender:sender: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; bh=QlmIXoiPRnsihHwojPuMhnAnTMdnDEcF+h0ETuaucxw=; b=k4mjBHCCdR/OdNwPiNRbJPxis86egoTw/1q1yVIOH0l80O2dZqtXLGAQV3LXfT3gpGO+CN 4h9JUK2jM7nspalevZaSrbY+R54nouQISMQln6dcVjsacJLyjRX29ZooR8MmG9oyUCi63+ E0YCGBwNQWuKVUtMmvdij8FA4if48TLiqBnAH0GmfEMcKGlKQt+LRQfgzeFrQZXVIuFUxw s/ZASLqeGbqzfKd7onYDd90w4xEcXzFP8NRaC+fdAur4VQ4BVfs+663EWzpsnj0/v407nC ci818LMQZeI66Q8ptqC2mrS4MkB6KPe3jTQsNUgG/r67cyGf1NrCJvqA9MYlYg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645555474; a=rsa-sha256; cv=none; b=hdQ7b8XMOq2AlWN4wsJyn6ITJKmb9q+87zUrX3kgce08N8x7qeR20Mhh0dpOfPueZkPZxS YYZOX1CcMenPUPBsUlLXOUYlG0C69mWhWTDsQd8Q2KwvCp8WtHPxQLW5O/8rjplqsSEkmJ YYSva5dpgSYds1CqTjLJDctu7ZvkvS61ShudNmmFYLhlhMVpIrddCwuV1xifAV4ujjSdJf v0j1L/09AUQbjCI0SK2A+TCMDkI+FxO4OojV5YQ0vOkXsXleYeoW84WpnvLlLrOM8Fbv9a WWNU+/Tun5qladT2K1SvxHgkoKRRFRZ8RlijcUPoZpaVu89gr7RXH1lrZqy2uw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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.13 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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: 76ACD23DF4 X-Spam-Score: -2.13 X-Migadu-Scanner: scn1.migadu.com X-TUID: eM9aR8paEIm9 * gnu/packages/less.scm (lesspipe): Update to 2.03. [arguments] Use new style. {configure} Adjust to updated source. {fix-makefile} New phase. {patch-tput-and-file} rename into … {patch-command-paths} this; patch other relevant scripts. [inputs] Add perl-archive-zip. --- gnu/packages/less.scm | 66 ++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index e23b5d0c24..ede6238d25 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,10 +21,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages less) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (gnu packages) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-compression) #:use-module (gnu packages file) #:use-module (guix packages) #:use-module (guix download) @@ -59,38 +62,57 @@ text editors.") (define-public lesspipe (package (name "lesspipe") - (version "1.91") + (version "2.03") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/wofr06/lesspipe") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "04dqvq6j4h451xqbvxzv6pv679hzzfm39pdm5vg7h3r45gzg0kps")))) + "0hvqs7c2scjzyanylp7f2r1kpdp9v5qvgarhwvaisx9q1d0hiqy9")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file "Makefile") ; force generating - (invoke "./configure" - (string-append "--prefix=" out) - "--yes")))) - (add-before 'install 'patch-tput-and-file - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lesspipe.sh" - (("tput colors") - (string-append (search-input-file inputs "/bin/tput") - " colors")) - (("file -") - (string-append (search-input-file inputs "/bin/file") - " -")))))))) + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; configure is a perl script which the standard configure phase + ;; fails to execute + (invoke "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))))) + (add-before 'install 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)/etc") "$(DESTDIR)$(PREFIX)/etc")))) + (add-before 'install 'patch-command-paths + ;; Depending on the content of the file to be displayed and some + ;; settings, lesspipe trees to use a large variety of external + ;; commands, e.g. rpm, dpkg, vimcolor. We only link the + ;; essential ones to avoid this package to pull in all these + ;; dependencies which might never ever we used. + (lambda* (#:key inputs #:allow-other-keys) + (let ((file (search-input-file inputs "/bin/file")) + (tput (search-input-file inputs "/bin/tput"))) + (substitute* "sxw2txt" + (("^use warnings;" line) + (string-append + line "\nuse lib '" #$perl-archive-zip + "/lib/perl5/site_perl';"))) + (substitute* "lesscomplete" + (("file -") (string-append file " -"))) + (substitute* "lesspipe.sh" + (("tput colors") + (string-append tput " colors")) + (("file -") + (string-append file " -"))))))))) (inputs - (list file ncurses)) ; for tput + (list file + ncurses ;; for tput + perl-archive-zip)) (native-inputs (list perl)) (home-page "https://github.com/wofr06/lesspipe") (synopsis "Input filter for less") -- 2.30.2