Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python-packages: Set pythonPackages attr in pythonPackages scope #61139

Merged
merged 1 commit into from May 8, 2019
Merged

python-packages: Set pythonPackages attr in pythonPackages scope #61139

merged 1 commit into from May 8, 2019

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented May 8, 2019 •
edited

Motivation for this change

If we don't set this we are mixing python versions in the same package.
Any package called from python-packages.nix using pythonPackages directly as an argument is currently wrong.

Before:

nix-repl> python3Packages.bugseverywhere.buildInputs
[ «derivation /nix/store/csd0d2j3vgl5dnag6afi5q92xb64rv7z-python2.7-Jinja2-2.10.1.drv» «derivation /nix/store/gsj389hprxlr8a39b0ccszagirirf1lv-python2.7-cherrypy-17.4.1.drv» «derivation /nix/store/ysmd4wdkbi9gd6bw2ha92hwrd2k2xlnh-python2.7-bootstrapped-pip-19.0.3.drv» ]

After:

nix-repl> python3Packages.bugseverywhere.buildInputs
[ «derivation /nix/store/m0mfx1i98ciby8mx8xjva98kinhqkj6r-python3.7-Jinja2-2.10.1.drv» «derivation /nix/store/2gqd0sbiwqmin2814ja83pnyal8pq86a-python3.7-cherrypy-18.1.1.drv» «derivation /nix/store/0rq8n7xq2ksxiq2y2d844i9516p0rd41-python3.7-bootstrapped-pip-19.0.3.drv» ]
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@adisbladis adisbladis requested a review from FRidh May 8, 2019 12:02
@adisbladis
python-packages: Set pythonPackages attr in pythonPackages scope
160261b 
If we don't set this we are mixing python versions in the same package.
Any package called from `python-packages.nix` using `pythonPackages` directly as an argument is currently wrong.

Before:
```
nix-repl> python3Packages.bugseverywhere.buildInputs
[ «derivation /nix/store/csd0d2j3vgl5dnag6afi5q92xb64rv7z-python2.7-Jinja2-2.10.1.drv» «derivation /nix/store/gsj389hprxlr8a39b0ccszagirirf1lv-python2.7-cherrypy-17.4.1.drv» «derivation /nix/store/ysmd4wdkbi9gd6bw2ha92hwrd2k2xlnh-python2.7-bootstrapped-pip-19.0.3.drv» ]
```

After:
```
nix-repl> python3Packages.bugseverywhere.buildInputs
[ «derivation /nix/store/m0mfx1i98ciby8mx8xjva98kinhqkj6r-python3.7-Jinja2-2.10.1.drv» «derivation /nix/store/2gqd0sbiwqmin2814ja83pnyal8pq86a-python3.7-cherrypy-18.1.1.drv» «derivation /nix/store/0rq8n7xq2ksxiq2y2d844i9516p0rd41-python3.7-bootstrapped-pip-19.0.3.drv» ]
```
@adisbladis adisbladis added the 9.needs: port to stable A PR needs a backport to the stable release. label May 8, 2019
@adisbladis adisbladis mentioned this pull request May 8, 2019
Closed
10 tasks
@FRidh
Copy link
Member

FRidh commented May 8, 2019

Any package called from python-packages.nix using pythonPackages directly as an argument is currently wrong.

In python-packages.nix we state that functions that are called need to explicitly state their dependencies, and not be pythonPackages, so the problem should not occur. Did you encounter this in Nixpkgs or in any of your own expressions? In any case, there's no harm in setting this so I'm fine with it.

@adisbladis
Copy link
Member Author

In python-packages.nix we state that functions that are called need to explicitly state their > > dependencies, and not be pythonPackages, so the pråoblem should not occur. Did you encounter this in Nixpkgs or in any of your own expressions? In any case, there's no harm in setting this so I'm fine with it.

Plenty of expressions are using pythonPackages. See the example.

@adisbladis adisbladis merged commit 3e1fdfc into NixOS:master May 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@adisbladis @FRidh