From 5f4891e228c1981ebdb7b79c541db596abc07989 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 31 May 2022 20:58:23 +0200 Subject: [PATCH] packages: apply system filter to checks --- packages/default.nix | 11 +++++++---- packages/system-filter.nix | 9 +++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/default.nix b/packages/default.nix index 0bc6591..52a7b07 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -7,10 +7,13 @@ let // patched-inputs // projects.packages; filters = import ./system-filter.nix; + doFilter = filterSet: pkgSet: pkgs.lib.filterAttrs (name: _: + filterSet ? "${name}" -> builtins.elem system filterSet."${name}" + ) pkgSet; in { - packages = pkgs.lib.filterAttrs (name: _: - filters ? "${name}" -> builtins.elem system filters."${name}" - ) all; + packages = doFilter filters.packages all; - inherit (projects) devShells checks; + checks = doFilter filters.checks projects.checks; + + inherit (projects) devShells; } diff --git a/packages/system-filter.nix b/packages/system-filter.nix index 6b5b61b..0fb100e 100644 --- a/packages/system-filter.nix +++ b/packages/system-filter.nix @@ -1,4 +1,9 @@ { - ghost = [ "x86_64-linux" ]; - uptime-kuma = [ "x86_64-linux" ]; + packages = { + ghost = [ "x86_64-linux" ]; + uptime-kuma = [ "x86_64-linux" ]; + }; + checks = { + keycloak = [ "x86_64-linux" ]; + }; }