From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id x8xIN9+h6mO2RQEAbAwnHQ (envelope-from ) for ; Mon, 13 Feb 2023 21:47:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gBq8Nd+h6mOTvAAAG6o9tA (envelope-from ) for ; Mon, 13 Feb 2023 21:47:27 +0100 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 A967512232 for ; Mon, 13 Feb 2023 21:47:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRfj7-0007pu-EC; Mon, 13 Feb 2023 15:47: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 1pRfj5-0007n6-61 for bug-guix@gnu.org; Mon, 13 Feb 2023 15:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRfj4-0005HP-TV for bug-guix@gnu.org; Mon, 13 Feb 2023 15:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRfj4-0007Eo-DH for bug-guix@gnu.org; Mon, 13 Feb 2023 15:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#61309: [PATCH] import: egg: Ignore extra keys for #:repo->guix-package Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 13 Feb 2023 20:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61309 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: jgart , 61309@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 61309-submit@debbugs.gnu.org id=B61309.167632117127737 (code B ref 61309); Mon, 13 Feb 2023 20:47:02 +0000 Received: (at 61309) by debbugs.gnu.org; 13 Feb 2023 20:46:11 +0000 Received: from localhost ([127.0.0.1]:51767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRfiD-0007DF-6I for submit@debbugs.gnu.org; Mon, 13 Feb 2023 15:46:11 -0500 Received: from jpoiret.xyz ([206.189.101.64]:38548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRfi6-0007Cn-R5 for 61309@debbugs.gnu.org; Mon, 13 Feb 2023 15:46:07 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id BE896184BE9; Mon, 13 Feb 2023 20:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1676321159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lAD/ePyT6Mb+svCPHKokjD0mng4JH22zYGAA+zENSh8=; b=FblT89Rb/U+ZDuxTtR5G1+4SOuVCorpdobkGrupFTlzUw3+9i3fSBZZ+aGjjVf2QtYUpRg tDEUGofLZBtGfBnv3qnJWujsua/o2fCWQltol9ZRw79190z+9DfLn/HQ7zvXAHfqxHztsm ogcLpveO8H9W6Bc8ZEs62bNHB7Ejq+jyW5CgJ1yBZRNIB1875cU+yjBnKm71RAI8JKDxOS C7JRCp5NPExL5AdNfV7bNtlFfD5W7S1BrpZob5RDfEx4To2xycdhKPUu2MkD67GF/u+Lek Hozto4zAel7wjB1c36V+U9TcG8xer7tBegRxqkzYYXq09zBnFExkvbARvRWu5w== Date: Mon, 13 Feb 2023 21:45:49 +0100 Message-Id: <6893c426d439ef9e8097797a8fb49d9720e1162c.1676321149.git.dev@jpoiret.xyz> In-Reply-To: <66683b240eae35ff30d04369bf403198@dismail.de> References: <66683b240eae35ff30d04369bf403198@dismail.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ 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: , Reply-to: Josselin Poiret From: Josselin Poiret via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=FblT89Rb; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676321247; a=rsa-sha256; cv=none; b=Ne1TwnhA7g7HTDItScPlWIwOhD8m+HAlIUrPApK5y1m+tvZLt6bh03Rxpr+nKxk6G47oXY TmDglrGMjODq/Y8Q80ycPFayk+iwA5EBpNIyEpA7jdVwEs3Wx1a4dBmhe8gkaO0z/mEfoC BTN4kZLN8ndSe9ShttW0veVD7rp69z4pbUghBCGw7dPdDzgCDT1pBS3aJjCAfgYHRMgxOQ g3QXm3oNupyZF/OMdMy8FDi4JpWxPWXO7P2nxqU5SU/H2c204iP4sTcwOZapOngApP44iZ 7Qy1tHn+oTBbMiVkZ7m9I6mGTX5+/oYe9KW2RhAo0ix4MQekvaOeL8spDyKmDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676321247; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=lAD/ePyT6Mb+svCPHKokjD0mng4JH22zYGAA+zENSh8=; b=jo5fNMQOsmiEq2gRTcQuBvem2dV4FPCJy0k/IeMfkmaQ2u2efEFaN4kUh2JYXP8wt14HQh 2XZuH2alODahsG3qXSgLVW6zGuPoYZLCRJKBoM4zX2ZnTW9/gnMle3vC2U1j1tE3RxWbh6 +psJwwtyKZNrere08yIM64PXJevwlnwnCcaANY+GiGDVzdYYOLjR92zb2D8nri/a6dtD3l KWDvuyfEn3uqKqqxRc+GoS5SrXRbztTR4OGsbqzU3EFXOHpr+WWjQZDrBSc1MRjAnEXhFR sYd1K9NOcY/7y7CsiQk9z9q9ZJntEcodA/SKjIqLH7K7BhL3UNZJS459BFHA5Q== X-Migadu-Spam-Score: -3.12 X-Spam-Score: -3.12 X-Migadu-Queue-Id: A967512232 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=FblT89Rb; 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"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: V6jroo4T4Wcm * guix/import/egg.scm (egg-recursive-import): Do it. Fixes: #61309 --- guix/import/egg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 90d97909b5..0555f24703 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -326,7 +326,8 @@ (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) + #: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: dd724cfad45d76b9dcc5b073876c995715c92a07 -- 2.39.1