Added "python-$version-wrapper" expression.

The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194

pkgs/development/interpreters/python/2.4/default.nix

@@ -15,6 +15,8 @@ in
 
 stdenv.mkDerivation {
   name = "python-2.4.6";
+  majorVersion = "2.4";
+  version = "2.4.6";
 
   src = fetchurl {
     url = http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tar.bz2;

pkgs/development/interpreters/python/2.5/default.nix

@@ -39,6 +39,8 @@ in
 
 stdenv.mkDerivation ( {
   name = "python-2.5.4";
+  majorVersion = "2.5";
+  version = "2.5.4";
 
   src = fetchurl {
     url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2;

pkgs/development/interpreters/python/2.6/default.nix

@@ -47,6 +47,7 @@ in
 
 stdenv.mkDerivation ( {
   name = "python-${version}";
+  inherit majorVersion version;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";

pkgs/development/interpreters/python/2.7/default.nix

@@ -47,6 +47,7 @@ in
 
 stdenv.mkDerivation ( {
   name = "python-${version}";
+  inherit majorVersion version;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";

pkgs/development/interpreters/python/3.1/default.nix

@@ -49,6 +49,7 @@ in
 
 stdenv.mkDerivation ( {
   name = "python3-${version}";
+  inherit majorVersion version;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";

pkgs/development/interpreters/python/wrapper.nix

@@ -0,0 +1,19 @@
+{stdenv, python, makeWrapper, extraLibs ? []}:
+
+stdenv.mkDerivation {
+  name = "python-${python.version}-wrapper";
+
+  propagatedBuildInputs = [python makeWrapper] ++ extraLibs;
+
+  unpackPhase = "true";
+  installPhase = ''
+    ensureDir "$out/bin"
+    declare -p
+    for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
+      makeWrapper "$python/bin/$prg" "$out/bin/$prg" --set PYTHONPATH "$PYTHONPATH"
+    done
+  '';
+
+  inherit python;
+  inherit (python) meta;
+}

pkgs/top-level/all-packages.nix

@@ -2081,6 +2081,8 @@ let
   pythonBase = python26Base;
   pythonFull = python26Full;
 
+  pythonWrapper = callPackage ../development/interpreters/python/wrapper.nix { };
+
   python24 = callPackage ../development/interpreters/python/2.4 { };
 
   python25Base = makeOverridable (import ../development/interpreters/python/2.5) {