From patchwork Fri Apr 23 07:05:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RnJhbsOnb2lz?= X-Patchwork-Id: 28818 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 F04EC27BC7D; Fri, 23 Apr 2021 11:26:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7E2CF27BC7C for ; Fri, 23 Apr 2021 11:26:17 +0100 (BST) Received: from localhost ([::1]:59200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZt0q-00036P-On for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 06:26:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZszh-0002m3-9o for guix-patches@gnu.org; Fri, 23 Apr 2021 06:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZszf-0008Jp-0g for guix-patches@gnu.org; Fri, 23 Apr 2021 06:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZsze-0004Ng-Jr for guix-patches@gnu.org; Fri, 23 Apr 2021 06:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47968] [PATCH 1/2] gnu: git: add a comment on why we don't build manpages References: In-Reply-To: Resent-From: =?utf-8?b?RnJhbsOnb2lz?= J Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 10:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47968@debbugs.gnu.org Received: via spool by 47968-submit@debbugs.gnu.org id=B47968.161917348716787 (code B ref 47968); Fri, 23 Apr 2021 10:25:02 +0000 Received: (at 47968) by debbugs.gnu.org; 23 Apr 2021 10:24:47 +0000 Received: from localhost ([127.0.0.1]:36224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZszO-0004Mh-U4 for submit@debbugs.gnu.org; Fri, 23 Apr 2021 06:24:47 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:43365) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZszM-0004MT-Tn for 47968@debbugs.gnu.org; Fri, 23 Apr 2021 06:24:45 -0400 X-Originating-IP: 88.126.13.52 Received: from localhost (unknown [88.126.13.52]) (Authenticated sender: francois@avalenn.eu) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id C8D4420002; Fri, 23 Apr 2021 10:24:37 +0000 (UTC) X-Mailbox-Line: From 0849d630470bd648a3add61515d99c880b50cf83 Mon Sep 17 00:00:00 2001 From: =?utf-8?b?RnJhbsOnb2lz?= J Date: Fri, 23 Apr 2021 09:05:46 +0200 Message-ID: <0849d63@noop.avalenn.eu> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git)[native-inputs]: add back comment skipped by commit d1cada0450fca54260fd20ab49d0586d147cbeb3 Signed-off-by: François J. --- gnu/packages/version-control.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3992f74644..fddabbcd40 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -188,6 +188,9 @@ as well as the classic centralized workflow.") ("bash" ,bash-minimal) ("bash-for-tests" ,bash) ("gettext" ,gettext-minimal) + ;; To build the man pages from the git sources, we would need a dependency + ;; on a full XML tool chain, and building it actually takes ages. So we + ;; use this lazy approach and use released tarball. ("git-manpages" ,(origin (method url-fetch) From patchwork Fri Apr 23 07:17:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RnJhbsOnb2lz?= X-Patchwork-Id: 28817 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 4858427BC7D; Fri, 23 Apr 2021 11:25:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D43BC27BC7C for ; Fri, 23 Apr 2021 11:25:38 +0100 (BST) Received: from localhost ([::1]:58742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZt0E-0002nO-1A for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 06:25:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZszh-0002m5-2T for guix-patches@gnu.org; Fri, 23 Apr 2021 06:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZszf-0008KX-KD for guix-patches@gnu.org; Fri, 23 Apr 2021 06:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZszf-0004No-0Z for guix-patches@gnu.org; Fri, 23 Apr 2021 06:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47968] [PATCH 2/2] gnu: Add git-filter-repo References: In-Reply-To: Resent-From: =?utf-8?b?RnJhbsOnb2lz?= J Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 10:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47968@debbugs.gnu.org Received: via spool by 47968-submit@debbugs.gnu.org id=B47968.161917349616810 (code B ref 47968); Fri, 23 Apr 2021 10:25:02 +0000 Received: (at 47968) by debbugs.gnu.org; 23 Apr 2021 10:24:56 +0000 Received: from localhost ([127.0.0.1]:36227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZszY-0004N3-8Y for submit@debbugs.gnu.org; Fri, 23 Apr 2021 06:24:56 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:47219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZszW-0004Mq-Ms for 47968@debbugs.gnu.org; Fri, 23 Apr 2021 06:24:55 -0400 X-Originating-IP: 88.126.13.52 Received: from localhost (unknown [88.126.13.52]) (Authenticated sender: francois@avalenn.eu) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id E8F9520003; Fri, 23 Apr 2021 10:24:48 +0000 (UTC) X-Mailbox-Line: From dd3b9d2e119adeb2db53634b9a190fc48d0acb31 Mon Sep 17 00:00:00 2001 From: =?utf-8?b?RnJhbsOnb2lz?= J Date: Fri, 23 Apr 2021 09:17:17 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches I use release tarball (instead of git as I would have liked) because it contains pre-compiled man-pages which are too hard to build in this context as it uses git Makefile to do it. * gnu/packages/version-control.scm (git-filter-repo): New variable. Signed-off-by: François J --- gnu/packages/version-control.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fddabbcd40..481cbbb98c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3074,3 +3074,34 @@ If several repos are related, it helps to see their status together.") makes a directory under a specific root directory (by default @file{~/ghq}) using the remote repository URL's host and path.") (license license:expat))) + +(define-public git-filter-repo + (package + (name "git-filter-repo") + (version "2.29.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/newren/git-filter-repo/releases/" + "download/v" version + "/git-filter-repo-" version ".tar.xz")) + (sha256 + (base32 + "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb")) + )) + (build-system copy-build-system) + (arguments + `(#:install-plan + '( + ("git-filter-repo" "libexec/git-core/") + ("Documentation/man1/" "share/man/man1") + ("/" "" #:include ()) + ))) + (home-page + "https://github.com/newren/git-filter-repo") + (synopsis + "Quickly rewrite git repository history") + (description + "Quickly rewrite git repository history") + (license (list license:expat ;; Main license. + license:gpl2)))) ;; For test harness.