From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kD6qBMYP2WZmIwEAqHPOHw:P1 (envelope-from ) for ; Thu, 05 Sep 2024 01:56:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kD6qBMYP2WZmIwEAqHPOHw (envelope-from ) for ; Thu, 05 Sep 2024 03:56:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=YPxFXB3r; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=U8zbhKvR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725501382; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Y2WANPo5CNllAp/7B65uY62eJ3nqRmupX00XPlbt3Bg=; b=cI9E9y0ZLevsmIPTP1knlOP3RTImwpMmIRi1wDQG3U6HoMxmXCsXBxZRfZ+XsaC67bpTKy YmUuC2LXC3Iu0JaCVux62CStcX7X+kwBZUk6P7xj9kXe3Rt/14kJ7yABbf2iQBgmn/xk1y e0D8zgmj5OxsuaAdnITF0I5MlaRsMwGQVP+umMIOL2vPV8tyyxpSwhDLf9GqhAYF5bSYkF lWvRNfDZVBac9ANVRe4sDijXnh0RbDFD6uMbYnoKUqgNBNTMWRIR2e6FHBN+nB/KKbbaOJ XY255tM/1kmxH8hKSS6+zxkZtgRrEHfoBrdzz3ygV/7Er7Uaq0EObW8iAH5YPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=YPxFXB3r; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=U8zbhKvR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725501382; a=rsa-sha256; cv=none; b=fAK/vezxLAHFXKdf1pxSgSJT1BN9zxmXQczc2qpsxVu0ktQOOGheMJ8cZzbIza/dTHjvf7 5DlGgQ4dwS8L3CFkpDeOKq51Sy2Z2iUsvsd78DuS8QOZN4Ub+qjilXP6vfbNJgvdvkjbGq +WGOSrrZSvmzwxUqhHHV+w8lMCdekuOHj/6rcUBs+P6UUdVqfr6FVaN6ngzREQOLA2pzA7 nWk9mKr2/8h/1KayDe4JVaE6ogl10Zm/xb8Y13TbSeqMdTw/NB4N5Q/AK2URQZlprTZk+i Fcwv/cHBH/Ox6U6LKABGUo3aMW+ovTl5775WGRbq/nTdhhKKFI0kTRvxIwbdLg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AEB267A047 for ; Thu, 5 Sep 2024 03:56:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sm1jA-0002bG-5I; Wed, 04 Sep 2024 21:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sm1j6-0002ak-TK for guix-patches@gnu.org; Wed, 04 Sep 2024 21:56:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sm1j5-0001Ax-7E for guix-patches@gnu.org; Wed, 04 Sep 2024 21:56:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Y2WANPo5CNllAp/7B65uY62eJ3nqRmupX00XPlbt3Bg=; b=YPxFXB3rq0uxYPT6P21HYdkH3zjLY/QuPAoGtBFCDUwyRf5z1IjeWjA4KhdUUE298kxSa6Fcex25MR4Q2s5fup26y20CRMEsjFuY7wV0eJw1pqWgrWm9d4k3Fk+CXNEwvZAyNRRyQLmtehun2QowbI4BbNxAQ2HL8HW5UB3H9Ab6S92RhcpkPIiN4k7ZcLjU5kc9ASQYs6ZXopoWxc2YfuxNckcoIbmm2TWKVCBAk/xRK27scTwqRVEZjavIVv+6ntPeHt+RptocOeGUTKCCZMpsOUG1agIl2jbtnwN4FGhpnbGPRnmQmoBOqldac9AKEvoqNKP+5Wq0+I+AsN7SUA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sm1k6-0006t0-Is for guix-patches@gnu.org; Wed, 04 Sep 2024 21:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73034] [PATCH] gnu: git: Fix perl search-paths of wrapped programs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 01:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73034@debbugs.gnu.org Cc: Simon Tournier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172550140326417 (code B ref -1); Thu, 05 Sep 2024 01:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Sep 2024 01:56:43 +0000 Received: from localhost ([127.0.0.1]:35793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sm1jn-0006rw-1h for submit@debbugs.gnu.org; Wed, 04 Sep 2024 21:56:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:40268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sm1jk-0006rY-6V for submit@debbugs.gnu.org; Wed, 04 Sep 2024 21:56:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sm1ih-0002Wi-G9 for guix-patches@gnu.org; Wed, 04 Sep 2024 21:55:35 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sm1if-00018u-S6 for guix-patches@gnu.org; Wed, 04 Sep 2024 21:55:35 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-42bbe908380so1299625e9.2 for ; Wed, 04 Sep 2024 18:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725501332; x=1726106132; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y2WANPo5CNllAp/7B65uY62eJ3nqRmupX00XPlbt3Bg=; b=U8zbhKvRkj7gs/T2gQIsC6gXfIEwp/OzYIxzW2Ol4BmMdww9YqEyWmorYMp+Ua3NNp oG0DwsHDi32FHc8bS4OsjBvPDuU2G3IRwLpMnQD/pc70mXhS1cYyxnV9Vl/aQNpHEr3Y Qwfb3h/JaACb/lf9gjWtuBReXljPRQoA/JX30VfMWOasDgFzE5ZQ/m4bKqNBs6B2z7cE u5Zt1zC4ltC4w7FEj0MwN+ZBfPTwKGBsNs+m3dw5xJxSh8gjM1nu4WRmadFfxBP2Rt0Z 1wBsx6q/yeNn1vJtP6gY4Js6bVhGXaug45TDbmnwjFljlXMZnr7SvCMcMkd6HVN2o6TP A2qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725501332; x=1726106132; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y2WANPo5CNllAp/7B65uY62eJ3nqRmupX00XPlbt3Bg=; b=uViqNLKTyFY4PsEQe+h1TqXFApBQy4IIAZvhCD9bRwjZ2Ks8SWqB10468K0nW3smR9 ZoDrIxeTBfIKEss2D2rqQIgHEwKHuTAIuRd2ki7WLmye8eB9qs1kzZHF/rgeRyr+A8Zl gsTZSUNmkuL3VP1Qq1OVkic6BdBmMfmspZl5J35tu6Hz1YLpFu2nbXvnFSwtva4B43FQ ATHxF6oj/LCAmrbomct4jt3dAlXkhGGtXwL5UxA6pFELWzvN0ODl11SnD0TGVjAsjg4j AfXCvBVRbRUGRbq1vAmth/ZIboG3qhzYlDgMLwcCxSCSL7SQ6Cf82xT8Fx6f4ppt1k26 PSIA== X-Gm-Message-State: AOJu0Yz+6ih9LlOTCfTESX+dauTH7wguxzpFWoidmju/L1eRvTj/i2RM cR1UVwY0hJhyj01TmC/vVyIG/mECA9eqPI9qUbdE93kdNafbizjIKGwNbg== X-Google-Smtp-Source: AGHT+IGVJxTzzrxLZnPC1JLrlBICZ4W5fQqZc0pK0s/mJ411KwyasRVErwIYzsmMjGQh2vi3AU5e+g== X-Received: by 2002:a05:600c:1ca7:b0:427:d8fd:42a9 with SMTP id 5b1f17b1804b1-42bdc6375e2mr123183085e9.22.1725501331480; Wed, 04 Sep 2024 18:55:31 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:b32f:9ceb:a68d:c5bf]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42bb6deb43esm219706775e9.7.2024.09.04.18.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 18:55:30 -0700 (PDT) From: Simon Tournier Date: Thu, 5 Sep 2024 03:55:26 +0200 Message-ID: <15bfd834d58da9d8910b0945689aa8cd4e8ff48c.1725498442.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -5.72 X-Migadu-Queue-Id: AEB267A047 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.72 X-TUID: CfnaxzwxtYsR 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 . * gnu/packages/version-control.scm (git)[arguments]: 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 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Suhail Singh +;;; Copyright © 2024 Simon Tournier ;;; ;;; 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