From patchwork Fri Sep 23 14:11:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: itd X-Patchwork-Id: 42889 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D7DCC27BBEA; Fri, 23 Sep 2022 15:14:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8656B27BBE9 for ; Fri, 23 Sep 2022 15:14:19 +0100 (BST) Received: from localhost ([::1]:36668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1objRa-0004wY-Jm for patchwork@mira.cbaines.net; Fri, 23 Sep 2022 10:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1objRL-0004su-0b for guix-patches@gnu.org; Fri, 23 Sep 2022 10:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1objRK-0008HR-HS for guix-patches@gnu.org; Fri, 23 Sep 2022 10:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1objRK-0007Qq-54 for guix-patches@gnu.org; Fri, 23 Sep 2022 10:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58020] [PATCH] import: print: Quasiquote properties Resent-From: itd Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Sep 2022 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58020 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58020@debbugs.gnu.org Received: via spool by 58020-submit@debbugs.gnu.org id=B58020.166394240628517 (code B ref 58020); Fri, 23 Sep 2022 14:14:02 +0000 Received: (at 58020) by debbugs.gnu.org; 23 Sep 2022 14:13:26 +0000 Received: from localhost ([127.0.0.1]:41344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1objQk-0007Pt-5q for submit@debbugs.gnu.org; Fri, 23 Sep 2022 10:13:26 -0400 Received: from mailout3.rbg.tum.de ([131.159.0.8]:37263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1objQg-0007Pf-Qt for 58020@debbugs.gnu.org; Fri, 23 Sep 2022 10:13:24 -0400 Received: from mailrelay1.rbg.tum.de (mailrelay1.in.tum.de [131.159.254.14]) by mailout3.rbg.tum.de (Postfix) with ESMTPS id 79F5C1003CA for <58020@debbugs.gnu.org>; Fri, 23 Sep 2022 16:13:16 +0200 (CEST) Received: by mailrelay1.rbg.tum.de (Postfix, from userid 112) id 760151AB; Fri, 23 Sep 2022 16:13:16 +0200 (CEST) Received: from mailrelay1.rbg.tum.de (localhost [127.0.0.1]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id 8C16D1A1 for <58020@debbugs.gnu.org>; Fri, 23 Sep 2022 16:13:12 +0200 (CEST) Received: from mail.net.in.tum.de (mail.net.in.tum.de [IPv6:2001:4ca0:2001:14:216:3eff:fe52:ed14]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id 8A136CD for <58020@debbugs.gnu.org>; Fri, 23 Sep 2022 16:13:12 +0200 (CEST) Received: from amnesix.net.in.tum.de (amnesix.net.in.tum.de [IPv6:2001:4ca0:2001:11:e2d5:5eff:fea9:55ca]) by mail.net.in.tum.de (Postfix) with ESMTP id 744BB28C100B; Fri, 23 Sep 2022 16:13:12 +0200 (CEST) From: itd In-Reply-To: <87mtaqilj6.fsf@localhost> References: <87mtaqilj6.fsf@localhost> Date: Fri, 23 Sep 2022 16:11:52 +0200 Message-ID: <874jwyi3iv.fsf@localhost> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/import/print.scm (package->code): Quasiquote properties. * tests/print.scm (pkg-with-properties, pkg-with-properties-source): New variables. ("package with properties"): New test --- Hi again, if I'm not mistaken, it is also required to (quasi)quote the value of properties. This patch updates package->code to achieve this. Afterward, the following command: > $ guix import json /dev/stdin < { > "name": "hello", > "version": "2.10", > "source": "mirror://gnu/hello/hello-2.10.tar.gz", > "build-system": "gnu", > "home-page": "https://www.gnu.org/software/hello/", > "synopsis": "Hello, GNU world: An example GNU package", > "description": "GNU Hello prints a greeting.", > "license": "GPL-3.0+", > "native-inputs": ["gettext"], > "properties": { > "hidden?": true, > "upstream-name": "hello-upstream" > } > } > EOF should produce the following package definition: > (define-public hello > (package > (name "hello") > (version "2.10") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnu/hello/hello-" version > ".tar.gz")) > (sha256 > (base32 > "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) > (properties `((upstream-name . "hello-upstream") (hidden? . #t))) > (build-system (@ (guix build-system gnu) gnu-build-system)) > (native-inputs (list (@ (gnu packages gettext) gnu-gettext))) > (home-page "https://www.gnu.org/software/hello/") > (synopsis "Hello, GNU world: An example GNU package") > (description "GNU Hello prints a greeting.") > (license license:gpl3+))) > hello Regards itd guix/import/print.scm | 3 ++- tests/print.scm | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 66016145cb..2f54adbd8c 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -200,7 +200,8 @@ (define (package->code package) (source ,(source->code source version)) ,@(match properties (() '()) - (_ `((properties ,properties)))) + (_ `((properties + ,(list 'quasiquote (object->code properties #t)))))) ,@(if replacement `((replacement ,replacement)) '()) diff --git a/tests/print.scm b/tests/print.scm index d9710d1ed3..b4f193b905 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -139,6 +139,25 @@ (define-with-source pkg-with-arguments pkg-with-arguments-source (description "This is a dummy package.") (license license:gpl3+))) +(define-with-source pkg-with-properties pkg-with-properties-source + (package + (name "test") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (string-append "file:///tmp/test-" + version ".tar.gz")) + (sha256 + (base32 + "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) + (properties + `((hidden? . #t) (upstream-name "test-upstream"))) + (build-system (@ (guix build-system gnu) gnu-build-system)) + (home-page "http://gnu.org") + (synopsis "Dummy") + (description "This is a dummy package.") + (license license:gpl3+))) + (test-equal "simple package" `(define-public test ,pkg-source) (package->code pkg)) @@ -159,4 +178,8 @@ (define-with-source pkg-with-arguments pkg-with-arguments-source `(define-public test ,pkg-with-arguments-source) (package->code pkg-with-arguments)) +(test-equal "package with properties" + `(define-public test ,pkg-with-properties-source) + (package->code pkg-with-properties)) + (test-end "print")