all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] licenses: Add Apache Software License 1.1.
@ 2016-03-16  7:55 Roel Janssen
  2016-03-17  4:51 ` Leo Famulari
  0 siblings, 1 reply; 2+ messages in thread
From: Roel Janssen @ 2016-03-16  7:55 UTC (permalink / raw)
  To: guix-devel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-licenses-Add-Apache-Software-License-1.1.patch --]
[-- Type: text/x-patch, Size: 1137 bytes --]

From 02888e1aa137142a2a5ad9edc400df04514e7e3d Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Wed, 16 Mar 2016 08:50:23 +0100
Subject: [PATCH] licenses: Add Apache Software License 1.1.

* guix/licenses.scm (asl1.1): New variables.
---
 guix/licenses.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 61e6793..71c0736 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -28,7 +28,7 @@
   #:use-module (srfi srfi-9)
   #:export (license? license-name license-uri license-comment
             agpl3 agpl3+
-            asl2.0
+            asl1.1 asl2.0
             boost1.0
             bsd-2 bsd-3 bsd-4
             non-copyleft
@@ -100,6 +100,11 @@
            "https://gnu.org/licenses/agpl.html"
            "https://gnu.org/licenses/why-affero-gpl.html"))
 
+(define asl1.1
+  (license "ASL 1.1"
+           "http://directory.fsf.org/wiki/License:Apache1.1"
+           "https://www.gnu.org/licenses/license-list#apache1"))
+
 (define asl2.0
   (license "ASL 2.0"
            "http://directory.fsf.org/wiki/License:Apache2.0"
-- 
2.7.3


[-- Attachment #2: Type: text/plain, Size: 394 bytes --]

Dear Guix,

I've added the Apache Software License 1.1 because I intend to submit a
package that uses this license later.  The GNU licenses page says the
following about it:

> This is a permissive non-copyleft free software license. It has a few
> requirements that render it incompatible with the GNU GPL, such as
> strong prohibitions on the use of Apache-related names.

Kind regards,
Roel

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] licenses: Add Apache Software License 1.1.
  2016-03-16  7:55 [PATCH] licenses: Add Apache Software License 1.1 Roel Janssen
@ 2016-03-17  4:51 ` Leo Famulari
  0 siblings, 0 replies; 2+ messages in thread
From: Leo Famulari @ 2016-03-17  4:51 UTC (permalink / raw)
  To: Roel Janssen; +Cc: guix-devel

On Wed, Mar 16, 2016 at 08:55:02AM +0100, Roel Janssen wrote:
> From 02888e1aa137142a2a5ad9edc400df04514e7e3d Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel@gnu.org>
> Date: Wed, 16 Mar 2016 08:50:23 +0100
> Subject: [PATCH] licenses: Add Apache Software License 1.1.
> 
> * guix/licenses.scm (asl1.1): New variables.

Thanks, pushed as f88ce395!

> ---
>  guix/licenses.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/guix/licenses.scm b/guix/licenses.scm
> index 61e6793..71c0736 100644
> --- a/guix/licenses.scm
> +++ b/guix/licenses.scm
> @@ -28,7 +28,7 @@
>    #:use-module (srfi srfi-9)
>    #:export (license? license-name license-uri license-comment
>              agpl3 agpl3+
> -            asl2.0
> +            asl1.1 asl2.0
>              boost1.0
>              bsd-2 bsd-3 bsd-4
>              non-copyleft
> @@ -100,6 +100,11 @@
>             "https://gnu.org/licenses/agpl.html"
>             "https://gnu.org/licenses/why-affero-gpl.html"))
>  
> +(define asl1.1
> +  (license "ASL 1.1"
> +           "http://directory.fsf.org/wiki/License:Apache1.1"
> +           "https://www.gnu.org/licenses/license-list#apache1"))
> +
>  (define asl2.0
>    (license "ASL 2.0"
>             "http://directory.fsf.org/wiki/License:Apache2.0"
> -- 
> 2.7.3
> 

> Dear Guix,
> 
> I've added the Apache Software License 1.1 because I intend to submit a
> package that uses this license later.  The GNU licenses page says the
> following about it:
> 
> > This is a permissive non-copyleft free software license. It has a few
> > requirements that render it incompatible with the GNU GPL, such as
> > strong prohibitions on the use of Apache-related names.
> 
> Kind regards,
> Roel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-17  4:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-16  7:55 [PATCH] licenses: Add Apache Software License 1.1 Roel Janssen
2016-03-17  4:51 ` Leo Famulari

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.