home

commit d6652963ee2e21709349cb035637ecb5bcdf95f2
parent ebe8f2c3d90ffe2c48a41c76c02fd4c979f57b68
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed,  6 May 2020 07:54:43 +0200

virtualization.buildkit: nixpkgs-fmt and fix pkg

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
modules/virtualisation/buildkit.nixos.nix
 | 
71
++++++++++++++++++++++++++++++++++-------------------------------------

1 file changed, 34 insertions(+), 37 deletions(-)
diff --git a/modules/virtualisation/buildkit.nixos.nix b/modules/virtualisation/buildkit.nixos.nix
@@ -1,11 +1,8 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-
 let
-
   cfg = config.virtualisation.buildkitd;
-
 in
 {
   ###### interface
@@ -13,31 +10,29 @@ in
   options.virtualisation.buildkitd = {
     enable =
       mkOption {
-      type = types.bool;
-      default = false;
-      description =
-      ''
-        This option enables buildkitd
-      '';
-    };
+        type = types.bool;
+        default = false;
+        description =
+          ''
+            This option enables buildkitd
+          '';
+      };
 
     listenOptions =
       mkOption {
-      type = types.listOf types.str;
-      default = ["/run/buildkitd/buildkitd.sock"];
-      description =
-      ''
-        A list of unix and tcp buildkitd should listen to. The format follows
-        ListenStream as described in systemd.socket(5).
-      '';
-    };
-
-
+        type = types.listOf types.str;
+        default = [ "/run/buildkitd/buildkitd.sock" ];
+        description =
+          ''
+            A list of unix and tcp buildkitd should listen to. The format follows
+            ListenStream as described in systemd.socket(5).
+          '';
+      };
 
     package = mkOption {
-      default = pkgs.buildkitd;
+      default = pkgs.buildkit;
       type = types.package;
-      example = pkgs.buildkitd;
+      example = pkgs.buildkit;
       description = ''
         Buildkitd package to be used in the module
       '';
@@ -51,25 +46,26 @@ in
 
     extraOptions =
       mkOption {
-      type = types.separatedString " ";
-      default = "";
-      description =
-      ''
-        The extra command-line options to pass to
-        <command>buildkitd</command> daemon.
-      '';
-    };
+        type = types.separatedString " ";
+        default = "";
+        description =
+          ''
+            The extra command-line options to pass to
+            <command>buildkitd</command> daemon.
+          '';
+      };
   };
 
   ###### implementation
 
   config = mkIf cfg.enable {
     users.groups = [
-      { name = "buildkit";
+      {
+        name = "buildkit";
         gid = 350;
       }
     ];
-    environment.systemPackages = [ cfg.package];
+    environment.systemPackages = [ cfg.package ];
     systemd.packages = [ cfg.package ];
 
     systemd.services.buildkitd = {
@@ -79,12 +75,13 @@ in
       serviceConfig = {
         ExecStart = [
           ""
-        ''
-        ${cfg.package}/bin/buildkitd \
-          ${cfg.extraOptions}
-        ''];
+          ''
+            ${cfg.package}/bin/buildkitd \
+              ${cfg.extraOptions}
+          ''
+        ];
       };
-      path = [cfg.package] ++ cfg.packages;
+      path = [ cfg.package ] ++ cfg.packages;
     };