* [PATCH] licenses: Add 'bsd-style', 'expat', 'gpl1', 'gpl1+', 'lgpl2.0', and 'lgpl2.0+'.
@ 2012-12-12 5:52 Nikita Karetnikov
2012-12-12 13:40 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Nikita Karetnikov @ 2012-12-12 5:52 UTC (permalink / raw
To: bug-guix
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0001-licenses-Add-bsd-style-expat-gpl1-gpl1-lgpl2.0-and-l.patch --]
[-- Type: text/x-diff, Size: 2976 bytes --]
From d06bfdf01e5b59d3ce377b8634919c889a39c9e2 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Wed, 12 Dec 2012 05:41:53 +0000
Subject: [PATCH] licenses: Add 'bsd-style', 'expat', 'gpl1', 'gpl1+',
'lgpl2.0', and 'lgpl2.0+'.
* guix/licenses.scm (bsd-style, expat, gpl1, gpl1+)
(lgpl2.0, lgpl2.0+): New variables.
---
guix/licenses.scm | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 9c1b724..5284f8c 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -22,14 +22,15 @@
#:export (license? license-name license-uri license-comment
asl2.0
boost1.0
- bsd-2 bsd-3 bsd-4
+ bsd-2 bsd-3 bsd-4 bsd-style
cddl1.0
cpl1.0
epl1.0
- gpl2 gpl2+ gpl3 gpl3+
+ expat
+ gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
ijg
ibmpl1.0
- lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
+ lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
mpl2.0
openssl
public-domain
@@ -78,6 +79,14 @@
"http://directory.fsf.org/wiki/License:BSD_4Clause"
"https://www.gnu.org/licenses/license-list#OriginalBSD"))
+(define* (bsd-style uri #:optional (comment ""))
+ (license "BSD-style"
+ uri
+ (string-append
+ "This is a BSD-style, non-copyleft free software license. "
+ "Check the URI for details. "
+ comment)))
+
(define cddl1.0
(license "CDDL 1.0"
"http://directory.fsf.org/wiki/License:CDDLv1.0"
@@ -93,6 +102,21 @@
"http://directory.fsf.org/wiki/License:EPLv1.0"
"https://www.gnu.org/licenses/license-list#EPL"))
+(define expat
+ (license "Expat"
+ "http://directory.fsf.org/wiki/License:Expat"
+ "https://www.gnu.org/licenses/license-list.html#Expat"))
+
+(define gpl1
+ (license "GPL 1"
+ "https://www.gnu.org/licenses/old-licenses/gpl-1.0.html"
+ #f))
+
+(define gpl1+
+ (license "GPL 1+"
+ "https://www.gnu.org/licenses/old-licenses/gpl-1.0.html"
+ #f))
+
(define gpl2
(license "GPL 2"
"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
@@ -123,6 +147,16 @@
"http://directory.fsf.org/wiki/License:IBMPLv1.0"
"https://www.gnu.org/licenses/license-list#IBMPL"))
+(define lgpl2.0
+ (license "LGPL 2.0"
+ "https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html"
+ "https://www.gnu.org/licenses/why-not-lgpl.html"))
+
+(define lgpl2.0+
+ (license "LGPL 2.0+"
+ "https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html"
+ "https://www.gnu.org/licenses/why-not-lgpl.html"))
+
(define lgpl2.1
(license "LGPL 2.1"
"https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] licenses: Add 'bsd-style', 'expat', 'gpl1', 'gpl1+', 'lgpl2.0', and 'lgpl2.0+'.
2012-12-12 5:52 [PATCH] licenses: Add 'bsd-style', 'expat', 'gpl1', 'gpl1+', 'lgpl2.0', and 'lgpl2.0+' Nikita Karetnikov
@ 2012-12-12 13:40 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2012-12-12 13:40 UTC (permalink / raw
To: Nikita Karetnikov; +Cc: bug-guix
Nikita Karetnikov <nikita.karetnikov@gmail.com> skribis:
> From d06bfdf01e5b59d3ce377b8634919c889a39c9e2 Mon Sep 17 00:00:00 2001
> From: Nikita Karetnikov <nikita@karetnikov.org>
> Date: Wed, 12 Dec 2012 05:41:53 +0000
> Subject: [PATCH] licenses: Add 'bsd-style', 'expat', 'gpl1', 'gpl1+',
> 'lgpl2.0', and 'lgpl2.0+'.
>
> * guix/licenses.scm (bsd-style, expat, gpl1, gpl1+)
> (lgpl2.0, lgpl2.0+): New variables.
Thanks, applied with the addition of a docstring.
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-12 13:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-12 5:52 [PATCH] licenses: Add 'bsd-style', 'expat', 'gpl1', 'gpl1+', 'lgpl2.0', and 'lgpl2.0+' Nikita Karetnikov
2012-12-12 13:40 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).