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

@@ -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 ];
     };
   };
 

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 ];
     };
   };
 

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 ];
   };
+
 }

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 ];
   };
 }

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";