all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: julien@lepiller.eu
To: 29221@debbugs.gnu.org
Subject: [bug#29221] [PATCH 04/19] licenses: Add cddl1.1.
Date: Wed,  8 Nov 2017 23:51:25 +0100	[thread overview]
Message-ID: <20171108225140.6587-4-julien@lepiller.eu> (raw)
In-Reply-To: <20171108225140.6587-1-julien@lepiller.eu>

From: Julien Lepiller <julien@lepiller.eu>

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

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 6de611da2..b40296b86 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,10 @@ 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 cddl1.0)
+
 (define cecill                                    ;copyleft
   (license "CeCILL"
            "http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html"
-- 
2.15.0

  parent reply	other threads:[~2017-11-08 22:54 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-08 22:48 [bug#29221] [PATCH] java packages Julien Lepiller
2017-11-08 22:51 ` [bug#29221] [PATCH 01/19] gnu: Add bitshuffle julien
2017-11-08 22:51   ` [bug#29221] [PATCH 02/19] gnu: Add java-snappy julien
2017-11-08 22:51   ` [bug#29221] [PATCH 03/19] gnu: Add java-iq80-snappy julien
2017-11-08 22:51   ` julien [this message]
2017-11-09 15:31     ` [bug#29221] [PATCH 04/19] licenses: Add cddl1.1 Ludovic Courtès
2017-11-16 20:54       ` Julien Lepiller
2017-11-16 21:16         ` Tobias Geerinckx-Rice
2017-11-16 21:13           ` Julien Lepiller
2017-11-17 10:08             ` Ludovic Courtès
2017-11-08 22:51   ` [bug#29221] [PATCH 05/19] gnu: Add java-mail julien
2017-11-08 23:03     ` ng0
2017-11-09  8:36       ` julien lepiller
2017-11-08 22:51   ` [bug#29221] [PATCH 06/19] gnu: Add java-jeromq julien
2017-11-08 22:51   ` [bug#29221] [PATCH 07/19] gnu: Add java-commons-csv julien
2017-11-08 22:51   ` [bug#29221] [PATCH 08/19] gnu: Add java-commons-collections julien
2017-11-08 22:51   ` [bug#29221] [PATCH 09/19] gnu: Add java-commons-beanutils julien
2017-11-08 22:51   ` [bug#29221] [PATCH 10/19] gnu: Add java-kafka-clients julien
2017-11-08 22:51   ` [bug#29221] [PATCH 11/19] gnu: Add java-log4j-core julien
2017-11-08 22:51   ` [bug#29221] [PATCH 12/19] gnu: Add java-log4j-1.2-api julien
2017-11-08 22:51   ` [bug#29221] [PATCH 13/19] gnu: Add java-jdom julien
2017-11-08 22:51   ` [bug#29221] [PATCH 14/19] gnu: Add java-geronimo-xbean-reflect julien
2017-11-08 22:51   ` [bug#29221] [PATCH 15/19] gnu: Add java-tukaani-xz julien
2017-11-08 22:51   ` [bug#29221] [PATCH 16/19] gnu: Add java-plexus-container-default-bootstrap julien
2017-11-08 22:51   ` [bug#29221] [PATCH 17/19] gnu: Add java-plexus-io julien
2017-11-08 22:51   ` [bug#29221] [PATCH 18/19] gnu: Add java-plexus-archiver julien
2017-11-08 22:51   ` [bug#29221] [PATCH 19/19] gnu: Add java-plexus-container-default julien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171108225140.6587-4-julien@lepiller.eu \
    --to=julien@lepiller.eu \
    --cc=29221@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.