flake: fix evaluation

This commit is contained in:
Jörg Thalheim 2023-07-13 11:29:07 +02:00
parent 93ebc92c9e
commit 6d22fd0c35

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,23 +54,26 @@
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 = [
packages.gitea = pkgs.callPackage ./pkgs/gitea {}; pkgs.bashInteractive
packages.default = pkgs.mkShell { pkgs.sops
packages = [ (pkgs.terraform.withPlugins (p: [
pkgs.bashInteractive p.namecheap
pkgs.sops p.netlify
(pkgs.terraform.withPlugins (p: [ p.hcloud
p.namecheap p.null
p.netlify p.external
p.hcloud p.local
p.null ]))
p.external ];
p.local };
])) } // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
]; gitea = pkgs.callPackage ./pkgs/gitea { };
actions-runner = pkgs.callPackage ./pkgs/actions-runner.nix {
inherit inputs;
};
}; };
}; };
}); });