fix: flake-parts.sql requiredInputs check

tao3k · Oct 12, 2023 · 0674ef4 · 0674ef4
1 parent d6101dd
commit 0674ef4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/lib/errors/requiredInputs.nix b/lib/errors/requiredInputs.nix
@@ -33,7 +33,7 @@ in
 assert lib.assertMsg fondInputs ''
   please, add the these inputs into
 
-      omnibus.${unit}.addLoadExtender {
+      omnibus.pops.${unit}.addLoadExtender {
         load.inputs =
          inputs = {
            ${msg}
@@ -44,7 +44,7 @@ assert lib.assertMsg fondInputs ''
 '';
 assert lib.assertMsg noSysNixpkgs ''
   please, add the following inputs into
-      omnibus.lib.addLoadExtender {
+      omnibus.pops.${unit}.addLoadExtender {
         load.inputs = {
           nixpkgs = inputs.nixpkgs.legacyPackages.''${system} or (import inputs.nixpkgs.path);
         };

diff --git a/tests/flake-parts/expr.nix b/tests/flake-parts/expr.nix
@@ -7,7 +7,7 @@
 }:
 let
   system = "x86_64-linux";
-  inputs' =
+  __inputs__ =
     let
       loadInputs = omnibus.pops.loadInputs.setInitInputs ./__lock;
     in
@@ -27,27 +27,26 @@ let
     (omnibus.pops.flake-parts.loadProfiles.addLoadExtender {
       load = {
         inputs = {
-          inherit (inputs') nixpkgs;
           inputs = {
-            inherit (inputs') chinookDb;
+            inherit (__inputs__) chinookDb;
           };
         };
       };
     }).layouts.default.process-compose;
 
   mkFlake =
-    inputs'.flake-parts.lib.mkFlake
+    __inputs__.flake-parts.lib.mkFlake
       {
-        inputs = inputs' // {
+        inputs = __inputs__ // {
           # fake self argument to make sure that the flake is
           self = inputs.self;
         };
       }
       {
         systems = [ system ];
-        imports = [ inputs'.process-compose-flake.flakeModule ];
+        imports = [ __inputs__.process-compose-flake.flakeModule ];
         perSystem =
-          { selfModule', ... }: { imports = [ flakePartsProfiles.sqlite-example ]; };
+          { self', ... }: { imports = [ flakePartsProfiles.sqlite-example ]; };
       };
 in
 lib.mapAttrs (_: builtins.unsafeDiscardStringContext) {

diff --git a/units/devshell/profiles/rust.nix b/units/devshell/profiles/rust.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit
-    (omnibus.lib.errors.requiredInputs inputs "devshellProfiles" [
+    (omnibus.lib.errors.requiredInputs inputs "devshell.loadProfiles" [
       "nixpkgs"
       "fenix"
     ])

diff --git a/units/flake-parts/profiles/process-compose/sqlite-example.nix b/units/flake-parts/profiles/process-compose/sqlite-example.nix
@@ -1,4 +1,17 @@
+{
+  inputs,
+  omnibus,
+  lib,
+  pkgs,
+}:
 let
+  inherit
+    (omnibus.lib.errors.requiredInputs inputs "pops.flake-parts.loadProfiles" [
+      "chinookDb"
+    ])
+    chinookDb
+  ;
+
   port = 8213;
   dataFile = "data.sqlite";
 in
@@ -23,7 +36,7 @@ in
           echo "$(date): Importing Chinook database (${dataFile}) ..."
           ${
             lib.getExe pkgs.sqlite
-          } "${dataFile}" < ${inputs.chinookDb}/ChinookDatabase/DataSources/Chinook_Sqlite.sql
+          } "${dataFile}" < ${chinookDb}/ChinookDatabase/DataSources/Chinook_Sqlite.sql
           echo "$(date): Done."
         '';