diff --git a/doc/language-support.xml b/doc/language-support.xml index 0a0e24e9abfd..b4f3276265ad 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -382,13 +382,6 @@ twisted = buildPythonPackage { - - setupPyInstallFlags - - List of flags passed to setup.py install command. - - - setupPyBuildFlags diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 84a5680b1f40..96749c665b66 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -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 diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index cb2d67c61eba..acdcc7233cdb 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -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 diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index f1551f41ae53..3dcf00e9b8ce 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -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. diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 48eb68242e1e..acdeda812982 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -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;