From patchwork Tue Apr 14 22:48:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 21260 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 35E5327BBE1; Tue, 14 Apr 2020 23:49:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9C20227BBE4 for ; Tue, 14 Apr 2020 23:49:13 +0100 (BST) Received: from localhost ([::1]:40008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOUMj-0005fY-4w for patchwork@mira.cbaines.net; Tue, 14 Apr 2020 18:49:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOUMZ-0005ea-Be for guix-patches@gnu.org; Tue, 14 Apr 2020 18:49:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOUMY-0004e8-5u for guix-patches@gnu.org; Tue, 14 Apr 2020 18:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOUMY-0004e0-2T for guix-patches@gnu.org; Tue, 14 Apr 2020 18:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOUMY-0001nX-1U for guix-patches@gnu.org; Tue, 14 Apr 2020 18:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40629] [PATCH 7/9] import/print: package->code: Wrap S-expression in definition. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Apr 2020 22:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40629 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40629@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 40629-submit@debbugs.gnu.org id=B40629.15869045136840 (code B ref 40629); Tue, 14 Apr 2020 22:49:01 +0000 Received: (at 40629) by debbugs.gnu.org; 14 Apr 2020 22:48:33 +0000 Received: from localhost ([127.0.0.1]:34947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOUM4-0001mF-J7 for submit@debbugs.gnu.org; Tue, 14 Apr 2020 18:48:33 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOUM2-0001m6-IR for 40629@debbugs.gnu.org; Tue, 14 Apr 2020 18:48:30 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1586904508; cv=none; d=zohomail.com; s=zohoarc; b=AxrcUYkiIo2dhjgZA76LQ3CwBz4oQFwoqj1cxoptUCnQB5IU5PiobPx4EZkzg0jPTW6+lR/ZiNevm3Rujsad8bJZUR8xjpnjVQv4gMIaRU0i57uM+dNo0taAGraFYk2mZIVqHzF4he9DEzOXq7Vp/ToJGkOl5SSk/XLXjvAczEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586904508; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=lNuYbA+owNzNcGZQMMF3bsFU0SVssoihNZbq8hTT+qM=; b=TD9NxV6sO9orK6952U2aeil+3HjL0CdQ2f+onEsHYm3rD0c6gEJpF205IDA/V3ymuWmq//Wdgj8KxriwdzzL19HV7nc0S1UX7AIzMq5Y99gfRCfwq125AspLeiyxwQzQnHBGPhC1QHMK3YXZy0l9WXaXWm5XgXHJfaQoIPtI6m8= 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= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1586904508; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=lNuYbA+owNzNcGZQMMF3bsFU0SVssoihNZbq8hTT+qM=; b=iSSO6aRnSx7A8SzOvi4gPq/HP0SiXPuoOusSeH0zCZPtug/y5qjTChzjJY5EU93V t7iKAhQID2w2lWQQYThu+3lWIZb6W7Q3fgPGJprIOXjnhEl6GXIfkzcNWAzbbdhIF8p fLGohRi3gib86h6ZZ2y2xb9XsFQUkuKqswsYQSXY= Received: from localhost (p54AD4D5F.dip0.t-ipconnect.de [84.173.77.95]) by mx.zohomail.com with SMTPS id 1586904506102700.3554931827858; Tue, 14 Apr 2020 15:48:26 -0700 (PDT) From: Ricardo Wurmus Message-ID: <20200414224817.3850-2-rekado@elephly.net> Date: Wed, 15 Apr 2020 00:48:15 +0200 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200414224817.3850-1-rekado@elephly.net> References: <20200414224817.3850-1-rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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): Return a definition, not just a package expression. --- guix/import/print.scm | 87 ++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 4529a79b23..08f3ec9c34 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -121,46 +121,47 @@ when evaluated." (home-page (package-home-page package)) (supported-systems (package-supported-systems package)) (properties (package-properties package))) - `(package - (name ,name) - (version ,version) - (source ,(source->code source version)) - ,@(match properties - (() '()) - (_ `((properties ,properties)))) - ,@(if replacement - `((replacement ,replacement)) - '()) - (build-system (@ (guix build-system ,(build-system-name build-system)) - ,(symbol-append (build-system-name build-system) - '-build-system))) - ,@(match arguments - (() '()) - (args `((arguments ,(list 'quasiquote args))))) - ,@(match outputs - (("out") '()) - (outs `((outputs (list ,@outs))))) - ,@(match native-inputs - (() '()) - (pkgs `((native-inputs ,(package-lists->code pkgs))))) - ,@(match inputs - (() '()) - (pkgs `((inputs ,(package-lists->code pkgs))))) - ,@(match propagated-inputs - (() '()) - (pkgs `((propagated-inputs ,(package-lists->code pkgs))))) - ,@(if (lset= string=? supported-systems %supported-systems) - '() - `((supported-systems (list ,@supported-systems)))) - ,@(match (map search-path-specification->code native-search-paths) - (() '()) - (paths `((native-search-paths (list ,@paths))))) - ,@(match (map search-path-specification->code search-paths) - (() '()) - (paths `((search-paths (list ,@paths))))) - (home-page ,home-page) - (synopsis ,synopsis) - (description ,description) - (license ,(if (list? license) - `(list ,@(map license->code license)) - (license->code license)))))) + `(define-public ,(string->symbol name) + (package + (name ,name) + (version ,version) + (source ,(source->code source version)) + ,@(match properties + (() '()) + (_ `((properties ,properties)))) + ,@(if replacement + `((replacement ,replacement)) + '()) + (build-system (@ (guix build-system ,(build-system-name build-system)) + ,(symbol-append (build-system-name build-system) + '-build-system))) + ,@(match arguments + (() '()) + (args `((arguments ,(list 'quasiquote args))))) + ,@(match outputs + (("out") '()) + (outs `((outputs (list ,@outs))))) + ,@(match native-inputs + (() '()) + (pkgs `((native-inputs ,(package-lists->code pkgs))))) + ,@(match inputs + (() '()) + (pkgs `((inputs ,(package-lists->code pkgs))))) + ,@(match propagated-inputs + (() '()) + (pkgs `((propagated-inputs ,(package-lists->code pkgs))))) + ,@(if (lset= string=? supported-systems %supported-systems) + '() + `((supported-systems (list ,@supported-systems)))) + ,@(match (map search-path-specification->code native-search-paths) + (() '()) + (paths `((native-search-paths (list ,@paths))))) + ,@(match (map search-path-specification->code search-paths) + (() '()) + (paths `((search-paths (list ,@paths))))) + (home-page ,home-page) + (synopsis ,synopsis) + (description ,description) + (license ,(if (list? license) + `(list ,@(map license->code license)) + (license->code license)))))))