unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#73034] [PATCH] gnu: git: Fix perl search-paths of wrapped programs.
@ 2024-09-05  1:55 Simon Tournier
  2024-09-05  2:37 ` [bug#73034] [PATCH v2] " Simon Tournier
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Simon Tournier @ 2024-09-05  1:55 UTC (permalink / raw)
  To: 73034; +Cc: Simon Tournier

Fixes a regression introduced in f288604428e9c8f096ec9e0eccf207e079806271,
where the git-send-email and gitweb.cgi wrap-programs had translated into the
"new style" using G-exps.  See <https://issues.guix.gnu.org/73030>.

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

Change-Id: Idfa33d9e5519aa9303b10138a166391244636ede
---
 gnu/packages/version-control.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Hi,

Since there is no team, I guess, let CC people who submitted and reviewed the
initial patch. ;-)

Well, is this patch allowed to go to directly to master?  Because it triggers
888 rebuilds:

    $ ./pre-inst-env guix refresh -l git | cut -f1 -d':'
    Building the following 411 packages would ensure 888 dependent packages are rebuilt

Cheers,
simon

PS: Sent using this fix. ;-)  But an annoyance remains about Need MIME::Base64
and Authen::SASL; it requires perl-authen-sasl.


diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 1db783b731..d43382368b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -55,6 +55,7 @@
 ;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
+;;; Copyright © 2024 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -657,21 +658,24 @@ (define-public git
                       ,(search-path-as-list
                         '("lib/perl5/site_perl")
                         '#$(delete-duplicates
-                            (append-map
-                             (compose last package-transitive-propagated-inputs)
-                             (list (this-package-input "perl-authen-sasl")
-                                   (this-package-input "perl-net-smtp-ssl")
-                                   (this-package-input
-                                    "perl-io-socket-ssl")))))))
+                            (map last
+                                 (append-map
+                                  package-transitive-propagated-inputs
+                                  (list (this-package-input "perl-authen-sasl")
+                                        (this-package-input "perl-net-smtp-ssl")
+                                        (this-package-input
+                                         "perl-io-socket-ssl"))))))))
+
                   ;; Tell 'gitweb.cgi' where perl modules are.
                   (wrap-program (string-append out "/share/gitweb/gitweb.cgi")
                     `("PERL5LIB" ":" prefix
                       ,(search-path-as-list
                         '("lib/perl5/site_perl")
                         '#$(delete-duplicates
-                            (append-map
-                             (compose last package-transitive-propagated-inputs)
-                             (list (this-package-input "perl-cgi")))))))
+                            (map last
+                                 (append-map
+                                  package-transitive-propagated-inputs
+                                  (list (this-package-input "perl-cgi"))))))))
 
                   ;; Tell 'git-submodule' where Perl is.
                   (wrap-program git-sm

base-commit: ed95ddeb1e58c314f2e22b4cd35986042f3e2f21
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-09-09 19:07 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-05  1:55 [bug#73034] [PATCH] gnu: git: Fix perl search-paths of wrapped programs Simon Tournier
2024-09-05  2:37 ` [bug#73034] [PATCH v2] " Simon Tournier
2024-09-05 12:47 ` [bug#73034] [PATCH] " Ashish SHUKLA via Guix-patches via
2024-09-05 15:34 ` [bug#73034] [PATCH v3 0/3] Fix annoyances of Git and update to 2.46.0 Simon Tournier
2024-09-05 15:34   ` [bug#73034] [PATCH v3 1/3] gnu: git: Fix perl search-paths of wrapped programs Simon Tournier
2024-09-05 15:34   ` [bug#73034] [PATCH v3 2/3] gnu: git: Update to 2.46.0 Simon Tournier
2024-09-05 15:34   ` [bug#73034] [PATCH v3 3/3] gnu: git: Move git-manpages origin from phases to native-inputs Simon Tournier
2024-09-06  4:17   ` [bug#73034] [PATCH v3 0/3] Fix annoyances of Git and update to 2.46.0 Maxim Cournoyer
2024-09-06 10:31     ` Simon Tournier
2024-09-06 15:53       ` Simon Tournier
2024-09-08 12:10         ` bug#73034: " Maxim Cournoyer
2024-09-09 17:50           ` [bug#73034] " Simon Tournier

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).