futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: git: Fix perl search-paths of wrapped programs.

Browse Source 
Fixes a regression introduced in f288604428,
where the git-send-email and gitweb.cgi wrap-programs had been translated into the
"new style" using G-exps.

* gnu/packages/version-control.scm (git)[arguments]<phases>: Restore the
complete list of propagated inputs by modifying the functional composition
order.

Fixes: https://issues.guix.gnu.org/73030
Change-Id: Ia4e5feeae6418a9f098464556b74bc871e761be1
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Simon Tournier 2024-09-05 17:34:48 +02:00 committed by Maxim Cournoyer
parent 43df0d8308
commit acba6223b5
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/version-control.scm
View File

@ -55,6 +55,7 @@
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca> ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
;;; Copyright © 2024 Simon Tournier <zimon.toutoune@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -657,21 +658,29 @@ everything from small to very large projects with speed and efficiency.")
,(search-path-as-list ,(search-path-as-list
'("lib/perl5/site_perl") '("lib/perl5/site_perl")
'#$(delete-duplicates '#$(delete-duplicates
(append-map (let ((perl-inputs
(compose last package-transitive-propagated-inputs) (list (this-package-input "perl-authen-sasl")
(list (this-package-input "perl-authen-sasl") (this-package-input "perl-net-smtp-ssl")
(this-package-input "perl-net-smtp-ssl") (this-package-input "perl-io-socket-ssl"))))
(this-package-input (append perl-inputs
"perl-io-socket-ssl"))))))) (map last
(append-map
package-transitive-propagated-inputs
perl-inputs))))))))
;; Tell 'gitweb.cgi' where perl modules are. ;; Tell 'gitweb.cgi' where perl modules are.
(wrap-program (string-append out "/share/gitweb/gitweb.cgi") (wrap-program (string-append out "/share/gitweb/gitweb.cgi")
`("PERL5LIB" ":" prefix `("PERL5LIB" ":" prefix
,(search-path-as-list ,(search-path-as-list
'("lib/perl5/site_perl") '("lib/perl5/site_perl")
'#$(delete-duplicates '#$(delete-duplicates
(append-map (let ((perl-inputs (list (this-package-input
(compose last package-transitive-propagated-inputs) "perl-cgi"))))
(list (this-package-input "perl-cgi"))))))) (append perl-inputs
(map last
(append-map
package-transitive-propagated-inputs
perl-inputs))))))))
;; Tell 'git-submodule' where Perl is. ;; Tell 'git-submodule' where Perl is.
(wrap-program git-sm (wrap-program git-sm