diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2025-08-04 00:29:08 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-08-04 11:07:51 +0100 |
| commit | 71c496bee754f6c69af6402d1466a88dddfcccde (patch) | |
| tree | 7d507d2a4422b544a8a22f5ae2578db3b141bf45 /gnu | |
| parent | 32cda2f495f0483256ff2c671eca695425b818c3 (diff) | |
gnu: cgit-pink: Correctly replace git-source inherited from cgit.
Fixes guix/guix#908
* gnu/packages/version-control.scm (cgit-pink)[arguments]: Replace unpack-git
phase to use correct git-source.tar.xz.
[inputs]: Replace "git-source.tar.xz" instead of "git-source".
Change-Id: Ia4b7e7be644e5da47f3989d53c8a1bff3d333b69
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/version-control.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a2fdd1858b8..f950fa050ef 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com> -;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2018, 2025 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com> @@ -1853,10 +1853,17 @@ a built-in cache to decrease server I/O pressure.") ;; because it is used as the shebang of generated scripts that ;; are invoked during the test phase. (string-append "SHELL_PATH=" - (search-input-file %build-inputs "/bin/sh")))))) + (search-input-file %build-inputs "/bin/sh")))) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'unpack-git + (lambda _ + ;; Unpack the source of git into the 'git' directory. + (invoke "tar" "--strip-components=1" "-C" "git" "-xf" + #$(this-package-input "git-source.tar.xz")))))))) (inputs (modify-inputs (package-inputs cgit) - (replace "git-source" + (replace "git-source.tar.xz" ;; cgit-pink is tightly bound to git. Use GIT_VER from the Makefile, ;; which may not match the current (package-version git). (origin |