From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 13 08:31:48 2022 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 To: guix-patches@gnu.org Subject: [PATCH] guix: import: Convert inputs to the new format. 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-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 14 06:38:38 2022 Received: (at 54910) by debbugs.gnu.org; 14 Apr 2022 10:38:38 +0000 Received: from localhost ([127.0.0.1]:55302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1news2-0004md-2u for submit@debbugs.gnu.org; Thu, 14 Apr 2022 06:38:38 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1newrz-0004mU-Bw for 54910@debbugs.gnu.org; Thu, 14 Apr 2022 06:38:36 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1649932713; cv=none; d=zohomail.com; s=zohoarc; b=EFy+LAAxv9mfvLhhMjEWVO8OzJ4cie0m4jMNwHUCsHLDu9AQh55uCm+wn6aEBywFDcPNZNHnThjS9DEp//Rb2TGVnl8PR2/TpvjbzKR2k8GWzOYq2OXqoRjXR91mvNEfwMQnYCE4E9fsTGPGgST6vpPYsxHhFjOwciYiTsfNna4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649932713; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=Nf9SdhsQny/nSCgIECjyovzPcPBZytdRrhvudsfeJFc=; b=jw0/HYkf4NKb6PilfpGVfxHn/pZe/ig26suqt6owQAI9NgB1zVQD0jLI1dtP8J5kftvXEjFia8Iv2VjmzALxS2iOg/xWW2dJ9c8vnkjr9mjXtvF6yNeVVt8lTX+7s8LNoB14byrmpwdfssxUfTWUXY7usBj4EDkBFAd57rB7K98= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1649932713; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=Nf9SdhsQny/nSCgIECjyovzPcPBZytdRrhvudsfeJFc=; b=f0SFnrvqmRP+XTJ4sLciTYMHjFChsvWUAaYHEiUct1tZs7WlaQsLwebjmNttiofh LqbDiK4gZ0Pqlq562XUsmAuvQcRFPD0DicFXTVM2STPiZLHrX+20NPayBc675dCKu1B QrFQ7Uc3YJlmKLeP+3nygUa4ucPcHnWc/UgypU6c= Received: from localhost (152-108-142-46.pool.kielnet.net [46.142.108.152]) by mx.zohomail.com with SMTPS id 1649932709422581.2433710727471; Thu, 14 Apr 2022 03:38:29 -0700 (PDT) User-agent: mu4e 1.6.10; emacs 28.0.50 From: Ricardo Wurmus To: 54910@debbugs.gnu.org Subject: [PATCH] guix: import: Convert inputs to the new format. Date: Thu, 14 Apr 2022 12:33:43 +0200 X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Message-ID: <87r160vtjy.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54910 Cc: kuba@kadziolka.net, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thanks for the patch! This looked good to me, so I applied it locally. I then ran the test suite and noticed that tests/go.scm and tests/crate.scm have failing tests. The failure in tests/go.scm is harmless and can easily be fixed. But the failure in tests/crate.scm indicates a real problem, I think. The build system expects that inputs are placed in the #:cargo-inputs field in (arguments =E2=80=A6), and this seems to expect old-style labelled input= s. I don=E2=80=99t know if the build system would work with the new-style plain lists in the arguments field, so I=E2=80=99m Cc-ing contributors to the bui= ld system. @Jakub and @Efraim: could you please comment on this? Thanks in advance! --=20 Ricardo From debbugs-submit-bounces@debbugs.gnu.org Mon May 23 09:37:42 2022 Received: (at 54910) by debbugs.gnu.org; 23 May 2022 13:37:43 +0000 Received: from localhost ([127.0.0.1]:47706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nt8Fi-0007ck-BA for submit@debbugs.gnu.org; Mon, 23 May 2022 09:37:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nt8FT-0007cJ-S3 for 54910@debbugs.gnu.org; Mon, 23 May 2022 09:37:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34208) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt8FH-0000ku-Ta; Mon, 23 May 2022 09:37:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=KKESYQb/H5AixF2XvkgOjP7VgGOIM+t/xsEYtNwxX9A=; b=LOjxN+b2PDxRd3nMHTW6 MfjXKQgcINgjR+ATHvT7uB7z/DIF5f70Zlvf6ZZFBnD/oiaNNJK8E6312/AlOikCy02xbVHAW9vf9 eOheXf8mfhwsZOk6di+8bvZEQPEvEOn8cIm3tv/ydqCcCRPewfiR9R7PkEXxNd+bPQ3fQW0/X1RCs kl0PLdyTp1GwxYuyHgKvp/BlCo6fOGDtndZMGV5VAsVM4qi8akZzjqoQKuv8RtSbRgDZig9ssyTMx HNURodyvlA/kmYjpk8LIxC3FMJmcQ/P7wkUzhFfzEhFjQDEn9C/ZzOUziXdm3d+ujmyHQ932n7fBE x4uGDV+4JLZUTQ==; Received: from [193.50.110.143] (port=55754 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt8FH-0008Ic-Gb; Mon, 23 May 2022 09:37:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: kuba@kadziolka.net, Efraim Flashner Subject: Re: bug#54910: [PATCH] guix: import: Convert inputs to the new format. References: <20220413123108.5902-1-attila@lendvai.name> <87r160vtjy.fsf@elephly.net> Date: Mon, 23 May 2022 15:37:13 +0200 In-Reply-To: <87r160vtjy.fsf@elephly.net> (Ricardo Wurmus's message of "Thu, 14 Apr 2022 12:33:43 +0200") Message-ID: <87sfp05q0m.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54910 Cc: Ricardo Wurmus , 54910@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey Efraim & Jakub, Ricardo Wurmus skribis: > Thanks for the patch! > > This looked good to me, so I applied it locally. I then ran the test > suite and noticed that tests/go.scm and tests/crate.scm have failing > tests. > > The failure in tests/go.scm is harmless and can easily be fixed. But > the failure in tests/crate.scm indicates a real problem, I think. The > build system expects that inputs are placed in the #:cargo-inputs field > in (arguments =E2=80=A6), and this seems to expect old-style labelled inp= uts. > > I don=E2=80=99t know if the build system would work with the new-style pl= ain > lists in the arguments field, so I=E2=80=99m Cc-ing contributors to the b= uild > system. > > @Jakub and @Efraim: could you please comment on this? A friendly ping. :-) I think it=E2=80=99s important to make sure the current Rust packaging stra= tegy does not =E2=80=9Chold us back=E2=80=9D. Thanks, Ludo=E2=80=99.