Merge pull request 'feat(flake): make systems overridable' (#1893) from zimbatm/clan-core:overridable-flake-systems into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1893
This commit is contained in:
Mic92
2024-08-15 20:53:44 +00:00
2 changed files with 24 additions and 6 deletions

16
flake.lock generated
View File

@@ -84,6 +84,7 @@
"nixos-images": "nixos-images", "nixos-images": "nixos-images",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
}, },
@@ -108,6 +109,21 @@
"type": "github" "type": "github"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@@ -14,12 +14,18 @@
nixos-images.inputs.nixos-stable.follows = ""; nixos-images.inputs.nixos-stable.follows = "";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
systems.url = "github:nix-systems/default";
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = outputs =
inputs@{ flake-parts, self, ... }: inputs@{
flake-parts,
self,
systems,
...
}:
flake-parts.lib.mkFlake { inherit inputs; } ( flake-parts.lib.mkFlake { inherit inputs; } (
{ ... }: { ... }:
{ {
@@ -27,11 +33,7 @@
meta.name = "clan-core"; meta.name = "clan-core";
directory = self; directory = self;
}; };
systems = [ systems = import systems;
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
];
imports = [ imports = [
./checks/flake-module.nix ./checks/flake-module.nix
./clanModules/flake-module.nix ./clanModules/flake-module.nix