Skip to content

Commit

Permalink
Run nixpkgs-fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
srid committed Jun 12, 2023
1 parent 0d8b40e commit 4b11792
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
outputs = _: {
flakeModule = ./nix/flake-module.nix;

templates.default = {
templates.default = {
description = "Example flake using process-compose-flake";
path = builtins.path { path = ./example; filter = path: _: baseNameOf path == "flake.nix"; };
};
Expand Down
6 changes: 3 additions & 3 deletions nix/process-compose/cli.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ config, lib, ... }:
{ config, lib, ... }:

let
let
inherit (lib) types mkOption;
in
in
{
options = {
port = mkOption {
Expand Down
6 changes: 3 additions & 3 deletions nix/process-compose/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ name, config, pkgs, lib, ... }:
{ name, config, pkgs, lib, ... }:

let
let
inherit (lib) types mkOption;
in
in
{
imports = [
./cli.nix
Expand Down
10 changes: 5 additions & 5 deletions nix/process-compose/settings/command.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ args:
lib.mkOption (args // {
type = lib.types.either lib.types.package lib.types.str;
apply = pkg:
if builtins.isString pkg
# process-compose is unreliable in handling environment variable, so let's
# wrap it in a bash script.
then lib.getExe (pkgs.writeShellApplication { inherit name; text = pkg; })
else lib.getExe pkg;
if builtins.isString pkg
# process-compose is unreliable in handling environment variable, so let's
# wrap it in a bash script.
then lib.getExe (pkgs.writeShellApplication { inherit name; text = pkg; })
else lib.getExe pkg;
})
8 changes: 4 additions & 4 deletions nix/process-compose/settings/environment.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ let
inherit (types) nullOr either listOf str attrsOf;
in
lib.mkOption {
type =
nullOr
type =
nullOr
(either (listOf str) (attrsOf str));
default = null;
example = { ABC="2221"; PRINT_ERR="111"; };
example = { ABC = "2221"; PRINT_ERR = "111"; };
description = ''
Attrset of environment variables.
List of strings is also allowed.
'';
apply = attrs:
if ! builtins.isAttrs attrs then attrs else
if ! builtins.isAttrs attrs then attrs else
lib.mapAttrsToList (name: value: "${name}=${value}") attrs;
}

0 comments on commit 4b11792

Please sign in to comment.