From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oKdPOzaS72BVBwAAgWs5BA (envelope-from ) for ; Thu, 15 Jul 2021 03:41:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cEEyNTaS72DZdAAAB5/wlQ (envelope-from ) for ; Thu, 15 Jul 2021 01:41:10 +0000 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 5DE424A09 for ; Thu, 15 Jul 2021 03:41:10 +0200 (CEST) Received: from localhost ([::1]:41474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3qNB-0003tJ-He for larch@yhetil.org; Wed, 14 Jul 2021 21:41:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3qN5-0003q2-8f for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3qN4-0005Kq-VV for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3qN4-0003eW-TZ for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49566] [PATCH core-updates 2/4] import: gem: Emit new-style package inputs. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Jul 2021 01:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49566@debbugs.gnu.org Received: via spool by 49566-submit@debbugs.gnu.org id=B49566.162631324513976 (code B ref 49566); Thu, 15 Jul 2021 01:41:02 +0000 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:45 +0000 Received: from localhost ([127.0.0.1]:46154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMm-0003dH-PX for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:45 -0400 Received: from out2.migadu.com ([188.165.223.204]:24359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMk-0003d2-MB for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:43 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626313241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sR5o54/LQhFp0rrUwzo2OOV1wUj64rulCXi5eHQqryA=; b=G8vgEOy5SjCvUvQHvfm61o2CgPW9g236TtXg6v8rmJ5dVB0ekqwpvCeLS6YfUdp4yV54B2 oHDmjBKMlo6gu/dyYQ1LThZ2rHV3JvXmGxPSwxXMSq48OOVvBeQrFngQDJlE0P4I/iupt+ MZdo4ZPULGjvU9ZhXSg/xGAAw1jl+os= Date: Wed, 14 Jul 2021 18:40:35 -0700 Message-Id: <5f1fb3483c5ecef2a77cafdc195ef791c1423c20.1626311767.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev 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" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches From: Sarah Morgensen via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626313270; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=sR5o54/LQhFp0rrUwzo2OOV1wUj64rulCXi5eHQqryA=; b=gKRmYPwNxsdVzpaCprTIrB8TWg7BF6mGC0pJwu1moP2xMcSHopu3c2HFqLVKim0WShFOtk 20IU6Rkr/qWBKLlqz7Hot9zulnOfKZna6EROPxD+iCYCrd3W2HT4jUcCVdKvugHOHVf7GE F0OzA2EctugrmqArcJoVPvdxohMA6SKW2eMym8eCsVzW5DGYHsjCclgo/hNNF8S7sp2Bbr WvNIkCckdH5A0X38ML+hEZ0Kuk9jbLGihXtSTpmryrm31BZANzWaNseiJ2IvEKNliNvWl5 RkEJzCQeNBYKTX4YunEqgrRx31x9o2rDff7jAmccGNQzQMPhlvSjLFlkDnSqAg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626313270; a=rsa-sha256; cv=none; b=oNCJnpmsCcsYAUc9ogavMh5/4Fttr8Yt9EZcPIJ8NNJqn5uV8uLCykO+K9pyhOO7KN7Nrz N1gKNE6J8kYw3Kn0nbOVd2D0EGHQQMTqhufVCvk7O4WdWeDgDdUZb99esyMtPpm7qoOJ4N zFL/AoC3ezVLdtAAefw9hSIolJxsMtvaT/XeBeWBMY4lOcBzDahknu3XSYgcckT3Q3b8Q4 XuEOGI2immIGwsEFkxUrSDZDdA1VtDuPv5NxF8Bb6fhpoBgyxnMstVbEsMp4KyNYjcQ9GD NKUYqT+Dc7zlKGyz9qHyUQvXcDR2QqbLXvoOvljZ0Gc1BTfXp5Oq/c8WB7DQvA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=G8vgEOy5; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=G8vgEOy5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5DE424A09 X-Spam-Score: -2.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: S81wbIPMbo/S * guix/import/gem.scm (make-gem-sexp): Wrap inputs in 'list' instead of 'quasiquote'. * tests/gem.scm ("gem->guix-package") ("gem-recursive-import"): Adjust accordingly. --- guix/import/gem.scm | 8 ++------ tests/gem.scm | 15 ++++----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/guix/import/gem.scm b/guix/import/gem.scm index 418d716be6..0e5bb7e635 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -110,12 +111,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES." ,@(if (null? dependencies) '() `((propagated-inputs - (,'quasiquote - ,(map (lambda (name) - `(,name - (,'unquote - ,(string->symbol name)))) - dependencies))))) + (list ,@(map string->symbol dependencies))))) (synopsis ,synopsis) (description ,description) (home-page ,home-page) diff --git a/tests/gem.scm b/tests/gem.scm index 751bba656f..c8fe15398e 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,10 +94,7 @@ ('base32 "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) ('build-system 'ruby-build-system) - ('propagated-inputs - ('quasiquote - (("bundler" ('unquote 'bundler)) - ("ruby-bar" ('unquote 'ruby-bar))))) + ('propagated-inputs ('list 'bundler 'ruby-bar)) ('synopsis "A cool gem") ('description "This package provides a cool gem") ('home-page "https://example.com") @@ -132,9 +130,7 @@ ('base32 "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) ('build-system 'ruby-build-system) - ('propagated-inputs - ('quasiquote - (('"bundler" ('unquote 'bundler))))) + ('propagated-inputs ('list 'bundler)) ('synopsis "Another cool gem") ('description "Another cool gem") ('home-page "https://example.com") @@ -165,10 +161,7 @@ ('base32 "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) ('build-system 'ruby-build-system) - ('propagated-inputs - ('quasiquote - (("bundler" ('unquote 'bundler)) - ("ruby-bar" ('unquote 'ruby-bar))))) + ('propagated-inputs ('list 'bundler 'ruby-bar)) ('synopsis "A cool gem") ('description "This package provides a cool gem") ('home-page "https://example.com") -- 2.31.1