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.

Sign up for GitHub

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

pythonPackages.entrypoints: Fix buildInputs #39449

Merged
merged 2 commits into from Apr 24, 2018
Merged

pythonPackages.entrypoints: Fix buildInputs #39449

merged 2 commits into from Apr 24, 2018

Conversation

timokau
Copy link
Member

@timokau timokau commented Apr 24, 2018

Motivation for this change

Using lib.optional implicitly wraps the value in a list, resulting in propagatedBuildInputs = [[configparser]].

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@timokau timokau requested a review from FRidh as a code owner April 24, 2018 22:31
@oxij
Copy link
Member

oxij commented Apr 24, 2018

LGTM, but I would've removed the [ ] instead.

@Mic92 Mic92 merged commit b75b5cd into NixOS:master Apr 24, 2018
@Mic92
Copy link
Member

Mic92 commented Apr 24, 2018

backport required?

@timokau
Copy link
Member Author

timokau commented Apr 24, 2018

LGTM, but I would've removed the [ ] instead

I prefer optionals for the same reason I would add braces to a single-line if statement: its easier to extend. But it doesn't really matter.

backport required?

I don't know. I only noticed this because I was applying a recursive function to propagatedBuildInputs and it complained that it got a list when it expected a derivation. I didn't notice anything functional, maybe nix can deal with lists in buildInputs?

@timokau timokau deleted the entrypoints-syntax branch April 24, 2018 23:58
@FRidh
Copy link
Member

FRidh commented Apr 25, 2018

I didn't notice anything functional, maybe nix can deal with lists in buildInputs?

stdenv.mkDerivation handles lists in lists, but the Python function requiredPythonModules cannot.

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 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@timokau @oxij @Mic92 @FRidh @GrahamcOfBorg