add exec/target constraints parameters to python toolchain macro #169
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
aherrmann
approved these changes
Nov 23, 2021
nixpkgs/nixpkgs.bzl
Outdated
Comment on lines
893
to
895
| os = {"darwin": "osx"}.get(cpu, "linux") | ||
|
|
||
| if repository_ctx.attr.target_constraints == None and repository_ctx.attr.exec_constraints == None: | ||
| target_constraints = ["@platforms//cpu:x86_64"] | ||
| target_constraints.append("@platforms//os:{}".format(os)) | ||
| exec_constraints = target_constraints | ||
| else: | ||
| target_constraints = list(repository_ctx.attr.target_constraints) | ||
| exec_constraints = list(repository_ctx.attr.exec_constraints) | ||
|
|
||
| exec_constraints.append("@io_tweag_rules_nixpkgs//nixpkgs/constraints:support_nix") | ||
|
|
There was a problem hiding this comment.
This is the same as in nixpkgs_cc_configure, correct? Could you factor this out into a function?
nixpkgs/nixpkgs.bzl
Outdated
| @@ -890,6 +890,18 @@ def nixpkgs_cc_configure_deprecated( | |||
|
|
|||
| def _nixpkgs_python_toolchain_impl(repository_ctx): | |||
| cpu = get_cpu_value(repository_ctx) | |||
| os = {"darwin": "osx"}.get(cpu, "linux") | |||
|
|
|||
| if repository_ctx.attr.target_constraints == None and repository_ctx.attr.exec_constraints == None: | |||
There was a problem hiding this comment.
You can use if not variable and not other_variable to cover uscases of empty strings and null-like values.
There was a problem hiding this comment.
empty list is not valid for specification by the consumer?
There was a problem hiding this comment.
This is just a soft-ball comment, Starlark is Pythonesque and I think it is generally a bad smell to use == None in Python .
tek
force-pushed
the
tek/python-platforms
branch
5 times, most recently
from
7f08c41
to
dc4683a
Compare
tek
force-pushed
the
tek/python-platforms
branch
from
dc4683a
to
ef8f547
Compare
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.
just copied the code from the CC toolchain, works fine