From patchwork Wed Mar 6 05:38:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Zancanaro X-Patchwork-Id: 61387 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4712027BBEA; Wed, 6 Mar 2024 05:49:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCE9327BBE2 for ; Wed, 6 Mar 2024 05:49:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhk9s-00027f-Dc; Wed, 06 Mar 2024 00:49:40 -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 1rhk9n-00027S-UC for guix-patches@gnu.org; Wed, 06 Mar 2024 00:49:36 -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 1rhk9m-0005YV-TT; Wed, 06 Mar 2024 00:49:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhkAD-0008LT-RC; Wed, 06 Mar 2024 00:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69576] [PATCH] scripts: import: elpa: Unquote-splice package sexp contents. Resent-From: Carlo Zancanaro Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, guix@cbaines.net, dev@jpoiret.xyz, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 05:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69576@debbugs.gnu.org Cc: Andrew Tropin , Christopher Baines , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Christopher Baines , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.170970417632030 (code B ref -1); Wed, 06 Mar 2024 05:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Mar 2024 05:49:36 +0000 Received: from localhost ([127.0.0.1]:49448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhk9m-0008KT-EH for submit@debbugs.gnu.org; Wed, 06 Mar 2024 00:49:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:34700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhk9h-0008Jy-8Z for submit@debbugs.gnu.org; Wed, 06 Mar 2024 00:49:33 -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 1rhk99-00024u-VK for guix-patches@gnu.org; Wed, 06 Mar 2024 00:48:56 -0500 Received: from voltorb.zancanaro.id.au ([45.77.50.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhk93-0005UK-HZ for guix-patches@gnu.org; Wed, 06 Mar 2024 00:48:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=UGDIPvRrDqOE7t5 KfmWpTr6FOd3FzJ4p7JvCDHYDGlU=; h=date:subject:to:from; d=zancanaro.id.au; b=nJnghu6t8ScSPAuuAhyGvJ3RODfSTRN+B01CMYKBzE73l+LRo hjRg68Bqkfqhho+UB5E8WBfFHJr5xj5aqbLjdJItjZPAQX5B8C83l+yzZ5+EneRNRW3pVZ 0UzIHpwEnOrBNivXZr7DRfZ1jx2cn/XV8O8Zw7mWkC5O6ypw9KjA= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 4bc7ce22 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 6 Mar 2024 05:48:39 +0000 (UTC) From: Carlo Zancanaro Date: Wed, 6 Mar 2024 16:38:54 +1100 Message-ID: <9987708eab34f87efd3fedb39086d88b337267f3.1709703534.git.carlo@zancanaro.id.au> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=45.77.50.64; envelope-from=carlo@zancanaro.id.au; helo=voltorb.zancanaro.id.au 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, 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/import/elpa.scm (guix-import-elpa): Unquote-splice the contents of the package sexp so the matched package definition is returned unchanged. Change-Id: Iaaa7e72390c73c6d6671811fe9ac284d599b44c6 --- Without this change the elpa importer doesn't work for me. Importing anything fails. As an example, try "guix import elpa dash". With this change, it works for me. guix/scripts/import/elpa.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: f18d13b5f89c161c6ee88d15ecdaa8d973ee4503 diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index f587eeb243..7f77beaac0 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -104,7 +104,7 @@ (define (guix-import-elpa . args) #:repo (assoc-ref opts 'repo))) ((or #f '()) (leave (G_ "failed to download meta-data for package '~a'~%") package-name)) - (('package etc ...) `(package ,etc)) + (('package etc ...) `(package ,@etc)) ((? list? sexps) (map (match-lambda ((and ('package ('name name) . rest) pkg)