From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2HYaKHS9Q2XTvwAAauVa8A:P1 (envelope-from ) for ; Thu, 02 Nov 2023 16:17:08 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2HYaKHS9Q2XTvwAAauVa8A (envelope-from ) for ; Thu, 02 Nov 2023 16:17:08 +0100 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 5DBF86564A for ; Thu, 2 Nov 2023 16:17:08 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698938228; a=rsa-sha256; cv=none; b=a9JsdF4gDqBxBuscUkK2smLs/8EsLJ+Vq89hDA7A8H9HTMdqNYl8mVywjKEALKrNwBV1nH bPsB4T+sjhjoZwdYL27c2PjIozaAySVOnqYe+3HsDINRoJW/LHv0qjpqx3TJ3OZnpONZHP 9jZXdTdyoTmTn3+IL+eG60Xh3JVmmYpGVeyB6HLuSyKU/rg1KQ2m6FmCSuRLEzVh+KVJq5 oWh2ZtQokuxbxk7+xSmmaI1wx3JlBgk6vzX6EFWhYFWMFhJ5xxF0jupaQaKYsoiI24ohp8 uinPSC0d8DvtD2OZHvGs7Ku60n1rsk0TRmb3dLkrb1PeOoqAPwCxoKH9aAePLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698938228; h=from:from:sender:sender:reply-to: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; bh=5OcspkWL6bcRpoVCW1+FHV7IJTbJgRWqdNqsiWTn6wQ=; b=t8USiXCpPN0yGZ32FWy/r9Y56CMJfDlu6rw9Nchjk4Y2EXlZDT3F8m+vGKAeQeS+aiyjeM bB5sD4zxCSqIGz0O2U7YNoHLYSeV48YxrpNgfIqfupThivumupDksIwTgAwBGVXLgvrkBh tqtNeA8G5TgNDwnxbhRfFcSlKr458hNM3s45MFlOBLNxXvK90eamzOMApi4u9tHZcw5uRY 4kWwij/ChP6rWQpqSAkk530j0BpM/IkZvLke5dT9Tx/iSaaMo+jxRDANSi39XzdZUrCgPr gdYU5WiFrzpfxkvsz9jPTaHAWQYRdMeRhNqmwrrivoZgzpEvznfHJqKB3BgkFg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyZR1-0007Z8-Hz; Thu, 02 Nov 2023 11:16:39 -0400 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 1qyZQs-0007XE-G1 for guix-patches@gnu.org; Thu, 02 Nov 2023 11:16:31 -0400 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 1qyZQs-0002O9-1U for guix-patches@gnu.org; Thu, 02 Nov 2023 11:16:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyZRQ-0006Vv-TC for guix-patches@gnu.org; Thu, 02 Nov 2023 11:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42338] [PATCH 6/9] guix: import: composer: More robust string->license. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 15:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42338 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42338@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 42338-submit@debbugs.gnu.org id=B42338.169893817824895 (code B ref 42338); Thu, 02 Nov 2023 15:17:04 +0000 Received: (at 42338) by debbugs.gnu.org; 2 Nov 2023 15:16:18 +0000 Received: from localhost ([127.0.0.1]:55745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyZQg-0006TR-1V for submit@debbugs.gnu.org; Thu, 02 Nov 2023 11:16:18 -0400 Received: from 15.mo583.mail-out.ovh.net ([178.33.107.29]:58247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyZQb-0006S7-9p for 42338@debbugs.gnu.org; Thu, 02 Nov 2023 11:16:14 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.143.209]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 2500F290DF for <42338@debbugs.gnu.org>; Thu, 2 Nov 2023 15:15:37 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-5vftv (unknown [10.110.103.233]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CCB2D1FD4A; Thu, 2 Nov 2023 15:15:36 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-5vftv with ESMTPSA id vP3MLxi9Q2WXOAAA7QFvrQ (envelope-from ); Thu, 02 Nov 2023 15:15:36 +0000 X-OVh-ClientIp: 87.88.157.103 Date: Thu, 2 Nov 2023 16:04:26 +0100 Message-ID: <20231102151523.30581-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231102151523.30581-1-ngraves@ngraves.fr> References: <20231102151523.30581-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13625922151867474658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddtiedgjeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekjedrkeekrdduheejrddutdefpdefjedrheelrddugedvrdelheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepgedvfeefkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via 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-Queue-Id: 5DBF86564A X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.11 X-Spam-Score: -6.11 X-TUID: KlNjIQJV08gr * guix/import/composer.scm (string->license): Use spdx-string->license. Fall back to unknown-license!. --- guix/import/composer.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 3acbbecf82..49f16caedf 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -109,7 +109,10 @@ (define-json-mapping make-composer-package composer-package? (dev-require composer-package-dev-require "require-dev" json->require) (license composer-package-license "license" (lambda (vector) - (map string->license (vector->list vector))))) + (let ((l (map string->license (vector->list vector)))) + (if (eq? (length l) 1) + (car l) + `(list ,@l)))))) (define* (composer-fetch name #:optional version) "Return an alist representation of the Composer metadata for the package NAME, @@ -194,10 +197,8 @@ (define (make-php-sexp composer-package) (synopsis "") (description ,(composer-package-description composer-package)) (home-page ,(composer-package-homepage composer-package)) - (license ,(match (composer-package-license composer-package) - (() #f) - ((license) license) - (_ license))))))))) + (license ,(or (composer-package-license composer-package) + 'unknown-license!)))))))) (define composer->guix-package (memoize @@ -234,14 +235,15 @@ (define (guix-package->composer-name package) (define (string->license str) "Convert the string STR into a license object." - (match str - ("GNU LGPL" 'license:lgpl2.0) - ("GPL" 'license:gpl3) - ((or "BSD" "BSD License" "BSD-3-Clause") 'license:bsd-3) - ((or "MIT" "MIT license" "Expat license") 'license:expat) - ("Public domain" 'license:public-domain) - ((or "Apache License, Version 2.0" "Apache 2.0") 'license:asl2.0) - (_ #f))) + (or (spdx-string->license str) + (match str + ("GNU LGPL" 'license:lgpl2.0) + ("GPL" 'license:gpl3) + ((or "BSD" "BSD License") 'license:bsd-3) + ((or "MIT" "MIT license" "Expat license") 'license:expat) + ("Public domain" 'license:public-domain) + ((or "Apache License, Version 2.0" "Apache 2.0") 'license:asl2.0) + (_ 'unknown-license!)))) (define (php-package? package) "Return true if PACKAGE is a PHP package from Packagist." -- 2.41.0