From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 APGwF5w5SGebPQAA62LTzQ:P1 (envelope-from ) for ; Thu, 28 Nov 2024 09:36:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id APGwF5w5SGebPQAA62LTzQ (envelope-from ) for ; Thu, 28 Nov 2024 10:36:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qVpNVIKU; dkim=fail ("headers rsa verify failed") header.d=elenq.tech header.s=soverin1 header.b=XqaFYgPP; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732786588; a=rsa-sha256; cv=none; b=g8n9PuINTIh7of60ypp7ptYk9PS6kxz5iLQRK9HWNCYbO9He6sQ09BKFlXtatYGEieah0H KafPo5HIl/Ui1t9yJws6H8O2T5OPDFFPHFSuBeZTYlhg1d+MSutaV5CoaRwSfEvGFr4uSp EsbqngedB6Zkn7QAezHH4YcAV9LAQbxpV+cV2JH8mg+UGYPYdqUcvSQD6XxHW9/Xy40m55 LBHQ7d4KnDU33NpDvXLYPJQGRlsppfGlCgOI+LOXflcay/IbDLLj4K88mNdLUl1f6Nk9qM O0gevWS7dD2Ava61h0Wy5wZAXyCofeEKuwaXuvWtn/f1DISckpk4nClgga9U5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qVpNVIKU; dkim=fail ("headers rsa verify failed") header.d=elenq.tech header.s=soverin1 header.b=XqaFYgPP; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732786588; 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=t6MD5wcHHHufKzlsI3kbes+dJGVn86efH9Ig/FG4/Pg=; b=KN3QBWvsb0YNs7EpnocifTUxFi12t0wsrp1reHD9rHR/FDFTlQqz6jxNc011zxaPjJsteu CwTrIK+OUzbM52lbvrXWi/z0ISQZfd+i4lVz5TNVq0igAOAd/UjDy3mQuaTecXplmfxVPc PFUBpBV2Z3f31E4z9yrpDqnLxn0Kq9vfRSJZ/prd8CfD78BQGX87NAD5sf8wibMtLMAs5C r/1hwzSuKiQFBiE8/j/naDAA9IpnD1BVgO1HLD4nSPtbPSv3LCqricoSg1Wd/VzW1hoWQ8 d/x2TcZJss3GG3BKZTYKJYxp56Pk7EFwjzWI4A5JIgUYkzDoa3DIUD2KF9UVoA== 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 0D5A11876E for ; Thu, 28 Nov 2024 10:36:28 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGawO-0004hy-Vq; Thu, 28 Nov 2024 04:36:05 -0500 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 1tGawM-0004hN-HZ for bug-guix@gnu.org; Thu, 28 Nov 2024 04:36:02 -0500 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 1tGawM-0007Mm-95 for bug-guix@gnu.org; Thu, 28 Nov 2024 04:36:02 -0500 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=lqWb8LpwI2iKMgV6wM8YdggIA9EzeiXSUuvhDgDKCBI=; b=qVpNVIKUxNIxs/cATqrKbw/66zw2Z7FOSk22YdKdHFjgbZlR86R/UnpC+X8pGEfBylRgm/C1KdvjG4hLrrV03E+7G1mQw7qoDc8j0sBUUeYiMwoNLdOczzuS44qoFg9KIrAhwrApnD6rxPoPM2oqTTYrZfHWYryiPVXtivDdRfEjrjr/Jy6JymYW0K1bz2Gwlrfqc1It2LXQ9La3+kZ8Pygy4yJw9JS3QOycggiPkEawr2P7VzG5nIKIFtNO+Qq7cD6IRtCxlN/iJyfeX2tPQRUo72eDGXeSKmv9H35OxfWgzoJ5Oe2ZAUj98sn9iB82pt2i5089VDXEUtEuFDJzag==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGawL-0006Vz-Tf for bug-guix@gnu.org; Thu, 28 Nov 2024 04:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#74565: [PATCH] import: egg: Fix recursive imports. References: In-Reply-To: Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 28 Nov 2024 09:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74565 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 74565@debbugs.gnu.org Cc: Ekaitz Zarraga Received: via spool by 74565-submit@debbugs.gnu.org id=B74565.173278654525013 (code B ref 74565); Thu, 28 Nov 2024 09:36:01 +0000 Received: (at 74565) by debbugs.gnu.org; 28 Nov 2024 09:35:45 +0000 Received: from localhost ([127.0.0.1]:36679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGaw5-0006VM-A0 for submit@debbugs.gnu.org; Thu, 28 Nov 2024 04:35:45 -0500 Received: from dane.soverin.net ([185.233.34.150]:41741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGaw2-0006V6-UD for 74565@debbugs.gnu.org; Thu, 28 Nov 2024 04:35:44 -0500 Received: from smtp.soverin.net (c04smtp-lb01.int.sover.in [10.10.4.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dane.soverin.net (Postfix) with ESMTPS id 4XzWPQ1pf0zbR; Thu, 28 Nov 2024 09:35:06 +0000 (UTC) Received: from smtp.soverin.net (smtp.soverin.net [10.10.4.99]) by soverin.net (Postfix) with ESMTPSA id 4XzWPP3LmLz40; Thu, 28 Nov 2024 09:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=soverin1; t=1732786505; h=from:from: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; bh=t6MD5wcHHHufKzlsI3kbes+dJGVn86efH9Ig/FG4/Pg=; b=XqaFYgPPNPK6MLLO2K9MJoVXrKHCyWaKPuyBtQATU/DkktjeTZPtLQI/tovk5IQ090b+Sl PdW4RUcVjyzVCwQ6ryQl1dcnqesmS5mWypWWUH1ex1NaknRnVzPrcs6zRTUM79Gj4mTOVR NLn8AtpQoVKtAky6VTYDLXVh/F3ZfUMBum29Prs1KAT0DLDYST1MVnNKGWf09iYI2iJ6ON ZKwK9GXQyTzYJfBRgzPbPdSBMdoKN9WmcdorboE4BNME2P2yxqtHgsda3j7Y5cQ1kDnFC8 oCH2fV5Jzcp7rWxNA1I5bye8YDoy9jgpW4xJOhdpN7GykftQticH0xRMDHs2Uw== From: Ekaitz Zarraga Date: Thu, 28 Nov 2024 10:34:42 +0100 Message-ID: <8e6a3a6c14ad38b7a47cfaf980072bb8e98cc482.1732786482.git.ekaitz@elenq.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spampanel-Class: ham X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.20 X-Spam-Score: -1.20 X-Migadu-Queue-Id: 0D5A11876E X-Migadu-Scanner: mx10.migadu.com X-TUID: ywBXboa9Ezkq Fixes #74565. * guix/import/egg.scm (egg-recursive-import) <#:repo->guix-package>: Add `#:allow-other-keys`. Change-Id: I97ad2d1aaf664c8dc18965eb2a497aa0a76062d7 --- guix/import/egg.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/import/egg.scm b/guix/import/egg.scm index e3bc158475..9691f8c5ff 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2024 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -322,8 +323,9 @@ (define egg->guix-package/m ;memoized variant (define* (egg-recursive-import package-name #:optional version) (recursive-import package-name #:version version - #:repo->guix-package (lambda* (name #:key version repo) - (egg->guix-package/m name version)) + #:repo->guix-package + (lambda* (name #:key version repo #:allow-other-keys) + (egg->guix-package/m name version)) #:guix-name egg-name->guix-name)) base-commit: faf8ba9b43323dc61988a368690b20008611fc87 -- 2.46.0