JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45fadcfd39
nixpkgs/pkgs/development/interpreters/python/wrapper.nix

30 lines
817 B
Nix
Raw Normal View History

python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step The default setting for extraLibs used to be the set of modules that come with python by default but aren't usually enabled in our standard python derivation because they require additional libraries. This meant that users who want to *add* libraries to that set had to use a fairly complicated override, to add more entries without loosing the ones set by default. After this patch, the "standard libraries" such as "curses' are listed in stdLibs while the extraLibs argument remains empty by default. This allows users to override extraLibs without overriding the standard libraries. Furthermore, the wrapper environment can be messed around with in an additional 'postBuild' step. One nice application of this build step is to patch scripts and binaries to use the wrapped python interpreter instead of the pristine one, thereby enabling them to pick up all modules that have been configured. The following example shows how this is done for the 'pylint' utility: pkgs.python27Full.override { extraLibs = [pkgs.pylint]; postBuild = '' cd ${pkgs.pylint}/bin for i in *; do rm $out/bin/$i sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i chmod +x $out/bin/$i done; ''; };
2013-11-07 14:13:02 +00:00
{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? ""
, stdLibs ? stdenv.lib.attrValues python.modules
}:
python wrapper comment svn path=/nixpkgs/branches/stdenv-updates/; revision=32587
2012-02-26 17:23:22 +00:00
Re-implement python-wrapper with buildEnv. The new wrapper creates an environment that contains all files from Python and the extra libraries that have been specified. All files are found at run-time by means of the $PYTHONHOME variable; the wrapper no longer uses $PYTHONPATH.
2013-08-15 08:52:25 +01:00
# Create a python executable that knows about additional packages.
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
2010-08-16 18:03:35 +01:00
Re-implement python-wrapper with buildEnv. The new wrapper creates an environment that contains all files from Python and the extra libraries that have been specified. All files are found at run-time by means of the $PYTHONHOME variable; the wrapper no longer uses $PYTHONPATH.
2013-08-15 08:52:25 +01:00
(buildEnv {
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
2010-08-16 18:03:35 +01:00
name = "python-${python.version}-wrapper";
python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step The default setting for extraLibs used to be the set of modules that come with python by default but aren't usually enabled in our standard python derivation because they require additional libraries. This meant that users who want to *add* libraries to that set had to use a fairly complicated override, to add more entries without loosing the ones set by default. After this patch, the "standard libraries" such as "curses' are listed in stdLibs while the extraLibs argument remains empty by default. This allows users to override extraLibs without overriding the standard libraries. Furthermore, the wrapper environment can be messed around with in an additional 'postBuild' step. One nice application of this build step is to patch scripts and binaries to use the wrapped python interpreter instead of the pristine one, thereby enabling them to pick up all modules that have been configured. The following example shows how this is done for the 'pylint' utility: pkgs.python27Full.override { extraLibs = [pkgs.pylint]; postBuild = '' cd ${pkgs.pylint}/bin for i in *; do rm $out/bin/$i sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i chmod +x $out/bin/$i done; ''; };
2013-11-07 14:13:02 +00:00
paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ];
Re-implement python-wrapper with buildEnv. The new wrapper creates an environment that contains all files from Python and the extra libraries that have been specified. All files are found at run-time by means of the $PYTHONHOME variable; the wrapper no longer uses $PYTHONPATH.
2013-08-15 08:52:25 +01:00
ignoreCollisions = false;
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
2010-08-16 18:03:35 +01:00
Re-implement python-wrapper with buildEnv. The new wrapper creates an environment that contains all files from Python and the extra libraries that have been specified. All files are found at run-time by means of the $PYTHONHOME variable; the wrapper no longer uses $PYTHONPATH.
2013-08-15 08:52:25 +01:00
postBuild = ''
. "${makeWrapper}/nix-support/setup-hook"
python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment This patch means that adding 'matplotlib' to extraLibs will automatically include 'numpy', too, because matplotlib depends on it.
2013-11-07 12:59:44 +00:00
Fix pythonWrapper when all of the binaries come from python See discussion in #834 Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-03 20:25:43 +01:00
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
mkdir -p "$out/bin"
python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment This patch means that adding 'matplotlib' to extraLibs will automatically include 'numpy', too, because matplotlib depends on it.
2013-11-07 12:59:44 +00:00
Re-implement python-wrapper with buildEnv. The new wrapper creates an environment that contains all files from Python and the extra libraries that have been specified. All files are found at run-time by means of the $PYTHONHOME variable; the wrapper no longer uses $PYTHONPATH.
2013-08-15 08:52:25 +01:00
cd "${python}/bin"
for prg in *; do
rm -f "$out/bin/$prg"
makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
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
2010-08-16 18:03:35 +01:00
done
python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step The default setting for extraLibs used to be the set of modules that come with python by default but aren't usually enabled in our standard python derivation because they require additional libraries. This meant that users who want to *add* libraries to that set had to use a fairly complicated override, to add more entries without loosing the ones set by default. After this patch, the "standard libraries" such as "curses' are listed in stdLibs while the extraLibs argument remains empty by default. This allows users to override extraLibs without overriding the standard libraries. Furthermore, the wrapper environment can be messed around with in an additional 'postBuild' step. One nice application of this build step is to patch scripts and binaries to use the wrapped python interpreter instead of the pristine one, thereby enabling them to pick up all modules that have been configured. The following example shows how this is done for the 'pylint' utility: pkgs.python27Full.override { extraLibs = [pkgs.pylint]; postBuild = '' cd ${pkgs.pylint}/bin for i in *; do rm $out/bin/$i sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i chmod +x $out/bin/$i done; ''; };
2013-11-07 14:13:02 +00:00
'' + postBuild;
Re-implement python-wrapper with buildEnv. The new wrapper creates an environment that contains all files from Python and the extra libraries that have been specified. All files are found at run-time by means of the $PYTHONHOME variable; the wrapper no longer uses $PYTHONPATH.
2013-08-15 08:52:25 +01:00
}) // {
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
2010-08-16 18:03:35 +01:00
inherit python;
inherit (python) meta;
}
Reference in New Issue Copy Permalink