From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8HOTOg4a2WaMFQEAqHPOHw:P1 (envelope-from ) for ; Thu, 05 Sep 2024 02:40:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 8HOTOg4a2WaMFQEAqHPOHw (envelope-from ) for ; Thu, 05 Sep 2024 04:40:15 +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=KE+Qq7Pq; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=S4Ugjd+w; 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=1725504014; 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=mRW+rRV+eD0WvBRF3tyk2hzdbcQqpWiT8kgN+ZQEUAE=; b=PQRc7q4yXRRwul7VlR3e5MHP+dKPRHB/KfYzC/gtrC0xxCu0n7lr1vhjVcAjF7lBe1WOs2 LVdYGQD4tpMcBhzqWPEE5Bd/JaVSjFpURYmpE8DHA/It+RFvtWFlvUjG7WD7yr6XLYu4w8 aglmI+m7SAJ8a9fHwCU0a4gjwIMMEco9PhyHpuc7D9wzZlza0jyjAm+SYkWgZM10iq9Ydu kkFaZIb7otsz/O6ZU/Z10kVwZcqDYliah/VUPp/BzkqJAS+Katk1rf8KK/pKEBDBBUTTVj r8L7TPGa3BhGl1M6xWoJIIhkasxAh1PPIlpaICYWBJltPxGw6xNYxJjsJsJOPQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KE+Qq7Pq; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=S4Ugjd+w; 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=1725504014; a=rsa-sha256; cv=none; b=Cn65owW/Jf9e5ZowdQNwjmkNgtyjXmQX27+MAQkQTqSv57X1z6llAef5cjCsGWZhOGXHIE 3cq/EuteU37dzgL7z3j7Tp2AKEFsuqq3raniCkxMqaKVyYrZi/SRrThFRcri/opbOGRDB2 3ne9aY/7ejTbGIbJS53BXUn7Zg6tmnfqOPRwesGRY6PuFA8iBzSUctUI05XYg16XjKXy1j rJagqExmCvLe2cYdz4k1iypGg9jVTHDGPPP1DH3qZGP2HBluctLw6lBP2GopAxg0STDHlL gag1hmshMXfxWQKT5jmNaCHXRUnDltITkwu+o1PLYQ4qAbJ1lvYyGbpgEdCsIw== 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 96F186CEDF for ; Thu, 5 Sep 2024 04:40:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sm2Ph-00014Y-9Y; Wed, 04 Sep 2024 22:40:01 -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 1sm2Pe-00014H-QC for guix-patches@gnu.org; Wed, 04 Sep 2024 22:39:59 -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 1sm2Pd-0003UU-LR; Wed, 04 Sep 2024 22:39: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:Date:From:To:In-Reply-To:References:Subject; bh=mRW+rRV+eD0WvBRF3tyk2hzdbcQqpWiT8kgN+ZQEUAE=; b=KE+Qq7PqY6NJ7VzSfJn18OS9P90ZPLAt1aYpGkTUtwYwAFBQGqIN3IX0978zFAL63ISafT9gFh6Bzy9ToGG7JLoDRFOc+0XaFRHAUtjDYJzw8Hb69lF6hoLxg+Q8aOT8s52dGNhWbUX/llLIGx91bf7pFxQdkwcb50tTJ1JAWwwbZBZIxo11RzRpjDJ+HPMaO0nOg3mjr/pJXuWVNVg1dBr9TnTpRiuwmbePk/PeES/hVQxsU4+l+hKU9vMzyJG/2MAc5Jlhp4cnyh2w55JDmMo2IvoqU6bazdVOtWWLY7YykSzNEvDsVo2vyqTh/oLH+UcPe/Fr2bdTR7/PptnBJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sm2Qf-0001ba-SA; Wed, 04 Sep 2024 22:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73034] [PATCH v2] gnu: git: Fix perl search-paths of wrapped programs. References: <15bfd834d58da9d8910b0945689aa8cd4e8ff48c.1725498442.git.zimon.toutoune@gmail.com> In-Reply-To: <15bfd834d58da9d8910b0945689aa8cd4e8ff48c.1725498442.git.zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 02:41:01 +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 , maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, ludo@gnu.org X-Debbugs-Original-Xcc: maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, ludo@gnu.org Received: via spool by 73034-submit@debbugs.gnu.org id=B73034.17255040146044 (code B ref 73034); Thu, 05 Sep 2024 02:41:01 +0000 Received: (at 73034) by debbugs.gnu.org; 5 Sep 2024 02:40:14 +0000 Received: from localhost ([127.0.0.1]:35815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sm2Pt-0001ZQ-W1 for submit@debbugs.gnu.org; Wed, 04 Sep 2024 22:40:14 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:46114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sm2Pp-0001Yc-V7 for 73034@debbugs.gnu.org; Wed, 04 Sep 2024 22:40:13 -0400 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-371ba7e46easo135758f8f.0 for <73034@debbugs.gnu.org>; Wed, 04 Sep 2024 19:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725503879; x=1726108679; darn=debbugs.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=mRW+rRV+eD0WvBRF3tyk2hzdbcQqpWiT8kgN+ZQEUAE=; b=S4Ugjd+w9WwW5UJiZFw0w6YJLd0XNKQvvVArBM69jm8vzW/CjziwU8M86oda+MCGEw YIOmWDxZoqXDvh34bVR2/1+wOUkluHHPHE30XWAauu444w0hVCW52OQrOVTFZzBC9AaY 6pzgraQQkciq90IFaLS4omL9ZsMs5MBiEaobefTrKndk2+L+sAQjKjSqvzftb1Ojf4zr aWnqLeK4L5RwhzUtkQU7YlqrIxCBBmjdlVrmlwA2DZCpyNv+u3vdvYV7cc+LhbXfD+f+ QlOEDymEWJPynhgWUbuM67q2iuCI1jw+N4IDP6uZFyD6hdXpZXlBNpOKyYp7HOii8pNQ U8mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725503879; x=1726108679; 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=mRW+rRV+eD0WvBRF3tyk2hzdbcQqpWiT8kgN+ZQEUAE=; b=aAOhIFJbU26xqvnLCdpF2X/Su4UY9DzDo5Nsfb+iL3f7Ewfaw4tU4yTjNgefFW5Uxv Y7a231izmA2gwXjGzwD/uCIRzfQ+5nt7c+hN318YEFbBNxpDnSwyg1/+fhJ9FA5SpZ4d 9gIB8Q0nhO8ZumzsqRc6xgKNtPt3YL1VIO6FUs+gdHKww4eaClniqNvOLLZlZ4M7bqob tI1pqZcTjA5GPc3/hSZh527seowcJdeR7StxM4TEI787vF76Wu856Tx1u6vUKjuxmMV9 40sQ33FKoPtC+0nY6Kt8nDJxUHXyWCd5JJv2+UvocSqDUtMmgNimbTtNiLfmzcs5jWO/ PpPA== X-Gm-Message-State: AOJu0YybPFv602Av35Z01ol5kFea9OlwLsZND7nLZeojUUDwn7RgC3VD 5q+ub9Aj2sCRAdFCARJWQ9UdZTyUhc5NtJdLe8ANtRt1vvxyd7blOaToUA== X-Google-Smtp-Source: AGHT+IGCEWxvs6fDAlF42B5Uv0jOffRk49O/RfJ3uQyvTC/WacMh8ly6l3y6Sl0AajwMSdE0ECB6Ig== X-Received: by 2002:a5d:630f:0:b0:371:9362:c286 with SMTP id ffacd0b85a97d-374bce98712mr11110227f8f.4.1725503879235; Wed, 04 Sep 2024 19:37:59 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:b32f:9ceb:a68d:c5bf]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3749ee4ac81sm18115236f8f.14.2024.09.04.19.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 19:37:58 -0700 (PDT) From: Simon Tournier Date: Thu, 5 Sep 2024 04:37:53 +0200 Message-ID: <8c204cfb8764c7f284775b68ee55998dbc32d17e.1725503559.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 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-Migadu-Queue-Id: 96F186CEDF X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.92 X-Spam-Score: -8.92 X-TUID: HulIQ4+duj7j 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(-) Hi, Change since v1: 'package-transitive-propagated-inputs' does not return the package itself, so let manually add it. Cheers, simon 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 base-commit: ed95ddeb1e58c314f2e22b4cd35986042f3e2f21 -- 2.45.2