factor out utils (#543)

Reviewed-on: fediversity/fediversity#543

deployment/check/common/data-model.nix

@@ -26,18 +26,8 @@ let
     httpBackend
     ;
   inherit (lib) mkOption types;
-  eval =
+  inherit (pkgs.callPackage ../../utils.nix { inherit inputs; }) evalModel;
-    module:
+  fediversity = evalModel (
-    (lib.evalModules {
-      specialArgs = {
-        inherit pkgs inputs;
-      };
-      modules = [
-        module
-        ../../data-model.nix
-      ];
-    }).config;
-  fediversity = eval (
     { config, ... }:
     {
       config = {

deployment/check/data-model-nixops4/nixosTest.nix

@@ -14,6 +14,7 @@
   sourceFileset = lib.fileset.unions [
     ../../data-model.nix
     ../../function.nix
+    ../../utils.nix
     ../common/data-model.nix
     ../common/data-model-options.nix
     ./constants.nix

deployment/data-model-test.nix

@@ -2,17 +2,7 @@ let
   inherit (import ../default.nix { }) pkgs inputs;
   inherit (pkgs) lib;
   inherit (lib) mkOption types;
-  eval =
+  inherit (pkgs.callPackage ./utils.nix { inherit inputs; }) evalModel;
-    module:
-    (lib.evalModules {
-      specialArgs = {
-        inherit pkgs inputs;
-      };
-      modules = [
-        module
-        ./data-model.nix
-      ];
-    }).config;
   inherit (inputs.nixops4.lib) mkDeployment;
 in
 {
@@ -30,7 +20,7 @@ in
     */
     expr =
       let
-        fediversity = eval (
+        fediversity = evalModel (
           { config, ... }:
           {
             config = {

deployment/data-model.nix

@@ -18,16 +18,7 @@ let
     str
     submodule
     ;
-  toBash =
+  inherit (pkgs.callPackage ./utils.nix { }) toBash;
-    v:
-    lib.replaceStrings [ "\"" ] [ "\\\"" ] (
-      if lib.isPath v || builtins.isNull v then
-        toString v
-      else if lib.isString v then
-        v
-      else
-        lib.strings.toJSON v
-    );
   withPackages = packages: {
     makeWrapperArgs = [
       "--prefix"

deployment/run/tf-setup.nix

@@ -5,17 +5,7 @@
   httpBackend,
 }:
 let
-  # FIXME factor out
+  inherit (pkgs.callPackage ../utils.nix { }) toBash;
-  toBash =
-    v:
-    lib.replaceStrings [ "\"" ] [ "\\\"" ] (
-      if lib.isPath v || builtins.isNull v then
-        toString v
-      else if lib.isString v then
-        v
-      else
-        lib.strings.toJSON v
-    );
 in
 pkgs.writeScriptBin "setup" ''
   set -e

deployment/utils.nix

@@ -0,0 +1,29 @@
+{
+  pkgs,
+  lib,
+  inputs ? null,
+  ...
+}:
+{
+  evalModel =
+    module:
+    (lib.evalModules {
+      specialArgs = {
+        inherit pkgs inputs;
+      };
+      modules = [
+        ./data-model.nix
+        module
+      ];
+    }).config;
+  toBash =
+    v:
+    lib.replaceStrings [ "\"" ] [ "\\\"" ] (
+      if lib.isPath v || builtins.isNull v then
+        toString v
+      else if lib.isString v then
+        v
+      else
+        lib.strings.toJSON v
+    );
+}