From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: [PATCH 05/96] gnu: ocaml: Use a prefix for license field. Date: Tue, 3 Jan 2017 20:10:46 +0100 Message-ID: <20170103191217.6431-6-julien@lepiller.eu> References: <20170103191217.6431-1-julien@lepiller.eu> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOUVx-0007Nn-58 for guix-devel@gnu.org; Tue, 03 Jan 2017 14:12:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOUVs-0004T9-CR for guix-devel@gnu.org; Tue, 03 Jan 2017 14:12:53 -0500 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:35255 helo=skaro.lepiller.eu) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOUVr-0004SN-UX for guix-devel@gnu.org; Tue, 03 Jan 2017 14:12:48 -0500 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id 7AD0481262 for ; Tue, 3 Jan 2017 20:12:45 +0100 (CET) Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tJOaRW3P8Z80 for ; Tue, 3 Jan 2017 20:12:39 +0100 (CET) Received: from localhost.localdomain (128-79-116-134.hfc.dyn.abo.bbox.fr [128.79.116.134]) by skaro.lepiller.eu (Postfix) with ESMTPSA id 7608281200 for ; Tue, 3 Jan 2017 20:12:29 +0100 (CET) In-Reply-To: <20170103191217.6431-1-julien@lepiller.eu> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --- gnu/packages/ocaml.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 644638f8a..1554be217 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -24,7 +24,7 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu packages ocaml) - #:use-module ((guix licenses) #:hide (zlib)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix svn-download) @@ -152,7 +152,7 @@ functional, imperative and object-oriented styles of = programming.") ;; The compiler is distributed under qpl1.0 with a change to choice = of ;; law: the license is governed by the laws of France. The library = is ;; distributed under lgpl2.0. - (license (list qpl lgpl2.0)))) + (license (list license:qpl license:lgpl2.0)))) =20 (define-public opam (package @@ -217,7 +217,7 @@ simultaneous compiler installations, flexible package= constraints, and a Git-friendly development workflow.") =20 ;; The 'LICENSE' file waives some requirements compared to LGPLv3. - (license lgpl3))) + (license license:lgpl3))) =20 (define-public camlp4 (package @@ -263,7 +263,7 @@ syntax of OCaml.") =20 ;; This is LGPLv2 with an exception that allows packages statically-= linked ;; against the library to be released under any terms. - (license lgpl2.0))) + (license license:lgpl2.0))) =20 (define-public camlp5 (package @@ -304,7 +304,7 @@ syntax of OCaml.") tools for syntax (Stream Parsers and Grammars) and the ability to modify= the concrete syntax of the language (Quotations, Syntax Extensions).") ;; Most files are distributed under bsd-3, but ocaml_stuff/* is unde= r qpl. - (license (list bsd-3 qpl)))) + (license (list license:bsd-3 license:qpl)))) =20 (define-public hevea (package @@ -335,7 +335,7 @@ concrete syntax of the language (Quotations, Syntax E= xtensions).") (description "HeVeA is a LaTeX to HTML translator that generates modern HTML 5. = It is written in Objective Caml.") - (license qpl))) + (license license:qpl))) =20 (define-public coq (package @@ -388,7 +388,7 @@ development of computer programs consistent with thei= r formal specification. It is developed using Objective Caml and Camlp5.") ;; The code is distributed under lgpl2.1. ;; Some of the documentation is distributed under opl1.0+. - (license (list lgpl2.1 opl1.0+)))) + (license (list license:lgpl2.1 license:opl1.0+)))) =20 (define-public proof-general (package @@ -466,7 +466,7 @@ It is developed using Objective Caml and Camlp5.") "Proof General is a major mode to turn Emacs into an interactive pr= oof assistant to write formal mathematical proofs using a variety of theorem provers.") - (license gpl2+))) + (license license:gpl2+))) =20 (define-public ocaml-menhir (package @@ -502,7 +502,7 @@ Knuth=E2=80=99s LR(1) parser construction technique."= ) ;; The file src/standard.mly and all files listed in src/mnehirLib.m= lpack ;; that have an *.ml or *.mli extension are GPL licensed. All other = files ;; are QPL licensed. - (license (list gpl2+ qpl)))) + (license (list license:gpl2+ license:qpl)))) =20 (define-public lablgtk (package @@ -565,7 +565,7 @@ gdk-pixbuf, the GLArea widget (in combination with La= blGL), gnomecanvas, gnomeui, gtksourceview, gtkspell, libglade (and it an generate OCaml code from .glade files), libpanel, librsvg and quartz.") - (license lgpl2.1))) + (license license:lgpl2.1))) =20 (define-public unison (package @@ -686,7 +686,7 @@ a collection of files and directories to be stored on= different hosts (or different disks on the same host), modified separately, and then brought up to date by propagating the changes in each replica to the other.") - (license gpl3+))) + (license license:gpl3+))) =20 (define-public ocaml-findlib (package @@ -734,4 +734,4 @@ dependency information about multiple packages. Ther= e is also a tool that allows the user to enter queries on the command-line. In order to simpl= ify compilation and linkage, there are new frontends of the various OCaml compilers that can directly deal with packages.") - (license x11))) + (license license:x11))) --=20 2.11.0