From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cDvnF4rR2WawJQEA62LTzQ:P1 (envelope-from ) for ; Thu, 05 Sep 2024 15:43:06 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cDvnF4rR2WawJQEA62LTzQ (envelope-from ) for ; Thu, 05 Sep 2024 17:43:06 +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=Tn9ed84h; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Fb3ITHWt; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725550986; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=IrWkk8yCaQl0kbRotydQwhkflcjpHcV75mjI1VbrUN0=; b=Tcwsj3yp3G16En92bUQfUl3icGvsZg20UnfK+nar3KWAyWdEz8zuMefuOIhpS/Bx8NluUV +nHmzlFkwSzqS15G8TjNbltDCj6+Auu1h8jBQ+NqxXK/9rE2cWSW0rVWESbyU/yTf2a59d rFRnqPEMacpwwwfY/rI6ScvD5roHPPHwd35czf4NEgNFwqRWie8SkhXBnjPljxOLiprsKj H32x9TvvbUgnJFFkBoudsVud7wxvEeo2HPV2Uf0TVa3QDTAA4enjuaozzofHWieEeeRSIF uH4wq9RdrYfMw882GpYriJOLQf6+PsNugOZi+ySFvnhrnhtr3wr/ECPpJhxpkA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725550986; a=rsa-sha256; cv=none; b=Oru1mVmBkUinQ04WXVRtvnpJHymZNuSF1I3U29kcB0LOQDfsX2AQUD4VuEKEonbO0m0Hb1 FTWUc71BWbA6K4nB9vs+hbnUmVhcj1WtZClmP6MXGFLNgad6wR7pw0jo+VGl3RjBfayuRp FwFVU82Bb8n+irp7fBSIMHGyRs01oeK+z8aEgbJV4ANUHO6FqbitwD79BCy2AWAMcJi8yI nrnmR95JEF4/10FrYGcsDSzfG23l5Mv+L0Zd26j/JVGNBBvrfTVOFxDMC5EVsUM6/8LLGb YL4/dxdjG+3nC5jvEwDZdGPr+EcSSMgTtb644UJdAG7ydgJAbRyJilRQycdxJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Tn9ed84h; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Fb3ITHWt; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); 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" 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 DCE667687A for ; Thu, 05 Sep 2024 17:43:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smEdP-0005xl-Lb; Thu, 05 Sep 2024 11:42:59 -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 1smEdN-0005xP-SR for guix-patches@gnu.org; Thu, 05 Sep 2024 11:42:57 -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 1smEdN-0000tH-Jr for guix-patches@gnu.org; Thu, 05 Sep 2024 11:42:57 -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:References:In-Reply-To:Date:From:To:Subject; bh=IrWkk8yCaQl0kbRotydQwhkflcjpHcV75mjI1VbrUN0=; b=Tn9ed84hPze5+bS5SfIIops3MaiJrSKF02gDZta8XM8UMVVciyGm89j9mI6kaNF8tM7eg2E89LQltYHcb+jeYS9aUfBtTzVKJYQy2GAHqdWEfpIMxspDdLbd/q6Q8+9mYTjBpPKXdXrJXsKLbBFh/49QvZiT0DkvEIt1BVIKwGOyuHAepa0FVaKLcvERilBDb+EAHcHm9WwIB6mNRFkgcZzseJLOTW1ZhN3wQhjLqbVDPDaV1kz4r0jPq+3SsT5jIh7E0/LDuOSB8JKKP9i2Wph21kuN2hpFxcW93IqlRHN0LG6zYoJQvOPjhEkL12yT/YVqM8bF0MGRJwCEnpBEaQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smEeQ-00037o-E0 for guix-patches@gnu.org; Thu, 05 Sep 2024 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73034] [PATCH v3 1/3] 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 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73034@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73034-submit@debbugs.gnu.org id=B73034.172555100811915 (code B ref 73034); Thu, 05 Sep 2024 15:44:02 +0000 Received: (at 73034) by debbugs.gnu.org; 5 Sep 2024 15:43:28 +0000 Received: from localhost ([127.0.0.1]:37909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smEdr-000367-NF for submit@debbugs.gnu.org; Thu, 05 Sep 2024 11:43:28 -0400 Received: from mail-lj1-f170.google.com ([209.85.208.170]:48284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smEdp-00035g-5a for 73034@debbugs.gnu.org; Thu, 05 Sep 2024 11:43:26 -0400 Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2f64e82aeacso11754251fa.0 for <73034@debbugs.gnu.org>; Thu, 05 Sep 2024 08:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725550874; x=1726155674; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IrWkk8yCaQl0kbRotydQwhkflcjpHcV75mjI1VbrUN0=; b=Fb3ITHWt6QHQbxxALcDyNA13ZR3fFpFNkiiwKDyatjPpDo3c9bxctHDOk4i9yNy2Eu lRh1TF6VvSqhuJaCI5etg6LPmBiMi/3M564wb/VPjAFztNdyb9QkPNjTV0FTMqVPGpVq fknDPb8pIWPCjEsYx20LKAjnauyHajEKNoiM4W9flgcuri5mXGa0Tc28oB9jC8mT0fVw lsbY3uwdfAV7vAzjoBXmOy5d7I2NBmTDyrQD35KaaEBsgMldfvnCywiRONUyIbe1IA2T 4VFpGeMAkvR4sNjlWl7W0D3lRwUDHwckVOfzcXs94FMoU4nVpK8bnFcwonBNutaGqmvo zGHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725550874; x=1726155674; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IrWkk8yCaQl0kbRotydQwhkflcjpHcV75mjI1VbrUN0=; b=oDaPg1oBfyQD5Pfl8UomTBX0JPuKt2k7AKTDBpNceUx1Wc0k3t63i4IfBhKjzeW1Vc XFZ7VO8X7XbbmlYwQdwSL9dg1ytwBvL9Nn6C0KuH/WdQKu9IsTNfZetL+noKY2KUKOf9 Y0i0y3YpkYy5ecoLmx8DwWnwujy2uMD+s0jRM9x/ECT7PPkVRUoU11EoOAQjZ1r14QC2 Qn5egEsROwekZdTKmyUTcHZ6BhQOnr5wEXQbR79t1bLu4d11slUttw4Pq3+U+4n5mD2y BdvhvTaD13SvwsuYX5CVDpzE7YIVjNy5s7nc7AZ0gmDBZhWDBE3e2WPaI6CHeoLJwCmV e7yQ== X-Gm-Message-State: AOJu0YwZsrAo0m3kiUkDBOtAWW7b+smz0I9TMIaIztaswc4kwbunHjep +pZxoSZTncLeSfg7YRauriS/X4OqbephmhHlg5alj0AsPQvFNTFpWOjNXA== X-Google-Smtp-Source: AGHT+IF5y2M/fnXcu9pouQbnLxFrrQmmeeIyzL/HlxNjTfPV5mrjJuXH/xmzs3aVbfbAgABKF6AiWQ== X-Received: by 2002:a05:600c:3c82:b0:42b:b016:94a3 with SMTP id 5b1f17b1804b1-42c88108590mr86990905e9.31.1725550511736; Thu, 05 Sep 2024 08:35:11 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:4d6d:a7b0:20be:6231]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42c9bb7d3a4sm19365875e9.1.2024.09.05.08.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2024 08:35:11 -0700 (PDT) From: Simon Tournier Date: Thu, 5 Sep 2024 17:34:48 +0200 Message-ID: <96af57a183e3829bef3da8586b7d255ce52c4cc1.1725550253.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -7.42 X-Spam-Score: -7.42 X-Migadu-Queue-Id: DCE667687A X-Migadu-Scanner: mx11.migadu.com X-TUID: kpESB5khrrfa 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: Ia4e5feeae6418a9f098464556b74bc871e761be1 --- gnu/packages/version-control.scm | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1db783b731..b8192035c2 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,31 @@ (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"))))))) + (let ((these-inputs + (list (this-package-input "perl-authen-sasl") + (this-package-input "perl-net-smtp-ssl") + (this-package-input "perl-io-socket-ssl")))) + (append + these-inputs + (map last + (append-map + package-transitive-propagated-inputs + these-inputs)))))))) + ;; 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"))))))) + (let ((these-inputs + (list (this-package-input "perl-cgi")))) + (append + these-inputs + (map last + (append-map + package-transitive-propagated-inputs + these-inputs)))))))) ;; Tell 'git-submodule' where Perl is. (wrap-program git-sm -- 2.45.2