Merge pull request 'checks.schema: fix for systems other than x86' (#142) from DavHau-clan-config into main
This commit is contained in:
@@ -11,11 +11,16 @@ let
|
|||||||
clanLib = self.lib;
|
clanLib = self.lib;
|
||||||
clanModules = self.clanModules;
|
clanModules = self.clanModules;
|
||||||
|
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
perSystem = { pkgs, ... }:
|
||||||
|
let
|
||||||
baseModule = {
|
baseModule = {
|
||||||
imports =
|
imports =
|
||||||
(import (inputs.nixpkgs + "/nixos/modules/module-list.nix"))
|
(import (inputs.nixpkgs + "/nixos/modules/module-list.nix"))
|
||||||
++ [{
|
++ [{
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
nixpkgs.hostPlatform = pkgs.system;
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -27,12 +32,11 @@ let
|
|||||||
in
|
in
|
||||||
evaled.options.clan.networking;
|
evaled.options.clan.networking;
|
||||||
|
|
||||||
clanModuleSchemas = mapAttrs (_: module: clanLib.jsonschema.parseOptions (optionsFromModule module)) clanModules;
|
clanModuleSchemas =
|
||||||
|
mapAttrs
|
||||||
|
(_: module: clanLib.jsonschema.parseOptions (optionsFromModule module))
|
||||||
|
clanModules;
|
||||||
|
|
||||||
in
|
|
||||||
{
|
|
||||||
perSystem = { pkgs, ... }:
|
|
||||||
let
|
|
||||||
mkTest = name: schema: pkgs.runCommand "schema-${name}" { } ''
|
mkTest = name: schema: pkgs.runCommand "schema-${name}" { } ''
|
||||||
${pkgs.check-jsonschema}/bin/check-jsonschema \
|
${pkgs.check-jsonschema}/bin/check-jsonschema \
|
||||||
--check-metaschema ${toFile "schema-${name}" (toJSON schema)}
|
--check-metaschema ${toFile "schema-${name}" (toJSON schema)}
|
||||||
|
|||||||
Reference in New Issue
Block a user