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

Add aarch64-darwin to the system map for conda channels. Fix darwin manylinux logic. Fix deptree NoneType + NoneType #400

Merged
merged 2 commits into from
Feb 14, 2022

Conversation

hazelweakly
Copy link
Contributor

Adds some aarch64-darwin compatibility fixes that I ran into on our own code.

The deptree thing would result in an error like #396

   ....

  File "/nix/store/585x19x0hkzvnd6nai6ag5hpnl8zajh1-jrpk0l8ad8wrak6yhgfmraddnpia4vpd-source/mach_nix/deptree.py", line 78, in name
    if indexed_pkgs[node_name].build_inputs + indexed_pkgs[node_name].prop_build_inputs == []:
TypeError: unsupported operand type(s) for +: 'NoneType' and 'NoneType'

Fixes #396

Let's see if this also fixes the odd conda errors in CI.

@@ -45,13 +45,17 @@ def remove_circles_and_print(pkgs: Iterable[ResolvedPkg], nixpkgs: NixpkgsIndex)
indexed_pkgs = {p.name: p for p in sorted(pkgs, key=lambda p: p.name)}
roots: Iterable[ResolvedPkg] = sorted([p for p in pkgs if p.is_root], key=lambda p: p.name)

def get_build_inputs(pkg: ResolvedPkg):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just the simplest possible abstraction of existing code that was already duplicating this logic in a few places. Some of the PRs open by @tomprince have a much more thorough reworking of this file, so I tried to only touch it the minimum required to fix the NoneType + NoneType error

@DavHau DavHau merged commit c914064 into DavHau:master Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Traceback when trying to build package
2 participants