public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add PSFL, update python meta (license, maintainers, unify description)

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
This commit is contained in:
Florian Friesdorf 2012-02-26 17:23:16 +00:00
parent 59d4678e83
commit 8e32380a79
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -75,7 +75,7 @@ let
meta = { meta = {
homepage = "http://python.org"; homepage = "http://python.org";
description = "Python -- a high-level dynamically-typed programming language"; description = "a high-level dynamically-typed programming language";
longDescription = '' longDescription = ''
Python is a remarkably powerful dynamic programming language that Python is a remarkably powerful dynamic programming language that
is used in a wide variety of application domains. Some of its key 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 hierarchical packages; exception-based error handling; and very
high level dynamic data types. high level dynamic data types.
''; '';
license = "GPLv2"; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
}; };
}; };

6
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -89,7 +89,7 @@ let
meta = { meta = {
homepage = "http://python.org"; homepage = "http://python.org";
description = "Python -- a high-level dynamically-typed programming language"; description = "a high-level dynamically-typed programming language";
longDescription = '' longDescription = ''
Python is a remarkably powerful dynamic programming language that Python is a remarkably powerful dynamic programming language that
is used in a wide variety of application domains. Some of its key 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 hierarchical packages; exception-based error handling; and very
high level dynamic data types. high level dynamic data types.
''; '';
license = "GPLv2"; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
}; };
}; };

5
pkgs/development/interpreters/python/3.1/default.nix
View File

@ -80,8 +80,9 @@ stdenv.mkDerivation {
hierarchical packages; exception-based error handling; and very hierarchical packages; exception-based error handling; and very
high level dynamic data types. high level dynamic data types.
''; '';
license = "GPLv2"; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
}; };
} }

4
pkgs/development/interpreters/python/3.2/default.nix
View File

@ -79,8 +79,8 @@ stdenv.mkDerivation {
hierarchical packages; exception-based error handling; and very hierarchical packages; exception-based error handling; and very
high level dynamic data types. high level dynamic data types.
''; '';
license = "GPLv2"; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
}; };
} }

6
pkgs/lib/licenses.nix
View File

@ -165,6 +165,12 @@
fullname = "Public Domain"; fullname = "Public Domain";
}; };
psfl = {
shortName = "PSFL";
fullName = "Python Software Foundation License";
url = http://docs.python.org/license.html;
};
proprietary = { proprietary = {
shortName = "Proprietary"; shortName = "Proprietary";
fullName = "Proprietary (non redistributable) license"; fullName = "Proprietary (non redistributable) license";