Merge remote-tracking branch 'jared-w/master'
This commit is contained in:
commit
c914064c9b
3 changed files with 12 additions and 12 deletions
|
@ -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):
|
||||
build_inputs, prop_build_inputs = [], []
|
||||
if pkg.build_inputs is not None:
|
||||
build_inputs = pkg.build_inputs
|
||||
if pkg.prop_build_inputs is not None:
|
||||
prop_build_inputs = pkg.prop_build_inputs
|
||||
return build_inputs, prop_build_inputs
|
||||
|
||||
edges = set()
|
||||
for p in pkgs:
|
||||
build_inputs, prop_build_inputs = [], []
|
||||
if p.build_inputs is not None:
|
||||
build_inputs = p.build_inputs
|
||||
if p.prop_build_inputs is not None:
|
||||
prop_build_inputs = p.prop_build_inputs
|
||||
build_inputs, prop_build_inputs = get_build_inputs(p)
|
||||
for child in build_inputs + prop_build_inputs:
|
||||
edges.add((p.name, child))
|
||||
G = nx.DiGraph(sorted(list(edges)))
|
||||
|
@ -84,12 +88,7 @@ def remove_circles_and_print(pkgs: Iterable[ResolvedPkg], nixpkgs: NixpkgsIndex)
|
|||
if node_name in self.visited:
|
||||
return []
|
||||
self.visited.add(node_name)
|
||||
p = indexed_pkgs[node_name]
|
||||
build_inputs, prop_build_inputs = [], []
|
||||
if p.build_inputs is not None:
|
||||
build_inputs = p.build_inputs
|
||||
if p.prop_build_inputs is not None:
|
||||
prop_build_inputs = p.prop_build_inputs
|
||||
build_inputs, prop_build_inputs = get_build_inputs(indexed_pkgs[node_name])
|
||||
return list(set(build_inputs + prop_build_inputs))
|
||||
|
||||
for root in roots:
|
||||
|
|
|
@ -17,6 +17,7 @@ let
|
|||
systemMap = {
|
||||
x86_64-linux = "linux-64";
|
||||
x86_64-darwin = "osx-64";
|
||||
aarch64-darwin = "osx-arm64";
|
||||
aarch64-linux = "linux-aarch64";
|
||||
};
|
||||
|
||||
|
|
|
@ -179,7 +179,7 @@ rec {
|
|||
file = "${compileExpression args}/share/mach_nix_file.nix";
|
||||
result = import file { inherit (args) pkgs python; };
|
||||
manylinux =
|
||||
if args.pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
if builtins.elem args.pkgs.stdenv.hostPlatform.system [ "x86_64-darwin" "aarch64-darwin" ] then
|
||||
[]
|
||||
else
|
||||
args.pkgs.pythonManylinuxPackages.manylinux1;
|
||||
|
|
Loading…
Reference in a new issue