diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index ae2f755ff9a..77b387dd302 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -603,7 +603,6 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. -* `setupPyDistFlags ? []`: List of flags passed to `setup.py` command. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix index 38f2f67bfcd..86c450fcf92 100644 --- a/pkgs/development/interpreters/python/build-python-package-pyproject.nix +++ b/pkgs/development/interpreters/python/build-python-package-pyproject.nix @@ -5,12 +5,10 @@ }: { -# passed to "python setup.py" - setupPyDistFlags ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 # Rename to `buildOptions` because it is not setuptools specific? -, setupPyBuildFlags ? [] + setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -18,14 +16,13 @@ , ... } @ attrs: let - installOptions = lib.concatMapStringsSep " " (option: "--install-option ${option}") setupPyDistFlags; options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags; in attrs // { buildPhase = attrs.buildPhase or '' runHook preBuild mkdir -p dist echo "Creating a wheel..." - ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${installOptions} ${options} . + ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} . echo "Finished creating a wheel..." runHook postBuild ''; @@ -53,4 +50,4 @@ in attrs // { ${postShellHook} ''; -} +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index ecb3fed6a04..4c66fdec5f6 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -5,11 +5,9 @@ }: { -# passed to "python setup.py" - setupPyDistFlags ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 -, setupPyBuildFlags ? [] + setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -21,16 +19,13 @@ let # pip does the same thing: https://github.com/pypa/pip/pull/3265 setuppy = ./run_setup.py; - setupPyDistFlagsString = lib.concatStringsSep " " setupPyDistFlags; - setupPyBuildExtString = lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags)); - in attrs // { # we copy nix_run_setup over so it's executed relative to the root of the source # many project make that assumption buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup - ${python.pythonForBuild.interpreter} nix_run_setup ${setupPyDistFlagsString} ${setupPyBuildExtString} bdist_wheel + ${python.pythonForBuild.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel runHook postBuild '';