From 8e32380a79eba3c55bdc97e3f0296f08a3d49d0e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 26 Feb 2012 17:23:16 +0000
Subject: [PATCH] add PSFL, update python meta (license, maintainers, unify
 description)

svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
---
 pkgs/development/interpreters/python/2.6/default.nix | 6 +++---
 pkgs/development/interpreters/python/2.7/default.nix | 6 +++---
 pkgs/development/interpreters/python/3.1/default.nix | 5 +++--
 pkgs/development/interpreters/python/3.2/default.nix | 4 ++--
 pkgs/lib/licenses.nix                                | 6 ++++++
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 4a3c292412f1..3ae16d26d614 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -75,7 +75,7 @@ let
 
     meta = {
       homepage = "http://python.org";
-      description = "Python -- a high-level dynamically-typed programming language";
+      description = "a high-level dynamically-typed programming language";
       longDescription = ''
         Python is a remarkably powerful dynamic programming language that
         is used in a wide variety of application domains. Some of its key
@@ -85,9 +85,9 @@ let
         hierarchical packages; exception-based error handling; and very
         high level dynamic data types.
       '';
-      license = "GPLv2";
+      license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.simons ];
+      maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
     };
   };
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 635d50dc5b3e..968a4859aed7 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -89,7 +89,7 @@ let
 
     meta = {
       homepage = "http://python.org";
-      description = "Python -- a high-level dynamically-typed programming language";
+      description = "a high-level dynamically-typed programming language";
       longDescription = ''
         Python is a remarkably powerful dynamic programming language that
         is used in a wide variety of application domains. Some of its key
@@ -99,9 +99,9 @@ let
         hierarchical packages; exception-based error handling; and very
         high level dynamic data types.
       '';
-      license = "GPLv2";
+      license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.simons ];
+      maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
     };
   };
 
diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix
index e0c8ac0e1c3a..892af52a9197 100644
--- a/pkgs/development/interpreters/python/3.1/default.nix
+++ b/pkgs/development/interpreters/python/3.1/default.nix
@@ -80,8 +80,9 @@ stdenv.mkDerivation {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = "GPLv2";
+    license = stdenv.lib.licenses.psfl;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
   };
+
 }
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index c0c2a6e422af..1ab115f04696 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -79,8 +79,8 @@ stdenv.mkDerivation {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = "GPLv2";
+    license = stdenv.lib.licenses.psfl;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
   };
 }
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index edfa057be7be..dc88f887cc79 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -165,6 +165,12 @@
     fullname = "Public Domain";
   };
   
+  psfl = {
+    shortName = "PSFL";
+    fullName = "Python Software Foundation License";
+    url = http://docs.python.org/license.html;
+  };
+
   proprietary = {
     shortName = "Proprietary";
     fullName = "Proprietary (non redistributable) license";