[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"
- branch master updated (82af2c2 -> a083729), julien lepiller, 2017/11/18
- 05/20: gnu: Add java-jboss-jms-api-spec., julien lepiller, 2017/11/18
- 01/20: gnu: Add bitshuffle., julien lepiller, 2017/11/18
- 03/20: gnu: Add java-iq80-snappy., julien lepiller, 2017/11/18
- 02/20: gnu: Add java-snappy., julien lepiller, 2017/11/18
- 09/20: gnu: Add java-commons-collections., julien lepiller, 2017/11/18
- 11/20: gnu: Add java-kafka-clients., julien lepiller, 2017/11/18
- 17/20: gnu: Add java-plexus-container-default-bootstrap., julien lepiller, 2017/11/18
- 06/20: gnu: Add java-mail., julien lepiller, 2017/11/18
- 04/20: licenses: Add cddl1.1.,
julien lepiller <=
- 08/20: gnu: Add java-commons-csv., julien lepiller, 2017/11/18
- 13/20: gnu: Add java-log4j-1.2-api., julien lepiller, 2017/11/18
- 14/20: gnu: Add java-jdom., julien lepiller, 2017/11/18
- 12/20: gnu: Add java-log4j-core., julien lepiller, 2017/11/18
- 20/20: gnu: Add java-plexus-container-default., julien lepiller, 2017/11/18
- 07/20: gnu: Add java-jeromq., julien lepiller, 2017/11/18
- 18/20: gnu: Add java-plexus-io., julien lepiller, 2017/11/18
- 10/20: gnu: Add java-commons-beanutils., julien lepiller, 2017/11/18
- 15/20: gnu: Add java-geronimo-xbean-reflect., julien lepiller, 2017/11/18
- 16/20: gnu: Add java-tukaani-xz., julien lepiller, 2017/11/18