refactor: use findTargets for lib.dev

divnix · Sep 15, 2023 · 37eed5c · 37eed5c
1 parent e9a5684
commit 37eed5c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 37 deletions.
diff --git a/src/lib/dev.nix b/src/lib/dev.nix
diff --git a/src/lib/dev/default.nix b/src/lib/dev/default.nix
@@ -0,0 +1,7 @@
+let
+  inherit (inputs.std) findTargets;
+in
+  findTargets {
+    inherit inputs cell;
+    block = ./.;
+  }
diff --git a/src/lib/dev/mkArion.nix b/src/lib/dev/mkArion.nix
@@ -1,8 +1,11 @@
 {
   inputs,
-  l,
+  cell,
 }: let
-  inherit (inputs) arion nixpkgs;
+  inherit (inputs.cells.std.errors) requireInput;
+  inherit (requireInput "makes" "github:fluidattacks/makes" "std.lib.dev.mkMakes") arion nixpkgs;
+
+  inherit (nixpkgs) lib;
 
   disabledNotice = ''
     divnix/std disabled arion's nixos instrumentation.
@@ -29,9 +32,9 @@
       (arion + /src/nix/service/nixos-init.nix)
     ];
     imports = [
-      (l.mkRemovedOptionModule ["nixos" "configuration"] disabledNotice)
-      (l.mkRemovedOptionModule ["nixos" "build"] disabledNotice)
-      (l.mkRemovedOptionModule ["nixos" "evaluatedConfig"] disabledNotice)
+      (lib.mkRemovedOptionModule ["nixos" "configuration"] disabledNotice)
+      (lib.mkRemovedOptionModule ["nixos" "build"] disabledNotice)
+      (lib.mkRemovedOptionModule ["nixos" "evaluatedConfig"] disabledNotice)
     ];
   };
 in

diff --git a/src/lib/dev/mkMakes.nix b/src/lib/dev/mkMakes.nix
@@ -1,11 +1,13 @@
 {
-  l,
   inputs,
+  cell,
 }: let
-  inherit (inputs) nixpkgs makes;
+  inherit (inputs.cells.std.errors) requireInput;
+  inherit (requireInput "makes" "github:fluidattacks/makes" "std.lib.dev.mkMakes") nixpkgs makes;
+  inherit (nixpkgs) lib;
 
-  makes' = l.fix (
-    l.extends
+  makes' = lib.fix (
+    lib.extends
     (
       _: _: {
         inherit inputs;
@@ -20,4 +22,4 @@
     .__unfix__
   );
 in
-  l.customisation.callPackageWith makes'
+  lib.customisation.callPackageWith makes'
diff --git a/src/lib/dev/mkNixago.nix b/src/lib/dev/mkNixago.nix
@@ -2,7 +2,8 @@
   inputs,
   cell,
 }: let
-  inherit (inputs) dmerge nixago;
+  inherit (inputs.cells.std.errors) requireInput;
+  inherit (requireInput "nixago" "github:nix-community/nixago" "std.lib.dev.mkNixago") dmerge nixago;
 
   l = inputs.nixpkgs.lib // builtins;
 in

diff --git a/src/lib/dev/mkShell.nix b/src/lib/dev/mkShell.nix
@@ -2,7 +2,9 @@
   inputs,
   cell,
 }: let
-  inherit (inputs) devshell nixago;
+  inherit (inputs.cells.std.errors) requireInput;
+
+  inherit (requireInput "devshell" "github:numtide/devshell" "std.lib.dev.mkShell") devshell nixago;
 
   l = inputs.nixpkgs.lib // builtins;
 in