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

buildPythonPackage: get rid of setupPyInstallFlags since there is no such thing

Browse Source
This commit is contained in:
Domen Kožar 2015-11-18 17:56:26 +01:00
parent ec0f58b459
commit a912c45ee2
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/language-support.xml
View File

@ -382,13 +382,6 @@ twisted = buildPythonPackage {
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>setupPyInstallFlags</varname></term>
<listitem><para>
List of flags passed to <command>setup.py install</command> command.
</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>setupPyBuildFlags</varname></term> <term><varname>setupPyBuildFlags</varname></term>
<listitem><para> <listitem><para>

4
pkgs/applications/office/zim/default.nix
View File

@ -24,7 +24,7 @@ buildPythonPackage rec {
export HOME="/tmp/home" export HOME="/tmp/home"
''; '';
setupPyInstallFlags = ["--skip-xdg-cmd"]; setupPyBuildFlags = ["--skip-xdg-cmd"];
# #
# Exactly identical to buildPythonPackage's version but for the # Exactly identical to buildPythonPackage's version but for the
@ -57,7 +57,7 @@ buildPythonPackage rec {
${python}/bin/${python.executable} setup.py install \ ${python}/bin/${python.executable} setup.py install \
--install-lib=$out/lib/${python.libPrefix}/site-packages \ --install-lib=$out/lib/${python.libPrefix}/site-packages \
--prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} --prefix="$out" ${lib.concatStringsSep " " setupPyBuildFlags}
eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
if [ -e "$eapth" ]; then if [ -e "$eapth" ]; then

2
pkgs/development/python-modules/generic/default.nix
View File

@ -95,7 +95,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
pushd dist pushd dist
${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache
popd popd
runHook postInstall runHook postInstall

1
pkgs/development/python-modules/tables/default.nix
View File

@ -20,7 +20,6 @@ buildPythonPackage rec {
"--lzo=${lzo}" "--lzo=${lzo}"
"--bzip2=${bzip2}" "--bzip2=${bzip2}"
]; ];
setupPyInstallFlags = setupPyBuildFlags;
# Run the test suite. # Run the test suite.
# It requires the build path to be in the python search path. # It requires the build path to be in the python search path.

4
pkgs/tools/virtualization/cloud-init/default.nix
View File

@ -3,7 +3,7 @@
let version = "0.7.6"; let version = "0.7.6";
in pythonPackages.buildPythonPackage rec { in pythonPackages.buildPythonPackage rec {
name = "cloud-init-0.7.6"; name = "cloud-init-${version}";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
@ -23,7 +23,7 @@ in pythonPackages.buildPythonPackage rec {
pythonPath = with pythonPackages; [ cheetah jinja2 prettytable pythonPath = with pythonPackages; [ cheetah jinja2 prettytable
oauth pyserial configobj pyyaml argparse requests jsonpatch ]; oauth pyserial configobj pyyaml argparse requests jsonpatch ];
setupPyInstallFlags = ["--init-system systemd"]; # TODO: --init-system systemd
meta = { meta = {
homepage = http://cloudinit.readthedocs.org; homepage = http://cloudinit.readthedocs.org;