clan/clan-infra
10
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'more simplications' (#75) from Mic92-flake-parts-refactoring into main
All checks were successful
build / test (push) Successful in 7s
Details

Browse Source
This commit is contained in:
clan-bot 2023-08-08 12:08:05 +00:00
commit 2efb141b9c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -32,7 +32,7 @@
}; };
outputs = inputs@{ flake-parts, ... }: outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: { flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -44,7 +44,7 @@
./modules/flake-module.nix ./modules/flake-module.nix
./pkgs/flake-module.nix ./pkgs/flake-module.nix
]; ];
perSystem = { ... }: { perSystem = {
treefmt = { treefmt = {
projectRootFile = "flake.nix"; projectRootFile = "flake.nix";
programs.terraform.enable = true; programs.terraform.enable = true;
@ -57,5 +57,5 @@
]; ];
}; };
}; };
}); };
} }

2
pkgs/flake-module.nix
View File

@ -1,4 +1,4 @@
{ ... }: { {
imports = [ imports = [
./clan-merge/flake-module.nix ./clan-merge/flake-module.nix
]; ];