From: Nikita Karetnikov <nikita@karetnikov.org>
To: bug-guix@gnu.org
Subject: [PATCH] licenses: Add 'psfl'.
Date: Mon, 14 Jan 2013 17:08:57 -0500 [thread overview]
Message-ID: <87ehhnfmcp.fsf@karetnikov.org> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 70 bytes --]
Hi,
This patch adds the Python Software Foundation License.
Nikita
[-- Attachment #1.2: 0001-licenses-Add-psfl.patch --]
[-- Type: text/x-diff, Size: 1546 bytes --]
From d881cc74046cf0597678f9e88d3d6ed33ff48e4f Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Mon, 14 Jan 2013 22:00:54 +0000
Subject: [PATCH] licenses: Add 'psfl'.
* guix/licenses.scm (psfl): New variable.
---
guix/licenses.scm | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index f934a7b..ad5e66d 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,7 +34,7 @@
lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
mpl2.0
openldap2.8 openssl
- public-domain
+ psfl public-domain
x11
zlib))
@@ -196,6 +196,11 @@ which may be a file:// URI pointing the package's tree."
"https://www.gnu.org/licenses/license-list#newOpenLDAP"))
;; lists OpenLDAPv2.7, which is virtually identical
+(define psfl
+ (license "PSFL"
+ "http://docs.python.org/license.html"
+ #f))
+
(define public-domain
(license "Public Domain"
"http://directory.fsf.org/wiki/License:PublicDomain"
--
1.7.5.4
[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]
next reply other threads:[~2013-01-14 22:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 22:08 Nikita Karetnikov [this message]
2013-01-15 9:15 ` [PATCH] licenses: Add 'psfl' Ludovic Courtès
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ehhnfmcp.fsf@karetnikov.org \
--to=nikita@karetnikov.org \
--cc=bug-guix@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 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).