dtc: fix Python support #69234
Merged
dtc: fix Python support #69234
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
|
@GrahamcOfBorg build python2Packages.libfdt python3Packages.libfdt ubootRock64 |
samueldr
approved these changes
Sep 22, 2019
jonringer
approved these changes
Sep 22, 2019
There was a problem hiding this comment.
nix-review passes on NixOS (1 marked broken on master)
diff LGTM
executables seem to work
[7 built, 37 copied (126.3 MiB), 42.8 MiB DL]
https://github.com/NixOS/nixpkgs/pull/69234
1 package are marked as broken and were skipped:
odroid-xu3-bootloader
5 package were build:
diffoscope dtc fwts python37Packages.libfdt ubootTools
|
|
||
| postPatch = '' | ||
| patchShebangs pylibfdt/ | ||
| ''; | ||
|
|
||
| makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ]; | ||
| makeFlags = [ "PYTHON=python" ]; | ||
| installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; |
There was a problem hiding this comment.
I know you didnt change it, but now would be the time
Suggested change
| installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; | |
| installFlags = [ "INSTALL=install" "PREFIX=${placeholder "out"}" "SETUP_PREFIX=${placeholder "out"}" ]; |
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
dtc switched from Python 2 to 3 by default with a patch release (1.5.0 -> 1.5.1), which broke
pythonPackages.libfdt. This fixes this issue, fixing the build of at leastubootRock64.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @dezgeg
cc @bjornfor because you merged the 1.5.1 update and dezgeg hasn't been working on Nix recently