Skip to content

Commit

Permalink
style(nix): alejandra .
Browse files Browse the repository at this point in the history
  • Loading branch information
justinrubek committed Oct 6, 2023
1 parent 0917eb4 commit 22ab04e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
lib,
...
}: {
imports = [ ];
imports = [];

perSystem = {
self',
Expand Down
2 changes: 1 addition & 1 deletion examples/flake-module/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
flake-parts,
pre-commit-hooks,
...
}@inputs:
} @ inputs:
flake-parts.lib.mkFlake {inherit self;} {
systems = ["x86_64-linux" "aarch64-linux"];
imports = [
Expand Down
2 changes: 1 addition & 1 deletion examples/lib/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
flake-parts,
pre-commit-hooks,
...
}@inputs:
} @ inputs:
flake-parts.lib.mkFlake {inherit self;} {
systems = ["x86_64-linux" "aarch64-linux"];
imports = [
Expand Down
11 changes: 5 additions & 6 deletions flake-parts/flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
};
};

config = let
config = let
# individual terraform configurations are stored in the `terraform/configuration` directory
# and are referenced by their name in the configuration directory
terraformConfigurationDirectory = cfg.configDirectory;
Expand Down Expand Up @@ -108,7 +108,7 @@
echo '${configurationJSON}' > $out/terraform-configuration-matrix.json
'';
};
in
in
lib.mkIf cfg.enable rec {
packages =
{
Expand Down Expand Up @@ -139,7 +139,6 @@
};
};
};

});
};
}
});
};
}
10 changes: 5 additions & 5 deletions lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
terranixModules ? [],
extraArgs ? {},
...
}@attrs: let
} @ attrs: let
# pass unused arguments to terranix
extraAttrs = builtins.removeAttrs attrs [ "path" "system" ];
extraAttrs = builtins.removeAttrs attrs ["path" "system"];

filterFileName = name: lib.strings.hasSuffix ".nix" name;

Expand Down Expand Up @@ -62,11 +62,11 @@
terranixModules ? [],
extraArgs ? {},
...
}@attrs: let
} @ attrs: let
# pass unused arguments to mkTerranixConfiguration
extraAttrs = builtins.removeAttrs attrs [ "name" "path" "pkgs" "system" ];
extraAttrs = builtins.removeAttrs attrs ["name" "path" "pkgs" "system"];

generatedConfig = self.lib.mkTerranixConfiguration {inherit path system terranixModules extraArgs; } // extraAttrs;
generatedConfig = self.lib.mkTerranixConfiguration {inherit path system terranixModules extraArgs;} // extraAttrs;
providedConfig = self.lib.mkTerraformConfiguration {inherit path;};
in
pkgs.runCommandNoCC "terraform-config-${name}" {} ''
Expand Down

0 comments on commit 22ab04e

Please sign in to comment.