From patchwork Tue Dec 19 23:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 57865 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 ABBDB27BBE9; Tue, 19 Dec 2023 23:47:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 162E827BBE2 for ; Tue, 19 Dec 2023 23:47:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFjnh-0002XC-FV; Tue, 19 Dec 2023 18:47:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFjnf-0002Ws-VA for guix-patches@gnu.org; Tue, 19 Dec 2023 18:46:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFjnf-0003Ny-Mx for guix-patches@gnu.org; Tue, 19 Dec 2023 18:46:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFjni-0004Fn-DW for guix-patches@gnu.org; Tue, 19 Dec 2023 18:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67917] [PATCH 2/2] import: cpan: Add 'define-public' to package definition. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 23:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67917 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67917@debbugs.gnu.org Cc: Wilko Meyer Received: via spool by 67917-submit@debbugs.gnu.org id=B67917.170302958316297 (code B ref 67917); Tue, 19 Dec 2023 23:47:02 +0000 Received: (at 67917) by debbugs.gnu.org; 19 Dec 2023 23:46:23 +0000 Received: from localhost ([127.0.0.1]:37956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFjn4-0004Em-IR for submit@debbugs.gnu.org; Tue, 19 Dec 2023 18:46:22 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]:37338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFjn1-00049W-VQ for 67917@debbugs.gnu.org; Tue, 19 Dec 2023 18:46:20 -0500 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1703029571; bh=zrZjWk1npHlysVvU9lUPE+Nr+Y0qI0Anrio60I3s4rY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S81yqVIv9yRyJN2UsY2BEyeMMQzpt1ifYsUluJj8/1JWPud5GalLxNihcKmxGDQLQ SXWPsDsaidzmgic62Y8VZwGE6B+2DQVQcjoaFpP0ONwQuwwLeMKgNPfMWaMm6D6qf5 +i3JsJo5uU17T9aj4ETvCgqd+iFq9c654AauxbJM= Date: Wed, 20 Dec 2023 00:45:24 +0100 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/cpan.scm (string->license): Add 'define-public' to package definition. Change-Id: I9a0bcb53b40ab8f68579e99c0b8a86bbe9905db2 --- guix/import/cpan.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 7dd89c02dc7..d5ac8e0cb90 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -288,26 +288,27 @@ (define (cpan-module->sexp release) (let ((tarball (with-store store (download-to-store store source-url))) (inputs (cpan-module-inputs release))) - `(package - (name ,(cpan-name->downstream-name name)) - (version ,version) - (source (origin - (method url-fetch) - (uri (string-append ,@(factorize-uri source-url version))) - (sha256 - (base32 - ,(bytevector->nix-base32-string (file-sha256 tarball)))))) - (build-system perl-build-system) - ,@(maybe-inputs 'native-inputs - (filter (upstream-input-type-predicate 'native) - inputs)) - ,@(maybe-inputs 'propagated-inputs - (filter (upstream-input-type-predicate 'propagated) - inputs)) - (home-page ,(cpan-home name)) - (synopsis ,(cpan-release-abstract release)) - (description fill-in-yourself!) - (license ,(string->license (cpan-release-license release)))))) + `(define-public ,(string->symbol (cpan-name->downstream-name name)) + (package + (name ,(cpan-name->downstream-name name)) + (version ,version) + (source (origin + (method url-fetch) + (uri (string-append ,@(factorize-uri source-url version))) + (sha256 + (base32 + ,(bytevector->nix-base32-string (file-sha256 tarball)))))) + (build-system perl-build-system) + ,@(maybe-inputs 'native-inputs + (filter (upstream-input-type-predicate 'native) + inputs)) + ,@(maybe-inputs 'propagated-inputs + (filter (upstream-input-type-predicate 'propagated) + inputs)) + (home-page ,(cpan-home name)) + (synopsis ,(cpan-release-abstract release)) + (description fill-in-yourself!) + (license ,(string->license (cpan-release-license release))))))) (define (cpan->guix-package module-name) "Fetch the metadata for PACKAGE-NAME from metacpan.org, and return the