bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 12:05:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cgit-pink: Correctly replace git-source inherited from cgit.

Browse source 
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>
This commit is contained in:
Arun Isaac 2025-08-04 00:29:08 +01:00 • committed by Sharlatan Hellseher
parent 32cda2f495
commit 71c496bee7
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/version-control.scm
View file

@ -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