From patchwork Tue Jun 4 08:50:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 65166 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 6A2A227BBEA; Tue, 4 Jun 2024 09:51:05 +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=ham 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 E4B6E27BBE2 for ; Tue, 4 Jun 2024 09:51:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEPsX-0007jx-SB; Tue, 04 Jun 2024 04:50:49 -0400 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 1sEPsW-0007ja-P2 for guix-patches@gnu.org; Tue, 04 Jun 2024 04:50:48 -0400 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 1sEPsW-0002YE-Bv for guix-patches@gnu.org; Tue, 04 Jun 2024 04:50:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sEPsj-0003FP-L0 for guix-patches@gnu.org; Tue, 04 Jun 2024 04:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71358] [PATCH 1/2] gnu: tig: Update to 2.5.10. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jun 2024 08:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71358@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 71358-submit@debbugs.gnu.org id=B71358.171749103412391 (code B ref 71358); Tue, 04 Jun 2024 08:51:01 +0000 Received: (at 71358) by debbugs.gnu.org; 4 Jun 2024 08:50:34 +0000 Received: from localhost ([127.0.0.1]:57710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEPsE-0003Df-5c for submit@debbugs.gnu.org; Tue, 04 Jun 2024 04:50:34 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:36558 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEPsC-0003DS-C9 for 71358@debbugs.gnu.org; Tue, 04 Jun 2024 04:50:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=as8SAlIQ6kf lbsgUJm57CHMZjSuC4MKqf0zVPo1tyCw=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=k30T4CDWCEs8kz20WvI97Nx0fK8gqKkRnKQ CUglvaMo27Jhc6VfSYyHRvKd7GG4rRTuYRqSa7I+2wHx+t6p1wwoYMRSsTpwKv/Qx5n6WH EloVkCxXOl2i4F+O4N9YWE+CK4m0CtGV1nBP8GPaMAYKrFa3JbpSthPmA2BGZbXmh0= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 2b89c7bc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 4 Jun 2024 08:50:12 +0000 (UTC) From: Timotej Lazar Date: Tue, 4 Jun 2024 10:50:08 +0200 Message-ID: <57587897e429aac4c28e6f320e49f575446361eb.1717489984.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (tig): Update to 2.5.10. [source]: Switch to git. Drop unbundling snippet. [native-inputs]: Add autoconf, automake, docbook-xsl, libxml2, pkg-config. Change-Id: I1ef40cb4aef8c7e7a6a974344b45c81ee55d11c3 foo Change-Id: I79d8239e7d0d83bfef42263718e8d2d3a2c83252 --- gnu/packages/version-control.scm | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4280d4fab8..f0503a8db0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2786,23 +2786,19 @@ (define-public aegis (define-public tig (package (name "tig") - (version "2.5.8") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/jonas/tig/releases/download/tig-" - version "/tig-" version ".tar.gz")) - (sha256 - (base32 - "14b38200bmwvi3030hqnwdsp34854ck3bzncj0wlljnpmr10l3mp")) - (modules '((guix build utils))) - (snippet - '(begin - ;; TODO: Delete and rebuild doc/*.(1|5|7). - (for-each delete-file (find-files "doc" "\\.html$")))))) + (version "2.5.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jonas/tig.git") + (commit (string-append "tig-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m7v6xkvly3cbc5hs7plxdny4r41x3vkx7xylygjva4jcvnz0fjr")))) (build-system gnu-build-system) (native-inputs - (list asciidoc xmlto)) + (list asciidoc autoconf automake docbook-xsl libxml2 pkg-config xmlto)) (inputs (list ncurses readline)) (arguments From patchwork Tue Jun 4 08:50:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 65167 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 195A127BBEA; Tue, 4 Jun 2024 09:51:17 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham 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 7493827BBE2 for ; Tue, 4 Jun 2024 09:51:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEPsY-0007kE-31; Tue, 04 Jun 2024 04:50:50 -0400 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 1sEPsX-0007ji-2W for guix-patches@gnu.org; Tue, 04 Jun 2024 04:50:49 -0400 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 1sEPsW-0002YJ-Qh for guix-patches@gnu.org; Tue, 04 Jun 2024 04:50:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sEPsk-0003FW-3d for guix-patches@gnu.org; Tue, 04 Jun 2024 04:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71358] [PATCH 2/2] gnu: tig: Update package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jun 2024 08:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71358@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 71358-submit@debbugs.gnu.org id=B71358.171749103612409 (code B ref 71358); Tue, 04 Jun 2024 08:51:02 +0000 Received: (at 71358) by debbugs.gnu.org; 4 Jun 2024 08:50:36 +0000 Received: from localhost ([127.0.0.1]:57718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEPsK-0003E4-40 for submit@debbugs.gnu.org; Tue, 04 Jun 2024 04:50:36 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:36558 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEPsD-0003DS-Jd for 71358@debbugs.gnu.org; Tue, 04 Jun 2024 04:50:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=NBjwboudhOa f+zuNwTxCpF8WNSU25phLxsnglRfmSVk=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=d20hfKbIX6jeW4h+dKwjTJCqlOogXU5cuEB moLSrSKmWMCVxbrCEZEak22a9ZPq0edJcBygETQKB+f7iNDU6etnvet9UbDQ9K0Km8FxSP GO4Hp6wdHnbQciMFD1VrxfL+Sgme8i+gHs03ufDGbD8gQKEkLg+mWNVQscFlL5zsL4= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 2b2fc297 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 4 Jun 2024 08:50:14 +0000 (UTC) From: Timotej Lazar Date: Tue, 4 Jun 2024 10:50:09 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (tig)[arguments]: Switch to gexps. Move above input fields. Change-Id: I32976ccd3f5602e847b1573695356c7e4e6dd9d7 --- gnu/packages/version-control.scm | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f0503a8db0..d7f6f8d29e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2797,28 +2797,28 @@ (define-public tig (sha256 (base32 "0m7v6xkvly3cbc5hs7plxdny4r41x3vkx7xylygjva4jcvnz0fjr")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (invoke "make" "install-doc"))) + (add-after 'install 'install-completions + (lambda _ + (let ((share (string-append #$output "/share"))) + (mkdir-p (string-append share "/bash-completion/completions")) + (mkdir-p (string-append share "/zsh/site-functions")) + (copy-file "contrib/tig-completion.bash" + (string-append share "/bash-completion/completions/tig")) + (copy-file "contrib/tig-completion.zsh" + (string-append share "/zsh/site-functions/_tig")))))) + #:test-target "test" + #:tests? #f)) ; tests require access to /dev/tty (native-inputs (list asciidoc autoconf automake docbook-xsl libxml2 pkg-config xmlto)) (inputs (list ncurses readline)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda _ - (invoke "make" "install-doc"))) - (add-after 'install 'install-completions - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share"))) - (mkdir-p (string-append share "/bash-completion/completions")) - (mkdir-p (string-append share "/zsh/site-functions")) - (copy-file "contrib/tig-completion.bash" - (string-append share "/bash-completion/completions/tig")) - (copy-file "contrib/tig-completion.zsh" - (string-append share "/zsh/site-functions/_tig")))))) - #:test-target "test" - #:tests? #f)) ; tests require access to /dev/tty (home-page "https://jonas.github.io/tig/") (synopsis "Ncurses-based text user interface for Git") (description