>From 16a737384d495a668f1db0f5deeb9f255158e39a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 5 Nov 2017 12:39:51 +0100 Subject: [PATCH 04/20] licenses: Add cddl1.1. * guix/licenses.scm (cddl1.1): New variable. --- guix/licenses.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/licenses.scm b/guix/licenses.scm index 6de611da2..fa376750f 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -42,7 +42,7 @@ cc-by2.0 cc-by3.0 cc-by4.0 cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0 cc-sampling-plus-1.0 - cddl1.0 + cddl1.0 cddl1.1 cecill cecill-b cecill-c artistic2.0 clarified-artistic copyleft-next @@ -217,6 +217,13 @@ at URI, which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:CDDLv1.0" "https://www.gnu.org/licenses/license-list#CDDL")) +;; CDDL1.1 is the same as 1.0, except that "Oracle" becomes "Sun Microsystems, Inc", +;; "LOSS OF GOODWILL" becomes "LOST PROFITS" and section 6.3 is removed. +(define cddl1.1 + (license "CDDL 1.1" + "https://oss.oracle.com/licenses/CDDL+GPL-1.1" + "https://www.gnu.org/licenses/license-list#CDDL")) + (define cecill ;copyleft (license "CeCILL" "http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html" -- 2.15.0