From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gOjpDNnX62C6ewAAgWs5BA (envelope-from ) for ; Mon, 12 Jul 2021 07:49:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mV94CNnX62DiLwAAbx9fmQ (envelope-from ) for ; Mon, 12 Jul 2021 05:49:13 +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 AF7889946 for ; Mon, 12 Jul 2021 07:49:12 +0200 (CEST) Received: from localhost ([::1]:45284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2ooZ-0004p8-Mp for larch@yhetil.org; Mon, 12 Jul 2021 01:49:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2ooQ-0004oQ-6Z for guix-patches@gnu.org; Mon, 12 Jul 2021 01:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2ooP-0006X7-Tv for guix-patches@gnu.org; Mon, 12 Jul 2021 01:49:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2ooP-00041Q-PK for guix-patches@gnu.org; Mon, 12 Jul 2021 01:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49531] [PATCH core-updates 1/4] import: utils: Emit new-style package inputs. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 05:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49531 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49531@debbugs.gnu.org Received: via spool by 49531-submit@debbugs.gnu.org id=B49531.162606889715373 (code B ref 49531); Mon, 12 Jul 2021 05:49:01 +0000 Received: (at 49531) by debbugs.gnu.org; 12 Jul 2021 05:48:17 +0000 Received: from localhost ([127.0.0.1]:36332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2ong-0003zt-Pi for submit@debbugs.gnu.org; Mon, 12 Jul 2021 01:48:17 -0400 Received: from out2.migadu.com ([188.165.223.204]:32839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2ond-0003zc-Nr for 49531@debbugs.gnu.org; Mon, 12 Jul 2021 01:48:15 -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=1626068892; 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=+ocm/OGlRdLgmIt4JNQjS6hR3p3TO8OoeidVLeOXKAQ=; b=RvKiGRlRpum/avx/HobFPLaTiiqE2/c+hhyL00tdxMRKz9Q3fsluylISL6FwvGcc00xIti AhIxuvGT0/QpCCGoC2ittf4rqAnq4CrRQxq7dZr/Megt3+Nad1PXqpKAnmNZ9ERG8Odilx FnUphjL7rO2LPy72S47OUiEhtPzl/0Y= Date: Sun, 11 Jul 2021 22:48:06 -0700 Message-Id: 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=1626068952; 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=+ocm/OGlRdLgmIt4JNQjS6hR3p3TO8OoeidVLeOXKAQ=; b=cUCldWhTU+5WHGntuSoS8HBaO5kYBFiIFnBJO3ZmEk8RanQQ6fOiGcjuj6eim2bCZ8ArDd CSxQqf29vrxN1tY9jbLz3EzhVEQQCcNrQEb3Fz9MgUbtynuiQGm70L6UQ1smajvTc9xyjO 6coXvtC9m4LLcYRiDOZmH3RfXgPcITpv0Ixg5MBwjrzy5Jvq9btr/GQC1GfhXgsrrJvXM2 rt60XEfGI+UvdipT/aI5vI4x61Cp4JOKtETXnih2iR8vG+qqabgdTTDxtHvrvQSsm/z2W0 qc815OSYtUOkQE5/X+vDpYcUXmUBin0/dj1+TNtpBDJVkh19rgQ6/Hpq32ojkg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626068952; a=rsa-sha256; cv=none; b=LBcTt4FXIq9zba75mxFhh+nEBvZCiD0E9hJEsTTR1M1Aq6ytvUGcoV8IZJwy37dkgJOvpz ydoIMRr7XT8aD52PmXo3hYZNNrsZkPI6GJnjpmpsQ+OYtj7S+y0tTI3MWlGgvw7oSwVLno rDNbl9O2zSKCvSY9a6ardgbutvqSGA6KkwsUn3NLkWAy3jKWhRmQDQegoC76zq+jl/D8BO MZYmei/jW8XYwySidVyl2kQePAF1euRjJvU3bO1tXf0WPDT/F5g+3iEMCbSfQbDJv6F5wK BEBAJk8uflnmfF+4CamVQIWr2PEdb4908a3FhED/aodHHA1fSg5o5mKmWWc55A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=RvKiGRlR; 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-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=RvKiGRlR; 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: AF7889946 X-Spam-Score: -2.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: RTIgwGGRyiaI * guix/import/utils.scm (package-names->package-inputs)[make-input]: Return new-style package inputs. (maybe-inputs): Wrap PACKAGE-INPUTS in 'list' instead of 'quasiquote'. --- guix/import/utils.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index d817318a91..8fa017e18f 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -237,12 +238,10 @@ into a proper sentence and by using two spaces between sentences." optional OUTPUT, tries to generate a quoted list of inputs, as suitable to use in an 'inputs' field of a package definition." (define (make-input input version) - (cons* input (list 'unquote (string->symbol - (if version - (string-append input "-" version) - input))) - (or (and output (list output)) - '()))) + (let ((name (if version (string-append input "-" version) input))) + (if output + (list (string->symbol name) output) + (string->symbol name)))) (map (match-lambda ((input version) (make-input input version)) @@ -263,7 +262,7 @@ snippet generated is for regular inputs." (() '()) ((package-inputs ...) - `((,field-name (,'quasiquote ,package-inputs))))))) + `((,field-name (list ,@package-inputs))))))) (define* (maybe-native-inputs package-names #:optional (output #f)) "Same as MAYBE-INPUTS, but for native inputs." -- 2.31.1