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 6LVYHUaS72BABQAAgWs5BA (envelope-from ) for ; Thu, 15 Jul 2021 03:41:26 +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 eE42F0aS72BWBQAAbx9fmQ (envelope-from ) for ; Thu, 15 Jul 2021 01:41:26 +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 61C9F2AD4 for ; Thu, 15 Jul 2021 03:41:25 +0200 (CEST) Received: from localhost ([::1]:42082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3qNQ-0004Kz-F2 for larch@yhetil.org; Wed, 14 Jul 2021 21:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3qN5-0003qL-VX for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3qN5-0005Lm-O2 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 1m3qN5-0003el-Mz for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49566] [PATCH core-updates 3/4] import: opam: 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:03 +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.162631325714014 (code B ref 49566); Thu, 15 Jul 2021 01:41:03 +0000 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:57 +0000 Received: from localhost ([127.0.0.1]:46160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMv-0003dv-Hv for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:57 -0400 Received: from out0.migadu.com ([94.23.1.103]:19446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMo-0003dU-JG for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:50 -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=1626313244; 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=rML/ZIAYpxkhMsZoUqcAPvsksaBKRjI3fGGD8Rq8JPk=; b=Ovzm1Iaf8j24mzj4sUJ4qtt6npqOAXTiLBMMD+xdWuYvhVXfMpmnoUu7zyk4GatNksvsvY SOxVUEDzXYEmG7tMfMRPHMCXWB01y2y/C9TaXP0hxrOjyvmZGgb6gM+N4/mwHv7KsgivQI zynYMGij2k9i2P8Mw1u0hfSnqTb4Q+4= Date: Wed, 14 Jul 2021 18:40:36 -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=1626313285; 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=rML/ZIAYpxkhMsZoUqcAPvsksaBKRjI3fGGD8Rq8JPk=; b=PFmUCf44floVagDK7A20KN7r0gswKVxLDQrUFWYinCQxdQv36CJUry0Rt3GVvcyt4wO8hs oxtR1daRiJ7SGPVhtnEmdFHEn8ARhaCFvAjdOogKACGopbwcWhFOxXBRP2oeIQ+3oN4y5E ukhd4K4A5P6GCV6eDQjNRPurUiUy7hpaYzP80c78pw3fUKkyXKY2KLqQI/4TqiF6r/Ntwv FFqIIFPbZ3b7dXADb12HpxNTh2Mfd5xDLTQXX+hk7xXTN+Tl2ENY3FeNZwOZoMpnWIZdYG d5ngLJQtTrfRWuWAOe2I6eDPjwfzUQsWrRT6U9L0nymLNbHeHQSAK3WGTLcSFQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626313285; a=rsa-sha256; cv=none; b=VV392jXRCtzNjvDk/u4RwxmrjNlNNZjXnOJ0UQ0r6m1tkqR00o7OFR/BmsuqQfG//f2bUf RjObIvgny30e1iopJGChecirMs89QA1aE594j/pHp1pxNMoDCy3qa0r9AFGXGh51IHH7Ou vVCYJ0UIKjGJDIBbAy34LKJS+KO3gWja3h1yaj2AWyRHVQxPUSu/K3opLzeYxE0fD9IXeA txLpO28mFwvTmTBrvnkiVT7DkuugVYTXUrOy/4YydbZajDyk4kZInByl74eN9kQD4ZhunV Ab+FPnRRDP8j5JwWfM02AI1WkmbSQxNC6ZJth1qNySzWnm/tqPoflYoxAeI3kw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=Ovzm1Iaf; 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=Ovzm1Iaf; 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: 61C9F2AD4 X-Spam-Score: -2.90 X-Migadu-Scanner: scn1.migadu.com X-TUID: Azhxl1l0iUzy * guix/import/opam.scm (opam->guix-package): Wrap INPUTS and NATIVE-INPUTS in 'list' instead of 'quasiquote'. (dependency-list->inputs): Return a list of symbols. * tests/opam.scm ("opam->guix-package"): Adjust accordingly. --- guix/import/opam.scm | 11 +++++------ tests/opam.scm | 10 +++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 0201376457..1ce8b7e94e 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -269,10 +270,8 @@ path to the repository." (map dependency->native-input depends))) (define (dependency-list->inputs lst) - (map - (lambda (dependency) - (list dependency (list 'unquote (string->symbol dependency)))) - (ocaml-names->guix-names lst))) + (map string->symbol + (ocaml-names->guix-names lst))) (define* (opam-fetch name #:optional (repository (get-opam-repository))) (and-let* ((repository repository) @@ -325,10 +324,10 @@ or #f on failure." 'ocaml-build-system)) ,@(if (null? inputs) '() - `((propagated-inputs ,(list 'quasiquote inputs)))) + `((propagated-inputs (list ,@inputs)))) ,@(if (null? native-inputs) '() - `((native-inputs ,(list 'quasiquote native-inputs)))) + `((native-inputs (list ,@native-inputs)))) ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) '() `((properties diff --git a/tests/opam.scm b/tests/opam.scm index f1e3b70cb0..e7f1ff9e39 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,13 +102,8 @@ url { ('base32 (? string? hash))))) ('build-system 'ocaml-build-system) - ('propagated-inputs - ('quasiquote - (("ocaml-zarith" ('unquote 'ocaml-zarith))))) - ('native-inputs - ('quasiquote - (("ocaml-alcotest" ('unquote 'ocaml-alcotest)) - ("ocamlbuild" ('unquote 'ocamlbuild))))) + ('propagated-inputs ('list 'ocaml-zarith)) + ('native-inputs ('list 'ocaml-alcotest 'ocamlbuild)) ('home-page "https://example.org/") ('synopsis "Some example package") ('description "This package is just an example.") -- 2.31.1