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

flake: fix evaluation

Browse Source
This commit is contained in:
Jörg Thalheim 2023-07-13 11:29:07 +02:00
parent 93ebc92c9e
commit 6d22fd0c35
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@ -37,7 +37,12 @@
outputs = inputs@{ flake-parts, ... }: outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: { flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: {
systems = lib.systems.flakeExposed; systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
imports = [ imports = [
inputs.treefmt-nix.flakeModule inputs.treefmt-nix.flakeModule
./targets/flake-module.nix ./targets/flake-module.nix
@ -49,11 +54,8 @@
programs.terraform.enable = true; programs.terraform.enable = true;
programs.nixpkgs-fmt.enable = true; programs.nixpkgs-fmt.enable = true;
}; };
packages.actions-runner = pkgs.callPackage ./pkgs/actions-runner.nix { packages = {
inherit inputs; default = pkgs.mkShell {
};
packages.gitea = pkgs.callPackage ./pkgs/gitea {};
packages.default = pkgs.mkShell {
packages = [ packages = [
pkgs.bashInteractive pkgs.bashInteractive
pkgs.sops pkgs.sops
@ -67,6 +69,12 @@
])) ]))
]; ];
}; };
} // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
gitea = pkgs.callPackage ./pkgs/gitea { };
actions-runner = pkgs.callPackage ./pkgs/actions-runner.nix {
inherit inputs;
};
};
}; };
}); });
} }