From patchwork Mon May 24 21:24:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 29575 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 B6AA227BC83; Mon, 24 May 2021 22:25:18 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 ESMTPS id 8AD6427BC81 for ; Mon, 24 May 2021 22:25:17 +0100 (BST) Received: from localhost ([::1]:42034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llI4a-0007uW-Km for patchwork@mira.cbaines.net; Mon, 24 May 2021 17:25:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llI4N-0007uN-AW for guix-patches@gnu.org; Mon, 24 May 2021 17:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llI4M-0006sT-Hn for guix-patches@gnu.org; Mon, 24 May 2021 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llI4M-0000pY-EL for guix-patches@gnu.org; Mon, 24 May 2021 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48634] [PATCH] import: opam: Generate license for package. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48634 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48634@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16218914843112 (code B ref -1); Mon, 24 May 2021 21:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 May 2021 21:24:44 +0000 Received: from localhost ([127.0.0.1]:44032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llI44-0000o6-E4 for submit@debbugs.gnu.org; Mon, 24 May 2021 17:24:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:57756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llI40-0000nv-C9 for submit@debbugs.gnu.org; Mon, 24 May 2021 17:24:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llI40-0007tE-54 for guix-patches@gnu.org; Mon, 24 May 2021 17:24:40 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:51778 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llI3y-0006a2-8u for guix-patches@gnu.org; Mon, 24 May 2021 17:24:39 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621891469; bh=ol3kUULAVYb5K6tPMQ5qcw+9rojZEoGMZNdYW4FjcpA=; h=From:To:Subject:Date; b=I5PR8AnCG8vmN8W1SwiAXAZn3B8qwSLDwrYG+NLifo4pPc8dDAmnJo6EV0YEqWIUQ nnlkQEkpsYnjO2hBMgwTAngd6iUt/mht9fZCXQQXOZNcmHcGFguqcCYNFzzMpSkWVc MllG01VMdEpdw8GiU+vIsl7FIKPpTL4NmNhUrODM= Message-Id: <64e9ab50f40879b397587184cdcc1b8d0ba3eb42.1621891264.git.public@yoctocell.xyz> Date: Mon, 24 May 2021 23:24:28 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.896, PDS_OTHER_BAD_TLD=1.997, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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/opam.scm (opam->guix-package): Generate license for the ‘license’ field. * tests/opam.scm (test-opam-file): Update accordingly. ("opam->guix-package"): Likewise. --- It uses SPDX itentifiers. guix/import/opam.scm | 4 +++- tests/opam.scm | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) base-commit: 488fc3d2e6e0a3d5fc4fe747587cf831989ece58 diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 670973b193..0201376457 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -335,7 +336,8 @@ or #f on failure." (home-page ,(metadata-ref opam-content "homepage")) (synopsis ,(metadata-ref opam-content "synopsis")) (description ,(metadata-ref opam-content "description")) - (license #f)) + (license ,(spdx-string->license + (metadata-ref opam-content "license")))) (filter (lambda (name) (not (member name '("dune" "jbuilder")))) diff --git a/tests/opam.scm b/tests/opam.scm index 11984b56a6..f1e3b70cb0 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ depends: [ synopsis: \"Some example package\" description: \"\"\" This package is just an example.\"\"\" +license: \"BSD-3-Clause\" url { src: \"https://example.org/foo-1.0.0.tar.gz\" checksum: \"md5=74c6e897658e820006106f45f736381f\" @@ -109,7 +111,7 @@ url { ('home-page "https://example.org/") ('synopsis "Some example package") ('description "This package is just an example.") - ('license #f)) + ('license 'license:bsd-3)) (string=? (bytevector->nix-base32-string test-source-hash) hash))