diff options
| author | Anderson Torres <anderson.torres.8519@gmail.com> | 2026-06-29 19:01:53 -0300 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-07-07 22:02:35 +0200 |
| commit | db1ec52ef41c1d87c49661ab7c301df0dd7a0030 (patch) | |
| tree | 47a94c8d7ae66ebb2ddc905d61c80bed875d848a /gnu/packages/version-control.scm | |
| parent | 30b644dcee580343ec743716993ae72b343a2823 (diff) | |
gnu: git-filter-repo: Use pyproject-build-system.
To solve the failure on b4's sanity-check.
* gnu/packages/version-control.scm (git-filter-repo): Refactor.
[build-system]: Use pyproject-build-system.
[arguments]<#:imported-modules>: Remove %pyproject-build-system-modules.
<#:modules>: Prefix (guix build gnu-build-system) with gnu:.
Undo #:select (site-packages) from (guix build pyproject-build-system).
<#:make-flags>: Remove.
<#:phases>{build}: Undo replacement.
{build-doc, install-doc, compress-documentation}: Add new phases.
[native-inputs]: Add python-setuptools, python-setuptools-scm.
Change-Id: I00e47d11676eb4dbb2d108da02e16e0cf61bf57d
Co-authored-by: Nicolas Graves <ngraves@ngraves.fr>
Change-Id: I984152870b1aba4c15c3a7922c1d70aa720bc8aa
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a554a42ebcc..e0d9a55ba86 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm | |||
| @@ -4835,18 +4835,14 @@ TkDiff is included for browsing and merging your changes.") | |||
| 4835 | ;; Used with 'unpack-git-source phase. | 4835 | ;; Used with 'unpack-git-source phase. |
| 4836 | (patches | 4836 | (patches |
| 4837 | (search-patches "git-filter-repo-2.38.0-generate-doc.patch")))) | 4837 | (search-patches "git-filter-repo-2.38.0-generate-doc.patch")))) |
| 4838 | (build-system gnu-build-system) | 4838 | (build-system pyproject-build-system) |
| 4839 | (arguments | 4839 | (arguments |
| 4840 | (list | 4840 | (list |
| 4841 | #:imported-modules %pyproject-build-system-modules | ||
| 4842 | #:modules | 4841 | #:modules |
| 4843 | '((guix build gnu-build-system) | 4842 | '(((guix build gnu-build-system) #:prefix gnu:) |
| 4844 | ((guix build pyproject-build-system) #:select (site-packages)) | 4843 | (guix build pyproject-build-system) |
| 4845 | (guix build utils) | 4844 | (guix build utils) |
| 4846 | (srfi srfi-26)) | 4845 | (srfi srfi-26)) |
| 4847 | #:make-flags | ||
| 4848 | #~(list (string-append "prefix=" #$output) | ||
| 4849 | (string-append "VERSION=" #$(package-version this-package))) | ||
| 4850 | #:phases | 4846 | #:phases |
| 4851 | #~(modify-phases %standard-phases | 4847 | #~(modify-phases %standard-phases |
| 4852 | (delete 'configure) | 4848 | (delete 'configure) |
| @@ -4885,9 +4881,17 @@ TkDiff is included for browsing and merging your changes.") | |||
| 4885 | (substitute* "Makefile" | 4881 | (substitute* "Makefile" |
| 4886 | (("(pythondir = ).*" _ pre) | 4882 | (("(pythondir = ).*" _ pre) |
| 4887 | (string-append pre (site-packages inputs outputs)))))) | 4883 | (string-append pre (site-packages inputs outputs)))))) |
| 4888 | (replace 'build | 4884 | (add-after 'build 'build-doc |
| 4889 | (lambda* (#:key make-flags #:allow-other-keys) | 4885 | (lambda _ |
| 4890 | (apply invoke "make" "doc" make-flags))) | 4886 | (invoke "make" "doc" |
| 4887 | (string-append "prefix=" #$output) | ||
| 4888 | (string-append "VERSION=" #$version)))) | ||
| 4889 | (add-after 'install 'install-doc | ||
| 4890 | (lambda _ | ||
| 4891 | (let ((man1 (string-append #$output "/share/man/man1"))) | ||
| 4892 | (copy-recursively "Documentation/man1" man1)))) | ||
| 4893 | (add-after 'install-doc 'compress-documentation | ||
| 4894 | (assoc-ref gnu:%standard-phases 'compress-documentation)) | ||
| 4891 | (replace 'check | 4895 | (replace 'check |
| 4892 | (lambda* (#:key tests? #:allow-other-keys) | 4896 | (lambda* (#:key tests? #:allow-other-keys) |
| 4893 | (when tests? | 4897 | (when tests? |
| @@ -4899,6 +4903,8 @@ TkDiff is included for browsing and merging your changes.") | |||
| 4899 | libxml2 ;for XML_CATALOG_FILES | 4903 | libxml2 ;for XML_CATALOG_FILES |
| 4900 | xmlto | 4904 | xmlto |
| 4901 | perl | 4905 | perl |
| 4906 | python-setuptools | ||
| 4907 | python-setuptools-scm | ||
| 4902 | rsync)) | 4908 | rsync)) |
| 4903 | (inputs (list python)) ;for the shebang | 4909 | (inputs (list python)) ;for the shebang |
| 4904 | (home-page "https://github.com/newren/git-filter-repo") | 4910 | (home-page "https://github.com/newren/git-filter-repo") |
