summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2017-11-05 12:39:51 +0100
committerJulien Lepiller <julien@lepiller.eu>2017-11-18 11:29:36 +0100
commit965ba54be0674de7d84430622ec35b0de24c7334 (patch)
treea478612840202e485e128bfeaf217678ee8eb1c9
parent823997e969718efd6ab56fca7a9aae3f458ba978 (diff)
downloadguix-965ba54be0674de7d84430622ec35b0de24c7334.tar.gz
licenses: Add cddl1.1.
* guix/licenses.scm (cddl1.1): New variable.
-rw-r--r--guix/licenses.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 6de611da2b..b07d80076e 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"