From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2ADUL8vCVmKOLQEAgWs5BA (envelope-from ) for ; Wed, 13 Apr 2022 14:32:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aPBqKMvCVmKG4wAAG6o9tA (envelope-from ) for ; Wed, 13 Apr 2022 14:32:11 +0200 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 430802735E for ; Wed, 13 Apr 2022 14:32:11 +0200 (CEST) Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1necAL-0006gb-MI for larch@yhetil.org; Wed, 13 Apr 2022 08:32:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1necAE-0006gD-5f for guix-patches@gnu.org; Wed, 13 Apr 2022 08:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58117) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1necAD-0006sI-SP for guix-patches@gnu.org; Wed, 13 Apr 2022 08:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1necAD-0000mP-Pe for guix-patches@gnu.org; Wed, 13 Apr 2022 08:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54910] [PATCH] guix: import: Convert inputs to the new format. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Apr 2022 12:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54910@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16498531082963 (code B ref -1); Wed, 13 Apr 2022 12:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2022 12:31:48 +0000 Received: from localhost ([127.0.0.1]:52014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nec9z-0000li-WC for submit@debbugs.gnu.org; Wed, 13 Apr 2022 08:31:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:44188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nec9y-0000lb-H5 for submit@debbugs.gnu.org; Wed, 13 Apr 2022 08:31:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nec9y-0006e0-Ah for guix-patches@gnu.org; Wed, 13 Apr 2022 08:31:46 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:44695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nec9v-0006pY-UN for guix-patches@gnu.org; Wed, 13 Apr 2022 08:31:45 -0400 Received: by mail-ej1-x633.google.com with SMTP id u15so3577058ejf.11 for ; Wed, 13 Apr 2022 05:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6Q6ZuoWnTorh/rgFqQ+/1wYsfVPtEfFAzk0+/6+QzcM=; b=dQu+PO1SFmg1xjakhoCT+qP7UUIUy1l+b1bmBCI6EiV4PYDioewx+f0I/ErqAU7DIF G+0uHutLesx5qzOzF+7W9O7jdmGW2l80kIJ/Rb6s5xDAAIZOeRQqoe7qTuIx8oBug1PC a82tT7k+5q2o7GYR2DNw8MTU+hErzbLEVfDRBDknYtAYox3nYmvWGArMrEfPV8zgmxWq qQF3+RayvNzVazXTWbQ7ay40O/GBW4vWXsGlZJHTPCUg3wXj8YUznbYk06OyXOeQKO99 0ufVAKffdDEJhdHmQVlLSL/XnvzPtrDMD3p9NULbUMk4C5c6rIWiePUjdtt6S9OoBkXj 5oyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=6Q6ZuoWnTorh/rgFqQ+/1wYsfVPtEfFAzk0+/6+QzcM=; b=vB80fNqWZQpwpjtv1aZ6eejPiOg/fIhCF7dRGgawDMdsl1/5mOZarYqvIoL0om6/d7 xDRsV9hBSHgqxCXyTog3B96Y/v3kiXfkDoiDFpEOa9Ezgciynw7fMSHFPfkjIM0AwvKd g5v6wwf/vVDrUHQcF52OxzEyVUY9mz6zxLAf0ldQA7EY2A8B4QiEwvJ7m/9njFvuwdy7 nC3gypIiN925QqrhAcBbHSedRG1Hqr+JBjMvAIJcnDLdfxJHovXIz+kQsMsAkSf7l+i9 CkeYqvoef6s8nRkAlmhoQ6F7czaEL+ZgM1DplHu1pfs/d2oCZX1MmGTfeDy9yodgUYir Zk5g== X-Gm-Message-State: AOAM5313xUZU1t2XoQWV090MtRWqQR/woP2LtQkoI8O9ng/0KZ6+zved nC37H+2rEY4Za/noC/w9oQr3WShPJag= X-Google-Smtp-Source: ABdhPJzcCyH+KX7YCX2AjHhSf5YSLj4+CLSA5uvJuy6SZddAEXaeN41coFDXvFd5mLUxvx7OvEXXxw== X-Received: by 2002:a17:907:1c16:b0:6e8:b996:2a68 with SMTP id nc22-20020a1709071c1600b006e8b9962a68mr5605757ejc.363.1649853101938; Wed, 13 Apr 2022 05:31:41 -0700 (PDT) Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id b12-20020a056402278c00b004195a50759fsm1185679ede.84.2022.04.13.05.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 05:31:41 -0700 (PDT) From: Attila Lendvai Date: Wed, 13 Apr 2022 14:30:59 +0200 Message-Id: <20220413123108.5902-1-attila@lendvai.name> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=attila.lendvai@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649853131; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=6Q6ZuoWnTorh/rgFqQ+/1wYsfVPtEfFAzk0+/6+QzcM=; b=pwlP4RjdOUSgg1Ow0A9yTw3e3/0MFwmXFUUd1BKvHyLb4tSmS1t4Sm00iGC2V3u/0Pi4ff Ie0GoGZZOau3OrgLRVC2GL4O+hzS9xdcG9VEv/6lDBXV6SB0cYqqL/KO13hiIr+UHyFe3z u3uVXjRG99oYJicuEcdMGPX4pcP1fDXP9HDPzoRpKbH8mCl9zHO0Ebl76mo5jzdnyQ8Gl0 OOHy6a9B8xrj8Mt1nALeleZCvYFOUh3oATcM3VzoINjW71kA1xuvrmyqc1L2o8hxMzfOTB uDBufehF63L9QWpv9cHtRoy/hALciqAig2zvGijo1loQ7ZgisigTUrPGWXC7dw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649853131; a=rsa-sha256; cv=none; b=ld15KxlvLcSKoIygyH2ptDxrmHQdrIe1KTbwm2i1rfbSyftNgTW2HLQwcjS/zp44doiruT 59OXExC3pHAejiihKjZQC+uOB4VY1q1bLw67VLGaznTybl4iW+NHV6Dgqk6kyEi5gcWGgk tJJ8JKKYI2FE084jgbPAKenTMh8IdoDTRVBN5q4HrSl7yV5ZePeNzjP3/ew41li/e6Simw O2LaheY24Za6OYu0fj7SH2TGFvCF7hxrvN3YlMdMVtrFDG+n2V/mkJn61sUYp3gJxX6bcm Bljt3tUJOiA0gf3IesY8I7lRgA3qJWbw7NSfW6N80d4i7xZR8SGiHPAkk/imNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=dQu+PO1S; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.95 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=dQu+PO1S; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 430802735E X-Spam-Score: 2.95 X-Migadu-Scanner: scn0.migadu.com X-TUID: paSyFYTPh6JN * guix/import/utils.scm (package-names->package-inputs): Return the simplified format. (maybe-inputs): Use the simplified format. --- guix/import/utils.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 9cadbb3d5f..40dae55acd 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -268,12 +268,13 @@ (define* (package-names->package-inputs names #:optional (output #f)) 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 ((pkg (string->symbol + (if version + (string-append input "-" version) + input)))) + (if output + (list pkg output) + pkg))) (map (match-lambda ((input version) (make-input input version)) @@ -294,7 +295,7 @@ (define* (maybe-inputs package-names #:optional (output #f) (() '()) ((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.35.1