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

cq-editor: fix build #91489

Merged
merged 2 commits into from Jul 4, 2020
Merged

Conversation

marcus7070
Copy link
Member

Motivation for this change

Will close #91483 and do the spyder_3 half of #91484

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Unfortunately I can't get cq-editor working with Python 3.8, so I've set it to 3.7.

@jonringer, I see you added toml to pylint's nativeBuildInputs in 27f0dab. I think it needs to be propagated due to the errors in #91484 and https://github.com/PyCQA/pylint/blob/a73585740398052ccd6c67d33869d9049a27e8c7/pylint/__pkginfo__.py#L43 so I've done that in this PR. Is that OK?

@marcus7070
Copy link
Member Author

@jonringer, are you able to have a look at the pylint change?

@jonringer
Copy link
Contributor

@jonringer, I see you added toml to pylint's nativeBuildInputs in 27f0dab. I think it needs to be propagated due to the errors in #91484 and https://github.com/PyCQA/pylint/blob/a73585740398052ccd6c67d33869d9049a27e8c7/pylint/__pkginfo__.py#L43 so I've done that in this PR. Is that OK?

Yea, this is more correct.

Thought the toml package was needed just for reading a pyproject.toml or something during setup

@jonringer
Copy link
Contributor

this fixes two previously broken builds LGTM

@jonringer jonringer merged commit db1835a into NixOS:master Jul 4, 2020
@marcus7070 marcus7070 deleted the marcus7070/fix-cqeditor branch July 6, 2020 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cq-editor fails to build in nixpkgs-unstable
3 participants