From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mAtKMIUrgmWw4wAAkFu2QA (envelope-from ) for ; Wed, 20 Dec 2023 00:47:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id AAx/KYUrgmWgHgAAqHPOHw (envelope-from ) for ; Wed, 20 Dec 2023 00:47:17 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wmeyer.eu header.s=mail header.b=S81yqVIv; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wmeyer.eu (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1703029637; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=zrZjWk1npHlysVvU9lUPE+Nr+Y0qI0Anrio60I3s4rY=; b=b8l+lbuouEXAycOPhS10wER3G8s9q/WontrcHggdT6KozCpRCBmIt1yOW9u4hfmyXfncUu ddjLJdfY2gRZLNSdYgLoyOlGXeEOXuyaW1ViHOQ5Cx5WPHfxSeGvK2kVdSSJUSb+ZpppPm E3q7lHvq2qwmWurv7J0BzuDfejbALIvxSfCiEy1sGIY28S4wg2A+3504hxMxSPC+5g1g0P YBAnIdX4pSZ9SsshlvY+DBBPfsRXuZJBdo+Z7sojE5opJoTdW7pFnugHrttPRA26x0WB73 agBkaolsSG6SvO9wpFFh06Q29MvpstaE2UCU+fhjuCJ38qqljA6OouEZ6Zpsfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703029637; a=rsa-sha256; cv=none; b=lWQg6UvjP+GNvNkwUAsoH2pYVuXhxhapCWpyGGQvh7boqm0llF4xjpM7WFrVUpOtdvxznC yMAaf4TpC2znnYgGBOkh/ihaFzJrjh4NlWiA5BSQi52XPNLauPXZJ/MhasGyoxWWpRPr4e 56+OZvF2ccs3QfTxHPLvcOmNY6h4pNwlOEsHOh4UgbLoQP3MTEY29lCMJm5qs97XnmmM5p ybKwQ/6yGNNMPnskSQuR24lnaNqFpCcOUaQPjGs98sET6XbRBC6CrakpOM2mfJTdaTKLrn +ZURpvd130mS+rQHFX8pIpFxSE6WVJQsw/aPG6eFIHKTLcRri5ySziJ5eBryXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wmeyer.eu header.s=mail header.b=S81yqVIv; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wmeyer.eu (policy=none) 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 91D7B1157E for ; Wed, 20 Dec 2023 00:47:17 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.62 X-Spam-Score: -3.62 X-Migadu-Queue-Id: 91D7B1157E X-Migadu-Scanner: mx12.migadu.com X-TUID: Nm9Gx5jrmcfj * 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 -- 2.41.0