From 71c496bee754f6c69af6402d1466a88dddfcccde Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 4 Aug 2025 00:29:08 +0100 Subject: [PATCH] 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 --- gnu/packages/version-control.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a2fdd1858b87b5b6f151ea20f525a64f1f49419e..f950fa050efa86f018830f33a7e4bdb500f4c1a7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2018 Timothy Sample -;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2025 Arun Isaac ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019, 2020 Alex Griffin @@ -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