fix: mapAttrs' can't deal with null

srid · Oct 11, 2024 · 040b4db · 040b4db
1 parent 4c9a3c5
commit 040b4db
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/nix/modules/flake-parts/autowire.nix b/nix/modules/flake-parts/autowire.nix
@@ -2,11 +2,20 @@
 {
   config =
     let
+      # Combine mapAttrs' and filterAttrs
+      #
+      # f can return null if the attribute should be filtered out.
+      mapAttrsMaybe = f: attrs:
+        lib.pipe attrs [
+          (lib.mapAttrsToList f)
+          (builtins.filter (x: x != null))
+          builtins.listToAttrs
+        ];
       forAllNixFiles = dir: f:
         if builtins.pathExists dir then
           lib.pipe dir [
             builtins.readDir
-            (lib.mapAttrs' (fn: type:
+            (mapAttrsMaybe (fn: type:
               if type == "regular" then
                 let name = lib.removeSuffix ".nix" fn; in
                 lib.nameValuePair name (f "${dir}/${fn}")