mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 22:51:22 +00:00
buildPythonPackage: get rid of setupPyInstallFlags since there is no such thing
This commit is contained in:
parent
ec0f58b459
commit
a912c45ee2
@ -382,13 +382,6 @@ twisted = buildPythonPackage {
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>setupPyInstallFlags</varname></term>
|
||||
<listitem><para>
|
||||
List of flags passed to <command>setup.py install</command> command.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>setupPyBuildFlags</varname></term>
|
||||
<listitem><para>
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
export HOME="/tmp/home"
|
||||
'';
|
||||
|
||||
setupPyInstallFlags = ["--skip-xdg-cmd"];
|
||||
setupPyBuildFlags = ["--skip-xdg-cmd"];
|
||||
|
||||
#
|
||||
# Exactly identical to buildPythonPackage's version but for the
|
||||
@ -57,7 +57,7 @@ buildPythonPackage rec {
|
||||
|
||||
${python}/bin/${python.executable} setup.py install \
|
||||
--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
|
||||
if [ -e "$eapth" ]; then
|
||||
|
@ -95,7 +95,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
|
||||
|
||||
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
|
||||
|
||||
runHook postInstall
|
||||
|
@ -20,7 +20,6 @@ buildPythonPackage rec {
|
||||
"--lzo=${lzo}"
|
||||
"--bzip2=${bzip2}"
|
||||
];
|
||||
setupPyInstallFlags = setupPyBuildFlags;
|
||||
|
||||
# Run the test suite.
|
||||
# It requires the build path to be in the python search path.
|
||||
|
@ -3,7 +3,7 @@
|
||||
let version = "0.7.6";
|
||||
|
||||
in pythonPackages.buildPythonPackage rec {
|
||||
name = "cloud-init-0.7.6";
|
||||
name = "cloud-init-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
@ -23,7 +23,7 @@ in pythonPackages.buildPythonPackage rec {
|
||||
pythonPath = with pythonPackages; [ cheetah jinja2 prettytable
|
||||
oauth pyserial configobj pyyaml argparse requests jsonpatch ];
|
||||
|
||||
setupPyInstallFlags = ["--init-system systemd"];
|
||||
# TODO: --init-system systemd
|
||||
|
||||
meta = {
|
||||
homepage = http://cloudinit.readthedocs.org;
|
||||
|
Loading…
Reference in New Issue
Block a user