guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/20: licenses: Add cddl1.1.


From: julien lepiller
Subject: 04/20: licenses: Add cddl1.1.
Date: Sat, 18 Nov 2017 05:32:56 -0500 (EST)

roptat pushed a commit to branch master
in repository guix.

commit 965ba54be0674de7d84430622ec35b0de24c7334
Author: Julien Lepiller <address@hidden>
Date:   Sun Nov 5 12:39:51 2017 +0100

    licenses: Add cddl1.1.
    
    * guix/licenses.scm (cddl1.1): New variable.
---
 guix/licenses.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 6de611d..b07d800 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,14 @@ 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 "Sun Microsystems, Inc" becomes 
"Oracle",
+;; "LOST PROFITS" becoms "LOSS OF GOODWILL" and a section is added between 6.2
+;; and 6.3.
+(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";



reply via email to

[Prev in Thread] Current Thread [Next in Thread]