From unknown Thu Jun 19 13:56:46 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#63874 <63874@debbugs.gnu.org> To: bug#63874 <63874@debbugs.gnu.org> Subject: Status: [PATCH 1/2] gnu: git-filter-repo: Update to 2.38.0 and generate documentation. Reply-To: bug#63874 <63874@debbugs.gnu.org> Date: Thu, 19 Jun 2025 20:56:46 +0000 retitle 63874 [PATCH 1/2] gnu: git-filter-repo: Update to 2.38.0 and genera= te documentation. reassign 63874 guix-patches submitter 63874 Josselin Poiret severity 63874 normal tag 63874 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 03 10:02:37 2023 Received: (at submit) by debbugs.gnu.org; 3 Jun 2023 14:02:37 +0000 Received: from localhost ([127.0.0.1]:44004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5Rq0-0003zF-Lb for submit@debbugs.gnu.org; Sat, 03 Jun 2023 10:02:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:56340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5Rpt-0003ym-0t for submit@debbugs.gnu.org; Sat, 03 Jun 2023 10:02:35 -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 1q5Rpp-0002ag-Iq for guix-patches@gnu.org; Sat, 03 Jun 2023 10:02:27 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q5Rpl-00045L-Mc for guix-patches@gnu.org; Sat, 03 Jun 2023 10:02:24 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 5A0E5185300; Sat, 3 Jun 2023 14:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1685800931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAVLIrQ6cMN47OHzEnDQwsPVl3NuX1SHf5qvr81FZqw=; b=I5vlo3jiZAXsIa82Iuiz6kVnZ5VT24QHa+5hp9wcd8MIgT/oaagiQoDcmoOvItH3hOB/dC o9QBpdS0c+GwNl73GUrRFWg5WzGQAmu9JQ4DJGduluvve9eLITZKPjKmGKhu74HM1j2gIs VBdEOLvM+FD0pe5oKXyq4ziLndcJegoJ48pQtCft+S4Pd4s8kfw0tXedmW2ofXI97MPFi0 eDnQiDe/LEI8msXNintqp7H7VShEgeoFxKEHkfnZP33ryHwpa1prKuXbJG8nSNn1Qjch6Z zj4U0scvcqJMqBzqbiFQezJlOkeaVp26XEHqDGgD8QbrNj/8E3zowlHKBNRqwg== From: Josselin Poiret To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: git-filter-repo: Update to 2.38.0 and generate documentation. Date: Sat, 3 Jun 2023 16:02:06 +0200 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Josselin Poiret * gnu/packages/patches/git-filter-repo-generate-doc.patch: * gnu/local.mk (dist_patch_DATA): * gnu/packages/version-control.scm (git-filter-repo): Update to 2.38.0, use git-fetch, use patch and switch to gnu-build-system and G-Exps. --- gnu/local.mk | 1 + .../git-filter-repo-generate-doc.patch | 289 ++++++++++++++++++ gnu/packages/version-control.scm | 48 ++- 3 files changed, 324 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/git-filter-repo-generate-doc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 09a4617daf..bc20a69949 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1217,6 +1217,7 @@ dist_patch_DATA = \ %D%/packages/patches/genimage-mke2fs-test.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/gettext-libunicode-update.patch \ + %D%/packages/patches/git-filter-repo-generate-doc.patch \ %D%/packages/patches/git-header-cmd.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \ diff --git a/gnu/packages/patches/git-filter-repo-generate-doc.patch b/gnu/packages/patches/git-filter-repo-generate-doc.patch new file mode 100644 index 0000000000..12b9d42ef2 --- /dev/null +++ b/gnu/packages/patches/git-filter-repo-generate-doc.patch @@ -0,0 +1,289 @@ +From 7c66e1d4a8076f5b0cc29e5c05637ba1363a6bd7 Mon Sep 17 00:00:00 2001 +Message-Id: <7c66e1d4a8076f5b0cc29e5c05637ba1363a6bd7.1685797909.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sat, 3 Jun 2023 13:07:07 +0200 +Subject: [PATCH] Add documentation generation. + +From: Josselin Poiret + +This uses the manpage XSL and asciidoc config files from git 2.40.1. +--- + .gitignore | 1 + + Documentation/Makefile | 38 +++++++++++++ + Documentation/asciidoc.conf | 78 ++++++++++++++++++++++++++ + Documentation/manpage-base-url.xsl.in | 10 ++++ + Documentation/manpage-bold-literal.xsl | 16 ++++++ + Documentation/manpage-normal.xsl | 26 +++++++++ + Documentation/manpage-quote-apos.xsl | 16 ++++++ + Makefile | 17 +----- + 8 files changed, 188 insertions(+), 14 deletions(-) + create mode 100644 Documentation/Makefile + create mode 100644 Documentation/asciidoc.conf + create mode 100644 Documentation/manpage-base-url.xsl.in + create mode 100644 Documentation/manpage-bold-literal.xsl + create mode 100644 Documentation/manpage-normal.xsl + create mode 100644 Documentation/manpage-quote-apos.xsl + +diff --git a/.gitignore b/.gitignore +index cd5ded4..e167ef7 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,5 +1,6 @@ + /Documentation/html/ + /Documentation/man1/ ++/Documentation/manpage-base-url.xsl + /t/test-results + /t/trash directory* + /__pycache__/ +diff --git a/Documentation/Makefile b/Documentation/Makefile +new file mode 100644 +index 0000000..d4cd939 +--- /dev/null ++++ b/Documentation/Makefile +@@ -0,0 +1,38 @@ ++MAN_BASE_URL := /usr/share/doc/git-doc/ ++VERSION := $(git log --pretty="%H" -n 1) ++ ++ASCIIDOC := asciidoc ++ASCIIDOC_EXTRA := ++ASCIIDOC_HTML := xhtml11 ++ASCIIDOC_DOCBOOK := docbook ++ASCIIDOC_CONF := -f asciidoc.conf ++ASCIIDOC_COMMON := $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ ++ -amanversion='$(VERSION)' \ ++ -amanmanual='git-filter-repo Manual' -amansource='git-filter-repo' ++ASCIIDOC_DEPS := asciidoc.conf ++TXT_TO_HTML := $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) ++TXT_TO_XML := $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) ++MANPAGE_XSL := manpage-normal.xsl ++XMLTO := xmlto ++XMLTO_EXTRA := -m manpage-bold-literal.xsl -m manpage-base-url.xsl -m manpage-quote-apos.xsl ++XMLTO_DEPS := manpage-bold-literal.xsl manpage-base-url.xsl manpage-quote-apos.xsl ++ ++manpage-deps := $(XMLTO_DEPS) ++manpage-cmd := $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man ++ ++manpage-base-url.xsl: manpage-base-url.xsl.in ++ sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ ++ ++%.xml : %.txt $(ASCIIDOC_DEPS) ++ $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< ++ ++man1/%.1 : %.xml $(manpage-deps) ++ mkdir -p man1 ++ $(manpage-cmd) -o man1 $< ++ ++html/%.html : %.txt $(ASCIIDOC_DEPS) ++ mkdir -p html ++ $(TXT_TO_HTML) -d manpage -o $@ $< ++ ++man: man1/git-filter-repo.1 ++html: html/git-filter-repo.html +diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf +new file mode 100644 +index 0000000..3e4c139 +--- /dev/null ++++ b/Documentation/asciidoc.conf +@@ -0,0 +1,78 @@ ++## linkgit: macro ++# ++# Usage: linkgit:command[manpage-section] ++# ++# Note, {0} is the manpage section, while {target} is the command. ++# ++# Show Git link as: (
); if section is defined, else just show ++# the command. ++ ++[macros] ++(?su)[\\]?(?Plinkgit):(?P\S*?)\[(?P.*?)\]= ++ ++[attributes] ++asterisk=* ++plus=+ ++caret=^ ++startsb=[ ++endsb=] ++backslash=\ ++tilde=~ ++apostrophe=' ++backtick=` ++litdd=-- ++ ++ifdef::backend-docbook[] ++[linkgit-inlinemacro] ++{0%{target}} ++{0#} ++{0#{target}{0}} ++{0#} ++endif::backend-docbook[] ++ ++ifdef::backend-docbook[] ++ifdef::doctype-manpage[] ++# The following two small workarounds insert a simple paragraph after screen ++[listingblock] ++{title} ++ ++| ++ ++{title#} ++ ++[verseblock] ++{title} ++{title%} ++{title#} ++| ++ ++{title#} ++{title%} ++endif::doctype-manpage[] ++endif::backend-docbook[] ++ ++ifdef::doctype-manpage[] ++ifdef::backend-docbook[] ++[header] ++template::[header-declarations] ++ ++ ++{mantitle} ++{manvolnum} ++{mansource} ++{manversion} ++{manmanual} ++ ++ ++ {manname} ++ {manpurpose} ++ ++endif::backend-docbook[] ++endif::doctype-manpage[] ++ ++ifdef::backend-xhtml11[] ++[attributes] ++git-relative-html-prefix= ++[linkgit-inlinemacro] ++{target}{0?({0})} ++endif::backend-xhtml11[] +diff --git a/Documentation/manpage-base-url.xsl.in b/Documentation/manpage-base-url.xsl.in +new file mode 100644 +index 0000000..e800904 +--- /dev/null ++++ b/Documentation/manpage-base-url.xsl.in +@@ -0,0 +1,10 @@ ++ ++ ++ ++ ++@@MAN_BASE_URL@@ ++ ++ +diff --git a/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl +new file mode 100644 +index 0000000..e13db85 +--- /dev/null ++++ b/Documentation/manpage-bold-literal.xsl +@@ -0,0 +1,16 @@ ++ ++ ++ ++ ++ ++ \fB ++ ++ \fR ++ ++ ++ +diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl +new file mode 100644 +index 0000000..a9c7ec6 +--- /dev/null ++++ b/Documentation/manpage-normal.xsl +@@ -0,0 +1,26 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ .sp ++ ++ ++ ++ ++ ++ ++ .br ++ ++ ++ +diff --git a/Documentation/manpage-quote-apos.xsl b/Documentation/manpage-quote-apos.xsl +new file mode 100644 +index 0000000..aeb8839 +--- /dev/null ++++ b/Documentation/manpage-quote-apos.xsl +@@ -0,0 +1,16 @@ ++ ++ ++ ++ ++ ++ ++ ++ ' ++ \(aq ++ ++ ++ ++ +diff --git a/Makefile b/Makefile +index a443450..d965ae5 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,21 +20,10 @@ test: + fixup_locale: + sed -ie s%@@LOCALEDIR@@%$(localedir)% git-filter-repo + +-# People installing from tarball will already have man1/git-filter-repo.1 and +-# html/git-filter-repo.html. But let's support people installing from a git +-# clone too; for them, just cheat and snag a copy of the built docs that I +-# record in a different branch. +-snag_docs: Documentation/man1/git-filter-repo.1 Documentation/html/git-filter-repo.html ++doc: ++ $(MAKE) -C Documentation man html + +-Documentation/man1/git-filter-repo.1: +- mkdir -p Documentation/man1 +- git show origin/docs:man1/git-filter-repo.1 >Documentation/man1/git-filter-repo.1 +- +-Documentation/html/git-filter-repo.html: +- mkdir -p Documentation/html +- git show origin/docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html +- +-install: snag_docs #fixup_locale ++install: doc #fixup_locale + install -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo" + install -dm0755 "$(DESTDIR)/$(pythondir)" + ln -sf "$(bindir)/git-filter-repo" "$(DESTDIR)/$(pythondir)/git_filter_repo.py" +-- +2.40.1 + diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1db0931ac3..083d4edf84 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2022 Dhruvin Gandhi ;;; Copyright © 2015, 2022 David Thompson ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Josselin Poiret ;;; ;;; This file is part of GNU Guix. ;;; @@ -3492,26 +3493,45 @@ (define-public tkrev (define-public git-filter-repo (package (name "git-filter-repo") - (version "2.29.0") + (version "2.38.0") (source (origin - ;; Use a release tarball instead of 'git-fetch' because it contains - ;; pre-compiled man-pages which are too hard to build in this context - ;; as it depends on Git's Makefile. - (method url-fetch) - (uri (string-append "https://github.com/newren/git-filter-repo/releases/" - "download/v" version - "/git-filter-repo-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/newren/git-filter-repo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb")))) - (build-system copy-build-system) + "1al43zpw1mdfy9i05w4xw178abypjwnkk52lqvmbl19lr1l47r4i")) + ;; Sent upstream as PR #477. + (patches (search-patches "git-filter-repo-generate-doc.patch")))) + (build-system gnu-build-system) (arguments - `(#:install-plan - '(("git-filter-repo" "libexec/git-core/") - ("Documentation/man1/" "share/man/man1") - ("/" "" #:include ())))) + (list + #:tests? #f ; No tests + #:phases + (with-imported-modules '((guix build python-build-system)) + #~(begin + (use-modules ((guix build python-build-system) #:select (site-packages))) + (modify-phases %standard-phases + (add-after 'unpack 'fix-dirs + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "Makefile" + (("prefix = \\$\\(HOME\\)") + (string-append "prefix = " #$output)) + (("pythondir = .*") + (string-append "pythondir = " (site-packages inputs outputs)))))) + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "doc" #$(string-append "VERSION=" version))))))))) (inputs (list python)) ;for the shebang + (native-inputs + (list asciidoc + docbook-xsl + libxml2 ;for XML_CATALOG_FILES + xmlto)) (home-page "https://github.com/newren/git-filter-repo") (synopsis "Quickly rewrite Git repository history") (description base-commit: da71721db152a338f5d2c35ca3a703fe5df12b27 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 03 10:06:39 2023 Received: (at 63874) by debbugs.gnu.org; 3 Jun 2023 14:06:39 +0000 Received: from localhost ([127.0.0.1]:44037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5Rtu-000479-QW for submit@debbugs.gnu.org; Sat, 03 Jun 2023 10:06:39 -0400 Received: from jpoiret.xyz ([206.189.101.64]:34472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5Rts-00046o-My; Sat, 03 Jun 2023 10:06:37 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 52288185300; Sat, 3 Jun 2023 14:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1685801194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n7edUUtUGvAaI+3yyiW/GLImPC4PlwY/OEzaaGeqkMs=; b=b5lyfJHugKbcnhMwDLA0+JII8ZT/CPuMm+06k4ljp9FELXUGxhzFnJotgpZ8P8822bRWs8 OTZc6+rfvuVEMlGOT7bxmMdy1GRqcUkf7PphPvIk9hMIiabOsQgoFAfV79wveBbLczfVEI +X1J4VQL/vxLneZQD9XimC1Q5G5/Od69Gkh3h5wTFdgrCCjNQiTV4dqOC9rL2rUENRNUFE 1EQgJdYktFJwtyUvIE4HASL1ecQ+urk4mQ1i87bQw7e7e1++W1w5PYN/YvE2Q0ows5wUBB UZlHEb0PNq2uECpJzq6EtesIJ32ti3QfICGfmq0yRsR4wB/EwS3FuCTtyGZbIw== From: Josselin Poiret To: 63873@debbugs.gnu.org, 63874@debbugs.gnu.org, control@debbugs.gnu.org Subject: mumi send-email doesn't support complex refs (was: [PATCH 2/2] gnu: b4: Update to 0.12.2.) In-Reply-To: <33cb3724e8e0e0a7f53a7a1925ac9532c334e926.1685800921.git.dev@jpoiret.xyz> References: <33cb3724e8e0e0a7f53a7a1925ac9532c334e926.1685800921.git.dev@jpoiret.xyz> Date: Sat, 03 Jun 2023 16:06:30 +0200 Message-ID: <87v8g4ej2x.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63874 Cc: Ricardo Wurmus , Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable merge 63873 63874 thankyou Well, sent with `mumi send-email origin/master`, didn't go too well (I guess mumi thought this would only be one mail?). Josselin Poiret writes: > From: Josselin Poiret > > * gnu/packages/version-control.scm (b4): Update to 0.12.2. > --- > gnu/packages/version-control.scm | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-cont= rol.scm > index 083d4edf84..1229ae1f77 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -2612,13 +2612,13 @@ (define-public patatt > (define-public b4 > (package > (name "b4") > - (version "0.8.0") > + (version "0.12.2") > (source > (origin > (method url-fetch) > (uri (pypi-uri "b4" version)) > (sha256 > - (base32 "115ysciq15sxc8fd9hf7p0f4wnd5xapcfkmq8g33y1c8nbdxclbx"))= )) > + (base32 "0vmyma13dnpv3vbzamrmzc2ph71bg44hk7rqbc2ji2ppigbszx5n"))= )) > (build-system python-build-system) > (arguments > (list #:tests? #f ;no tests > @@ -2631,7 +2631,7 @@ (define-public b4 > (inputs > (list python-dkimpy python-dnspython python-requests)) > (propagated-inputs > - (list patatt)) > + (list git-filter-repo patatt)) > (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") > (synopsis "Tool for working with patches in public-inbox archives") > (description > --=20 > 2.40.1 > =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmR7SOYQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaiiJAC/9LPcGSe0t1W5zbdgUXEu/OKiunNyhOlDLY RIBSMcjataSwgF+itqpTHkiLwCsgdRUAVUSdqhtUtrcIggnSOtEMjDQEjnSdfcbT QsBdH76sZuUyPLZ6AitPOpTAo9BaTJfWEQt8H8h7eV254+nC3ZSNR4TjHrCim9M0 lpY3Xf25svKuzZnsi/Nbtz1saG8PbykF62w6dFvBXn6iACRSSc4+D9x9qBN80SVd wILN7QCYAlIg9BWhBI1j24GaJi0AmKNvSS35h33eE9aNs4mxHM6mL1T0gW2StL39 TBiXjp0HuOGbPpshreROzZU+aDSIWe71Mlf6PC9XNFxpAtbO4zx116eNDyMxcdr3 o1VnrqKEzRpAyOHr/wTEndy7R6G7RrlRFpEbbymafvHcvVD1rOh0Lh5E9DoZMQdU Qj4gUPxKQvumoFA6OZ7P9HCw+1VArKe2+VJ6MfLc4amcKsN6oPO559ahNwr1nZ1d NNgx231fRlPAWSNQB6A0Zm4G4ucjG5k= =QpqP -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 05 19:00:34 2023 Received: (at 63874) by debbugs.gnu.org; 5 Jun 2023 23:00:34 +0000 Received: from localhost ([127.0.0.1]:50491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6JBh-0006O6-Rz for submit@debbugs.gnu.org; Mon, 05 Jun 2023 19:00:34 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:33608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6JBe-0006Np-Ed; Mon, 05 Jun 2023 19:00:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1DBVQKd1QhKR7/g0MPf8zIBtRx2tPOSlOa719BY0py0=; b=dP/OiEYatvnZq1Py1akxabhk7l +A311xZQIkQTrGanVg5HVnNXwb7wgftYYIenbAdBb1DoT2qpf5WgzN/A4B/tCWbazsriltlm2YcEr grRrDmmveomEjeNejzyCQoWYYXznWeRnLsVVbBE4scnJ8VGZY1ZMEgVjKCGc7LmK+aoaBdZUZV/MX SuSBAJnqnASM9uZLYGCB3ZHY30oPpo1qqmbvuLgntcg7K7XbcAUp58snNYW/BcN4fqsfDdM75xSRv QTXFf1GnNTnoEVlNMCyBTumy1yCmmEOXDNjJ0G6ixUYZNkEyUUhxCAj7rb7XLakwwhhPYhztZAwpJ 7xc4UNeQ==; Received: from [192.168.2.1] (port=32980 helo=localhost) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1q6JBR-000DHj-0g; Tue, 06 Jun 2023 00:00:17 +0100 From: Arun Isaac To: Josselin Poiret , 63873@debbugs.gnu.org, 63874@debbugs.gnu.org Subject: Re: mumi send-email doesn't support complex refs (was: [PATCH 2/2] gnu: b4: Update to 0.12.2.) In-Reply-To: <87v8g4ej2x.fsf@jpoiret.xyz> References: <33cb3724e8e0e0a7f53a7a1925ac9532c334e926.1685800921.git.dev@jpoiret.xyz> <87v8g4ej2x.fsf@jpoiret.xyz> Date: Mon, 05 Jun 2023 23:59:58 +0100 Message-ID: <87a5xda51t.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63874 Cc: Ricardo Wurmus X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Well, sent with `mumi send-email origin/master`, didn't go too well (I > guess mumi thought this would only be one mail?). Indeed, `mumi send-email' doesn't know anything about refs. I'll hack on this in the coming week. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 10:39:01 2023 Received: (at 63874) by debbugs.gnu.org; 1 Jul 2023 14:39:02 +0000 Received: from localhost ([127.0.0.1]:58446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFbkb-00042c-Fj for submit@debbugs.gnu.org; Sat, 01 Jul 2023 10:39:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFbkZ-00042P-Ft for 63874@debbugs.gnu.org; Sat, 01 Jul 2023 10:39:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFbkR-0003QK-D9; Sat, 01 Jul 2023 10:38:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=RzlM6djce9cyDiqLLGsLs/skWn2W9e+O0V8vynv/Rhg=; b=HrMrknr8HFwwhR/MSbyf ROB5UvvcYvDBGIFCErmbxSbD7D/t+PAFvCeOvmLU4DO7feWIfTlf7iaOICneAYdp3+8TFMEVOi4gq JeYbde25rL1aRW/y2IszEXzhs9fC4a5QI3O12sIbePmjbirAW87U8AkfxYyTIBVl8ZyVy4pRqTUSD MtxBCfZuAW37mFIFUEXHoQMgFe/eKXawtJQWa3VphS+FqQ89+daEhFPPLEECIOzPS2+DTwrWbog0l Jtpsfi9quRrQn0lgWQm27pKus3SPYSPwReCNmmpX7hnlQ6AXTvZOIxKpQwjNEyZnqRDMqqaZTjFi1 KmjTCbIPpzpfCQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFbkR-0000F9-0h; Sat, 01 Jul 2023 10:38:51 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#63874: [PATCH 1/2] gnu: git-filter-repo: Update to 2.38.0 and generate documentation. References: Date: Sat, 01 Jul 2023 16:38:49 +0200 In-Reply-To: (Josselin Poiret's message of "Sat, 3 Jun 2023 16:02:06 +0200") Message-ID: <87cz1bzog6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63874 Cc: 63874@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Josselin Poiret skribis: > From: Josselin Poiret > > * gnu/packages/patches/git-filter-repo-generate-doc.patch: > * gnu/local.mk (dist_patch_DATA): > * gnu/packages/version-control.scm (git-filter-repo): Update to 2.38.0, u= se > git-fetch, use patch and switch to gnu-build-system and G-Exps. [...] > +++ b/gnu/packages/patches/git-filter-repo-generate-doc.patch > @@ -0,0 +1,289 @@ > +From 7c66e1d4a8076f5b0cc29e5c05637ba1363a6bd7 Mon Sep 17 00:00:00 2001 > +Message-Id: <7c66e1d4a8076f5b0cc29e5c05637ba1363a6bd7.1685797909.git.dev= @jpoiret.xyz> > +From: Josselin Poiret > +Date: Sat, 3 Jun 2023 13:07:07 +0200 > +Subject: [PATCH] Add documentation generation. > + > +From: Josselin Poiret > + > +This uses the manpage XSL and asciidoc config files from git 2.40.1. Could you specify the upstream status in the header? It=E2=80=99s a rather big patch so the sooner we can get rid of it, the bet= ter! Apart from that, it LGTM! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 10:39:13 2023 Received: (at 63874) by debbugs.gnu.org; 1 Jul 2023 14:39:13 +0000 Received: from localhost ([127.0.0.1]:58450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFbkl-00043P-V2 for submit@debbugs.gnu.org; Sat, 01 Jul 2023 10:39:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFbkj-000433-RH; Sat, 01 Jul 2023 10:39:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFbka-0003Ra-VY; Sat, 01 Jul 2023 10:39:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=gcE8HVgfp7IIYFqDk28krebQS03LRr6gJqJz6dOu0ow=; b=GNdvwHyvSZuSAqmvn0bn 2TG6nEzKvDoGeSRJ+9OnYRmB6tlhrOlI02ZWScdcpiJJr4NckwJbhC85CYMcbcxFlPawHulk8novO NpNdKyDLBVTJp4V9nOHDSMxOPiWF8ZtkgwtwzIYxT3Na10kHZH5zo80/XZa5k1NTYkLbrHQmF9e7C dSi4tNk6kFPwfvUCFqzeDKVI4X/sZf4F3I/B5ZDDo7uJwqXVudRV5H39jiJzK2lKX0W2u2196FXYu X62Z643f4hBeaQBAuINgRBu3bALhXa7ZnT7yHFCXR+OyYSbTP4EfCk9i3VYMr5JDUBz6V0cEPzdRC SUvIzh73qoXEQw==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFbka-0000FU-JO; Sat, 01 Jul 2023 10:39:00 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#63874: [PATCH 1/2] gnu: git-filter-repo: Update to 2.38.0 and generate documentation. References: <33cb3724e8e0e0a7f53a7a1925ac9532c334e926.1685800921.git.dev@jpoiret.xyz> Date: Sat, 01 Jul 2023 16:38:59 +0200 In-Reply-To: <33cb3724e8e0e0a7f53a7a1925ac9532c334e926.1685800921.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Sat, 3 Jun 2023 16:02:07 +0200") Message-ID: <878rbzzofw.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63874 Cc: 63874@debbugs.gnu.org, 63873@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Josselin Poiret skribis: > From: Josselin Poiret > > * gnu/packages/version-control.scm (b4): Update to 0.12.2. LGTM! From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 15 12:36:34 2024 Received: (at 63874) by debbugs.gnu.org; 15 Feb 2024 17:36:34 +0000 Received: from localhost ([127.0.0.1]:56907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rafez-0007UD-T1 for submit@debbugs.gnu.org; Thu, 15 Feb 2024 12:36:34 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:48496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rafew-0007U4-VX for 63874@debbugs.gnu.org; Thu, 15 Feb 2024 12:36:32 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1708018471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ff9Ql6nKqU7Z878pFKPwzsVTlME//ousI7vnsotXCs=; b=PLMnf5Jpjg7EjwONvQZZmvHSedrG0V0iXSOhQosc3H4CBi8YWJhl0AuSUI5Zt4S5foeKyY f4dX/xyDBwz+LRbRs5N1GrOQ2IX0Hu4ke9bC2zcibo4YnBvJgHIw/Cs49wPhtv3/4SU1+n 3TVOshJEzLWCpE/WhcB6qYptbQEVQNjqZTEalcdXLPrrJScv9XxxNQjQdrWPp9ErdfBJsO +Nxu4ugR7h4rc+VXAHATmXTdkixiKFrR3fXnzlTVYILRxxQrrIka9HWTuOg9m5M6NbRPa0 TO04lubtqNszvsSMmpEIqcBjcto4uJzjKERv2r9xDbhaUi0H3SO20SuScFDIIg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 63874@debbugs.gnu.org Subject: [PATCH v2] gnu: git-filter-repo: Update to 2.38.0. Date: Fri, 16 Feb 2024 01:34:59 +0800 Message-ID: <079d9634c8b4f12f91a51f15a0ed2042e939b3ba.1708017486.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Josselin Poiret , Ludovic Courtès Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 63874 Cc: Hilton Chain , Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) From: Josselin Poiret * gnu/packages/patches/git-filter-repo-generate-doc.patch: New file. * gnu/local.mk (dist_patch_DATA): Regisiter it. * gnu/packages/version-control.scm (git-filter-repo): Update to 2.38.0. [source]: Switch to git-fetch. Use the patch. [build-system]: Switch to gnu-build-system. [native-inputs]: Add asciidoc, docbook-xsl, libxml2, xmlto. Modified-by: Hilton Chain Change-Id: I7b15975ea56c44ae580d19cfe5a9e3eb75c6db0d --- Hi Josselin, Ludo, I adjusted the patch a bit, and added a phase to unpack git's source. So that the shipped patch only includes Makefiles now. gnu/local.mk | 1 + .../git-filter-repo-generate-doc.patch | 88 +++++++++++++++++++ gnu/packages/version-control.scm | 69 ++++++++++++--- 3 files changed, 144 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/git-filter-repo-generate-doc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4bd8e6ec6a..d9a4c8f204 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1308,6 +1308,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ + %D%/packages/patches/git-filter-repo-generate-doc.patch \ %D%/packages/patches/gitg-fix-positional-argument.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ diff --git a/gnu/packages/patches/git-filter-repo-generate-doc.patch b/gnu/packages/patches/git-filter-repo-generate-doc.patch new file mode 100644 index 0000000000..e0bbc7831c --- /dev/null +++ b/gnu/packages/patches/git-filter-repo-generate-doc.patch @@ -0,0 +1,88 @@ +From 56e6857e71d2b2a2236625f3c8b112bd40a8b164 Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Fri, 16 Feb 2024 00:21:06 +0800 +Subject: [PATCH] Add documentation generation. + +This requires the manpage XSL and asciidoc config files from git 2.41.0. + +Modified-by: Hilton Chain +--- + Documentation/Makefile | 34 ++++++++++++++++++++++++++++++++++ + Makefile | 17 +++-------------- + 2 files changed, 37 insertions(+), 14 deletions(-) + create mode 100644 Documentation/Makefile + +diff --git a/Documentation/Makefile b/Documentation/Makefile +new file mode 100644 +index 0000000..d81ffbe +--- /dev/null ++++ b/Documentation/Makefile +@@ -0,0 +1,34 @@ ++MAN_BASE_URL := $(prefix)/share/doc/git-doc/ ++VERSION := $(git log --pretty="%H" -n 1) ++ ++ASCIIDOC := asciidoc ++ASCIIDOC_EXTRA := ++ASCIIDOC_HTML := xhtml11 ++ASCIIDOC_DOCBOOK := docbook ++ASCIIDOC_CONF := -f asciidoc.conf ++ASCIIDOC_COMMON := $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ ++ -amanmanual='git-filter-repo Manual' -amansource='git-filter-repo $(VERSION)' ++ASCIIDOC_DEPS := asciidoc.conf ++TXT_TO_HTML := $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) ++TXT_TO_XML := $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) ++MANPAGE_XSL := manpage-normal.xsl ++XMLTO := xmlto ++XMLTO_EXTRA := -m manpage-bold-literal.xsl \ ++ --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)' ++ ++manpage-prereqs := $(wildcard manpage*.xsl) ++manpage-cmd := $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man ++ ++%.xml : %.txt $(ASCIIDOC_DEPS) ++ $(TXT_TO_XML) -d manpage -o $@ $< ++ ++man1/%.1 : %.xml $(manpage-prereqs) ++ mkdir -p man1 ++ $(manpage-cmd) -o man1 $< ++ ++html/%.html : %.txt $(ASCIIDOC_DEPS) ++ mkdir -p html ++ $(TXT_TO_HTML) -d manpage -o $@ $< ++ ++man: man1/git-filter-repo.1 ++html: html/git-filter-repo.html +diff --git a/Makefile b/Makefile +index a443450..d965ae5 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,21 +20,10 @@ test: + fixup_locale: + sed -ie s%@@LOCALEDIR@@%$(localedir)% git-filter-repo + +-# People installing from tarball will already have man1/git-filter-repo.1 and +-# html/git-filter-repo.html. But let's support people installing from a git +-# clone too; for them, just cheat and snag a copy of the built docs that I +-# record in a different branch. +-snag_docs: Documentation/man1/git-filter-repo.1 Documentation/html/git-filter-repo.html ++doc: ++ $(MAKE) -C Documentation man html + +-Documentation/man1/git-filter-repo.1: +- mkdir -p Documentation/man1 +- git show origin/docs:man1/git-filter-repo.1 >Documentation/man1/git-filter-repo.1 +- +-Documentation/html/git-filter-repo.html: +- mkdir -p Documentation/html +- git show origin/docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html +- +-install: snag_docs #fixup_locale ++install: doc #fixup_locale + install -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo" + install -dm0755 "$(DESTDIR)/$(pythondir)" + ln -sf "$(bindir)/git-filter-repo" "$(DESTDIR)/$(pythondir)/git_filter_repo.py" + +base-commit: cbc6535694380d3a3bf3e5c96410d4ce7e8de94f +-- +2.41.0 + diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 242e6dae2e..148349cb49 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -50,6 +50,8 @@ ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Kjartan Oli Agustsson ;;; Copyright © 2023 Steve George +;;; Copyright © 2023 Josselin Poiret +;;; Copyright © 2024 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -3844,25 +3846,64 @@ (define-public qgit (define-public git-filter-repo (package (name "git-filter-repo") - (version "2.29.0") + (version "2.38.0") (source (origin - ;; Use a release tarball instead of 'git-fetch' because it contains - ;; pre-compiled man-pages which are too hard to build in this context - ;; as it depends on Git's Makefile. - (method url-fetch) - (uri (string-append "https://github.com/newren/git-filter-repo/releases/" - "download/v" version - "/git-filter-repo-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/newren/git-filter-repo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb")))) - (build-system copy-build-system) + "1al43zpw1mdfy9i05w4xw178abypjwnkk52lqvmbl19lr1l47r4i")) + ;; Modified from . + ;; Used with 'unpack-git-source phase. + (patches (search-patches "git-filter-repo-generate-doc.patch")))) + (build-system gnu-build-system) (arguments - `(#:install-plan - '(("git-filter-repo" "libexec/git-core/") - ("Documentation/man1/" "share/man/man1") - ("/" "" #:include ())))) + (list + #:tests? #f ;No tests. + #:imported-modules + `(,@%gnu-build-system-modules + (guix build python-build-system)) + #:modules + '((guix build gnu-build-system) + ((guix build python-build-system) #:select (site-packages)) + (guix build utils) + (srfi srfi-26)) + #:make-flags + #~(list (string-append "prefix=" #$output) + (string-append "VERSION=" #$(package-version this-package))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'unpack-git-source + (lambda _ + (let* ((old-path (getcwd)) + (doc-source (string-append old-path "/Documentation"))) + (mkdir-p "git-source") + (chdir "git-source") + ((assoc-ref %standard-phases 'unpack) + #:source #+(package-source git)) + (for-each + (cut install-file <> doc-source) + (find-files "." "asciidoc\\.conf$|manpage.*\\.xsl$")) + (chdir old-path) + (delete-file-recursively "git-source")))) + (add-before 'build 'set-pythondir + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "Makefile" + (("(pythondir = ).*" _ pre) + (string-append pre (site-packages inputs outputs)))))) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "doc" make-flags)))))) + (native-inputs + (list asciidoc + docbook-xsl + libxml2 ;for XML_CATALOG_FILES + xmlto)) (inputs (list python)) ;for the shebang (home-page "https://github.com/newren/git-filter-repo") (synopsis "Quickly rewrite Git repository history") base-commit: 203344cc37c8a7df1ec1454381b5069d53ce7f9e prerequisite-patch-id: bc542897db0e11da4c0f8da09ec31dd533cf2825 prerequisite-patch-id: fd7da036342f36a8c698f5c8975f9e48d3ade435 prerequisite-patch-id: a2c81c14423bb9858f33d7d26976e8eea61982b7 prerequisite-patch-id: e30fd25b1dc4aaaff76474153836cd48e8565eb9 prerequisite-patch-id: 1d070b26dc64ee2ec95f14c4f5fc23419f766810 prerequisite-patch-id: 03de992f0312d5f0ee3368ebc3c1fad7c955d095 prerequisite-patch-id: 82a04291e3a1bb33ced83672956934fbe98d31dc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 18 17:37:52 2024 Received: (at 63874) by debbugs.gnu.org; 18 Feb 2024 22:37:52 +0000 Received: from localhost ([127.0.0.1]:39895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbpnD-0000lM-Sg for submit@debbugs.gnu.org; Sun, 18 Feb 2024 17:37:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbpnA-0000l6-6S for 63874@debbugs.gnu.org; Sun, 18 Feb 2024 17:37:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbpmj-0005gn-SF; Sun, 18 Feb 2024 17:37:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=qXrQA2DYWJDAzV9qpMsWV+4wOHVL1tl2otOjz5wgGeM=; b=DlOcWCrJISs1VbPEgTd4 j3NB+is2JCjtZsU+zX/HWU2kGfhBygrYXL4cr/Ol3HHd2B1sK1XNtGLGjUBq+C4B81tG6n3KBIrZJ UYyx3DvPqBUiMMyhb6zUSVBIHCRSDvqfxP6SqjJs6eTPNLlvtGBmd+FSPJFL/R+hKBSr1ktj9wqJR QciefHp+cfeu2g8kyGVanBOUlT6ViSf6cEVymhgNOoKTvFMayTj6/dETdhZqBAl/WqkkIlP3ChI3E c+cTIyP9ozfgF3itFsKj5p/j7rtjLPuGC/jtSqrwHCJXnHfxOQR11+wrjB0QJAQeToGOZH2q38q1i N9TUXy2L02YoLQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Hilton Chain Subject: Re: [bug#63874] [PATCH v2] gnu: git-filter-repo: Update to 2.38.0. In-Reply-To: <079d9634c8b4f12f91a51f15a0ed2042e939b3ba.1708017486.git.hako@ultrarare.space> (Hilton Chain's message of "Fri, 16 Feb 2024 01:34:59 +0800") References: <079d9634c8b4f12f91a51f15a0ed2042e939b3ba.1708017486.git.hako@ultrarare.space> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: =?utf-8?Q?D=C3=A9cadi?= 30 =?utf-8?Q?Pluvi=C3=B4se?= an 232 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du =?utf-8?Q?Tra=C3=AEneau?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 18 Feb 2024 23:37:18 +0100 Message-ID: <8734tpl7q9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -4.2 (----) X-Debbugs-Envelope-To: 63874 Cc: 63874@debbugs.gnu.org, Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.2 (-----) Hilton Chain skribis: > From: Josselin Poiret > > * gnu/packages/patches/git-filter-repo-generate-doc.patch: New file. > * gnu/local.mk (dist_patch_DATA): Regisiter it. > * gnu/packages/version-control.scm (git-filter-repo): Update to 2.38.0. > [source]: Switch to git-fetch. > Use the patch. > [build-system]: Switch to gnu-build-system. > [native-inputs]: Add asciidoc, docbook-xsl, libxml2, xmlto. > > Modified-by: Hilton Chain > Change-Id: I7b15975ea56c44ae580d19cfe5a9e3eb75c6db0d > --- > > Hi Josselin, Ludo, > > I adjusted the patch a bit, and added a phase to unpack git's source. So= that > the shipped patch only includes Makefiles now. Hi! LGTM. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 11:47:19 2024 Received: (at 63874-done) by debbugs.gnu.org; 24 Feb 2024 16:47:19 +0000 Received: from localhost ([127.0.0.1]:41195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdvBG-0008AF-Hs for submit@debbugs.gnu.org; Sat, 24 Feb 2024 11:47:19 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:47434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdvB9-00089k-VY for 63874-done@debbugs.gnu.org; Sat, 24 Feb 2024 11:47:13 -0500 Date: Sun, 25 Feb 2024 00:46:22 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1708793196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q50xTHjDDXH1ErZ3QONUJFTq5YuBSo6/P0c/BX6ttzE=; b=IAjqDkgtNi+MvkPToI4BjZjimVcObciDl0uRCfMk9A5P2ITBJKqyOqeEpHJfLgJCLQufQt BXPs6+3PgsIc5XohQAlXs1XGX2Vtl6Dgg9iONDAxb7dKLs25YjNmHoBTs0ITibwchPhk+1 Z402vB5jwNKEV16iKwtYb4Y6YxNdaXyLQ9V7AhqsBqkm5Y3kM6AoeuaGpDB5+x+xeqCyJD 1FXsaVO9jNJpSSk1MmTGoxw48zjs3b6AZh0m4ERFatSvhRJjZMEiR/iPAXqFG4H3MmETqt efLbACzz9sWVSXwF4PvxGPf5HvC/ZEjnTIlLv+xqw/fFZRTswDyDoJMhX685/g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <874jdxizdt.wl-hako@ultrarare.space> From: Hilton Chain To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Subject: Re: [bug#63874] [PATCH v2] gnu: git-filter-repo: Update to 2.38.0. In-Reply-To: <8734tpl7q9.fsf@gnu.org> References: <079d9634c8b4f12f91a51f15a0ed2042e939b3ba.1708017486.git.hako@ultrarare.space> <8734tpl7q9.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 63874-done Cc: Josselin Poiret , 63874-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Mon, 19 Feb 2024 06:37:18 +0800, Ludovic Court=E8s wrote: > > Hilton Chain skribis: > > > From: Josselin Poiret > > > > * gnu/packages/patches/git-filter-repo-generate-doc.patch: New file. > > * gnu/local.mk (dist_patch_DATA): Regisiter it. > > * gnu/packages/version-control.scm (git-filter-repo): Update to 2.38.0. > > [source]: Switch to git-fetch. > > Use the patch. > > [build-system]: Switch to gnu-build-system. > > [native-inputs]: Add asciidoc, docbook-xsl, libxml2, xmlto. > > > > Modified-by: Hilton Chain > > Change-Id: I7b15975ea56c44ae580d19cfe5a9e3eb75c6db0d > > --- > > > > Hi Josselin, Ludo, > > > > I adjusted the patch a bit, and added a phase to unpack git's source. = So that > > the shipped patch only includes Makefiles now. > > Hi! LGTM. Thank you! I have applied the patch as 313458c58c3fd89705081e1721e7c6fe781= 8d813. From unknown Thu Jun 19 13:56:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 24 Mar 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator