unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] licenses: Add 'psfl'.
@ 2013-01-14 22:08 Nikita Karetnikov
  2013-01-15  9:15 ` Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Nikita Karetnikov @ 2013-01-14 22:08 UTC (permalink / raw)
  To: bug-guix


[-- 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 --]

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

* Re: [PATCH] licenses: Add 'psfl'.
  2013-01-14 22:08 [PATCH] licenses: Add 'psfl' Nikita Karetnikov
@ 2013-01-15  9:15 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2013-01-15  9:15 UTC (permalink / raw)
  To: Nikita Karetnikov; +Cc: bug-guix

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> 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.

Applied, thanks.

Ludo'.c

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

end of thread, other threads:[~2013-01-15  9:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-14 22:08 [PATCH] licenses: Add 'psfl' Nikita Karetnikov
2013-01-15  9:15 ` 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).