From aa122cbae78ce97d60c0c98ba14df753d97e40b1 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 30 Jan 2022 19:06:58 +0300 Subject: style: format entire depot with nixpkgs-fmt This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni Reviewed-by: lukegb Reviewed-by: wpcarro Reviewed-by: Profpatsch Reviewed-by: kanepyork Reviewed-by: tazjin Reviewed-by: cynthia Reviewed-by: edef Reviewed-by: eta Reviewed-by: grfn --- users/grfn/xanthous/server/default.nix | 3 +-- users/grfn/xanthous/server/docker.nix | 8 +++++--- users/grfn/xanthous/server/module.nix | 3 ++- users/grfn/xanthous/server/shell.nix | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'users/grfn/xanthous/server') diff --git a/users/grfn/xanthous/server/default.nix b/users/grfn/xanthous/server/default.nix index 0b3900e4d5fe..95c2b15ec95f 100644 --- a/users/grfn/xanthous/server/default.nix +++ b/users/grfn/xanthous/server/default.nix @@ -1,5 +1,4 @@ -args@{ - depot ? import ../../../.. {} +args@{ depot ? import ../../../.. { } , pkgs ? depot.third_party.nixpkgs , ... }: diff --git a/users/grfn/xanthous/server/docker.nix b/users/grfn/xanthous/server/docker.nix index a62943c2b077..09054cb00fcf 100644 --- a/users/grfn/xanthous/server/docker.nix +++ b/users/grfn/xanthous/server/docker.nix @@ -1,4 +1,4 @@ -{ depot ? import ../../../.. {} +{ depot ? import ../../../.. { } , pkgs ? depot.third_party.nixpkgs , ... }: @@ -6,14 +6,16 @@ let inherit (depot.users.grfn) xanthous; xanthous-server = xanthous.server; -in pkgs.dockerTools.buildLayeredImage { +in +pkgs.dockerTools.buildLayeredImage { name = "xanthous-server"; tag = "latest"; contents = [ xanthous xanthous-server ]; config = { Cmd = [ "${xanthous-server}/bin/xanthous-server" - "--xanthous-binary-path" "${xanthous}/bin/xanthous" + "--xanthous-binary-path" + "${xanthous}/bin/xanthous" ]; }; } diff --git a/users/grfn/xanthous/server/module.nix b/users/grfn/xanthous/server/module.nix index 73ac276caf4a..82de6e38e1af 100644 --- a/users/grfn/xanthous/server/module.nix +++ b/users/grfn/xanthous/server/module.nix @@ -2,7 +2,8 @@ let cfg = config.services.xanthous-server; -in { +in +{ options = with lib; { services.xanthous-server = { enable = mkEnableOption "xanthous server"; diff --git a/users/grfn/xanthous/server/shell.nix b/users/grfn/xanthous/server/shell.nix index a6747175f105..e01c0316a6b2 100644 --- a/users/grfn/xanthous/server/shell.nix +++ b/users/grfn/xanthous/server/shell.nix @@ -1,5 +1,5 @@ let - depot = import ../../../.. {}; + depot = import ../../../.. { }; pkgs = depot.third_party.nixpkgs; in -- cgit 1.4.1