chore: update

tao3k · Jan 2, 2024 · 2befbbe · 2befbbe
1 parent 14c2382
commit 2befbbe
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -0,0 +1,20 @@
+name: update-flake-lock
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+      - name: Enable magic Nix cache
+        uses: DeterminateSystems/magic-nix-cache-action@main
+      - name: Check flake
+        uses: DeterminateSystems/flake-checker-action@main
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@main
diff --git a/flake.lock b/flake.lock
diff --git a/src/haumea/nixosModules.nix b/src/haumea/nixosModules.nix
@@ -25,20 +25,8 @@ let
       f
     ];
 
-  callModuleLazily =
-    inputs: path:
-    let
-      importer = l.scopedImport inputs;
-      f = toFunction (importer path);
-    in
-    lazyArgsPerParameter f inputs;
-
-  callModuleLazily' =
-    inputs: path: importer:
-    let
-      f = toFunction (importer path);
-    in
-    lazyArgsPerParameter f inputs;
+  callModuleLazily = haumea.lib.loaders.scoped;
+  callModuleLazily' = haumea.lib.loaders.default;
 
   removeFileSuffix = l.removeSuffix ".nix";
   removeDefault = l.removeSuffix "/default";
@@ -134,7 +122,7 @@ let
                             if (l.isFunction v) then
                               lazyArgsPerParameter v (moduleArgs // extraArgs)
                             else if (l.isPath v) then
-                              callModuleLazily' (moduleArgs // extraArgs) v import
+                              callModuleLazily' (moduleArgs // extraArgs) v
                             else
                               v
                           ;