diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-02-26 17:23:16 +0000 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-02-26 17:23:16 +0000 |
| commit | 8e32380a79eba3c55bdc97e3f0296f08a3d49d0e (patch) | |
| tree | b51e82536f5e2a0ee9bff39f8621a7dd8986bec7 /pkgs/development/interpreters/python | |
| parent | 59d4678e8319320b9b5ccd304b1034188c02ae61 (diff) | |
| download | nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.tar nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.tar.gz nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.tar.bz2 nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.tar.lz nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.tar.xz nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.tar.zst nixlib-8e32380a79eba3c55bdc97e3f0296f08a3d49d0e.zip | |
add PSFL, update python meta (license, maintainers, unify description)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
Diffstat (limited to 'pkgs/development/interpreters/python')
4 files changed, 11 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 ]; }; } |