Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: e1efaad9324a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5f47c36752c1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 6, 2020

  1. pythonPackages.pipBuildHook: do not build in an isolated environment 

    When a PEP 517 project file is present, pip will not install
prerequisites in `site-packages`:

https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support

For the shell hook, this has the consequence that the generated
temporary directory that is added to PYTHONPATH does not contain
`site.py`. As a result, Python does not discover the Python
module. Thus when a user executes nix-shell in a project, they cannot
import the project's Python module.

This change adds the `--no-build-isolation` option to pip when
creating the editable environment, to correctly generate `site.py`,
even when a `pyproject.toml` is present.
    @danieldk
    danieldk committed Jun 6, 2020
    Copy the full SHA
    e2309df View commit details
    Browse the repository at this point in the history

  2. pythonPackages.setuptoolsBuildHook: do not build in an isolated envir… 

    …onment

When a PEP 517 project file is present, pip will not install
prerequisites in `site-packages`:

https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support

For the shell hook, this has the consequence that the generated
temporary directory that is added to PYTHONPATH does not contain
`site.py`. As a result, Python does not discover the Python
module. Thus when a user executes nix-shell in a project, they cannot
import the project's Python module.

This change adds the `--no-build-isolation` option to pip when
creating the editable environment, to correctly generate `site.py`,
even when a `pyproject.toml` is present.
    @danieldk
    danieldk committed Jun 6, 2020
    Copy the full SHA
    1e2b669 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge pull request #89607 from danieldk/pep-517-shellhook-fix 

    pythonPackages.pipBuildHook: do not build in an isolated environment
    @FRidh
    FRidh committed Jun 8, 2020
    Copy the full SHA
    5f47c36 View commit details
    Browse the repository at this point in the history