Author: chaoflow
Date: Sun Feb 26 17:23:16 2012
New Revision: 32585
URL: https://nixos.org/websvn/nix/?rev=32585&sc=1
Log:
add PSFL, update python meta (license, maintainers, unify description)
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.6/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.7/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.1/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.2/default.nix
nixpkgs/branches/stdenv-updates/pkgs/lib/licenses.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.6/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.6/default.nix
Sun Feb 26 17:23:13 2012 (r32584)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.6/default.nix
Sun Feb 26 17:23:16 2012 (r32585)
@@ -75,7 +75,7 @@
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 @@
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 ];
};
};
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.7/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.7/default.nix
Sun Feb 26 17:23:13 2012 (r32584)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/2.7/default.nix
Sun Feb 26 17:23:16 2012 (r32585)
@@ -89,7 +89,7 @@
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 @@
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 ];
};
};
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.1/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.1/default.nix
Sun Feb 26 17:23:13 2012 (r32584)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.1/default.nix
Sun Feb 26 17:23:16 2012 (r32585)
@@ -80,8 +80,9 @@
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 ];
};
+
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.2/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.2/default.nix
Sun Feb 26 17:23:13 2012 (r32584)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/python/3.2/default.nix
Sun Feb 26 17:23:16 2012 (r32585)
@@ -79,8 +79,8 @@
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 ];
};
}
Modified: nixpkgs/branches/stdenv-updates/pkgs/lib/licenses.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/lib/licenses.nix Sun Feb 26
17:23:13 2012 (r32584)
+++ nixpkgs/branches/stdenv-updates/pkgs/lib/licenses.nix Sun Feb 26
17:23:16 2012 (r32585)
@@ -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";
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
