python3Packages.home-assistant-chip-wheels: simplify dependency closu…

…re generation
NixOS · Dec 31, 2024 · cdbd087 · cdbd087
1 parent 9039a9a
commit cdbd087
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -223,26 +223,15 @@ stdenv.mkDerivation rec {
         wheel
         yapf
       ];
-      depListToAttrs =
-        list:
-        builtins.listToAttrs (
-          map (dep: {
-            name = dep.name;
-            value = dep;
-          }) (lib.filter (x: x != null) list)
-        );
-      saturateDependencies =
-        deps:
-        let
-          before = deps;
-          new = lib.mergeAttrsList (
-            map (dep: depListToAttrs (dep.propagatedBuildInputs or [ ])) (lib.attrValues before)
-          );
-          after = before // new;
-        in
-        if lib.attrNames before != lib.attrNames after then saturateDependencies after else before;
-      saturateDependencyList = list: lib.attrValues (saturateDependencies (depListToAttrs list));
-      saturatedDependencyList = lib.filter (drv: drv ? dist) (saturateDependencyList dependencies);
+      toItem = dep: {
+        inherit dep;
+        key = dep.name;
+      };
+      saturatedDependencies = lib.genericClosure {
+        startSet = map toItem dependencies;
+        operator = item: map toItem ((item.dep).propagatedBuildInputs or [ ]);
+      };
+      saturatedDependencyList = lib.filter (dep: dep ? dist) (map (item: item.dep) saturatedDependencies);
     in
     lib.concatMapStringsSep " " (dep: "file://${dep.dist}") saturatedDependencyList;