From 22b0bfae7579393e90efb4f70184b291f92ee801 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Sat, 23 Nov 2024 22:11:40 +0100
Subject: [PATCH] [misc] add helper to import contract

---
 modules/contracts/default.nix | 10 +++++++++-
 modules/contracts/secret.nix  | 12 ++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/contracts/default.nix b/modules/contracts/default.nix
index 911279a..46140d4 100644
--- a/modules/contracts/default.nix
+++ b/modules/contracts/default.nix
@@ -35,6 +35,14 @@ let
         };
       };
     };
+
+  importContract = module:
+    let
+      importedModule = pkgs.callPackage module {};
+    in
+      mkContractFunctions {
+        inherit (importedModule) mkRequest mkResult;
+      };
 in
 {
   inherit mkContractFunctions;
@@ -42,7 +50,7 @@ in
   databasebackup = import ./databasebackup.nix { inherit lib; };
   backup = import ./backup.nix { inherit lib; };
   mount = import ./mount.nix { inherit lib; };
-  secret = import ./secret.nix { inherit pkgs lib; };
+  secret = importContract ./secret.nix;
   ssl = import ./ssl.nix { inherit lib; };
   test = {
     secret = import ./secret/test.nix { inherit pkgs lib; };
diff --git a/modules/contracts/secret.nix b/modules/contracts/secret.nix
index 49ab678..ef3ac6c 100644
--- a/modules/contracts/secret.nix
+++ b/modules/contracts/secret.nix
@@ -1,10 +1,9 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
 let
   inherit (lib) concatStringsSep literalMD mkOption optionalAttrs optionalString;
-  inherit (lib.types) anything listOf submodule str;
-
-  contractsLib = import ./default.nix { inherit pkgs lib; };
-
+  inherit (lib.types) listOf submodule str;
+in
+{
   mkRequest =
     { mode ? "0400",
       owner ? "root",
@@ -109,7 +108,4 @@ let
         path = pathText;
       };
     });
-in
-contractsLib.mkContractFunctions {
-  inherit mkRequest mkResult;
 }