feat(pops.data): remove allData

tao3k · May 1, 2024 · 3f63bbf · 3f63bbf
1 parent a8fac43
commit 3f63bbf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 36 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/src/pops/allData.nix b/src/pops/allData.nix
diff --git a/src/pops/data.nix b/src/pops/data.nix
@@ -10,5 +10,12 @@ flops.haumea.pops.default.setInit {
     matchers.toml
     (matchers.nix loaders.scoped)
     (matchers.nix loaders.default)
+    (matchers.regex "^(.+)\\.(yaml|yml)$" (
+      _: inputs: path:
+      if inputs ? inputs && inputs.inputs ? nixpkgs then
+        root.ops.readYAML nixpkgs path
+      else
+        path
+    ))
   ];
 }
diff --git a/tests/data/expr.nix b/tests/data/expr.nix
@@ -7,7 +7,7 @@
 let
   inherit (omnibus.flake.inputs) nixpkgs;
 in
-(omnibus.pops.allData.addLoadExtender {
+(omnibus.pops.data.addLoadExtender {
   load = {
     src = ./__fixture;
     inputs = {

diff --git a/units/std/mkBlocks/data.nix b/units/std/mkBlocks/data.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ omnibus }: omnibus.pops.allData
+{ omnibus }: omnibus.pops.data