libinput: fix docs & libinput command #51304
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'm fixing the red X. |
|
@GrahamcOfBorg build libinput |
libinput switched from Doxygen to Sphinx for user docs. Since Sphinx is a Python module, it propagates Python. And because it is listed in nativeBuildInputs, its python binary takes precedence over the one added in buildInputs. This results in a wrong interpreter being substituted into shebangs. The contamination occurred previously too but libinput does not use pyparsing dependency since 1.12.0, so it could be removed. I prevented Sphinx from propagating Python and added some additional dependencies to it. In the future we might want something more reusable. While at it, I also fixed the tests.
jtojnar
force-pushed
the
libinput-docs-fix
branch
from
d1108fb
to
27aed1b
Compare
|
@GrahamcOfBorg build libinput |
jtojnar
added a commit
to jtojnar/nixpkgs
that referenced
this pull request
Jul 15, 2020
Running subcommands like `libinput measure` requires python and some python modules. I previously added the dependencies in [1] but [2] accidentally moved them to checkInputs so they are not available at runtime by patchShebangs (especially since tests are disabled). Additionally, the tools were ported from evdev python module to python-libevdev in libinput 1.14, which was missed [3] during upgrade. Finally, other python modules are needed so let's add them as well. [1]: NixOS#51304 [2]: NixOS@de14f0c [3]: NixOS@b291f2a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
libinput switched from Doxygen to Sphinx for user docs. Since Sphinx is a Python
module, it propagates Python. And because it is listed in nativeBuildInputs,
its python binary takes precedence over the one added in buildInputs.
This results in a wrong interpreter being substituted into shebangs.
The contamination occurred previously too but libinput does not use pyparsing
dependency since 1.12.0, so it could be removed.
I prevented Sphinx from propagating Python and added some additional
dependencies to it. In the future we might want something more reusable.
While at it, I also fixed the tests.
Closes: #48252
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)cc @FRidh for sealing Python modules (sphinx)