From 04253856ed906130613d47a73f2eda95f77b0518 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sun, 16 Oct 2016 14:02:12 +0300 Subject: jenkins: pick up only unique job files --- modules/apps/jenkins/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/apps/jenkins/default.nix b/modules/apps/jenkins/default.nix index a5edb4b..754186a 100644 --- a/modules/apps/jenkins/default.nix +++ b/modules/apps/jenkins/default.nix @@ -6,9 +6,9 @@ let attrNames isBool isString ; inherit (lib) - concatMapStringsSep concatStringsSep escape filterAttrs - foldAttrs foldl hasPrefix mapAttrs mapAttrsToList mkOption nameValuePair - optionalString ; + concatMapStringsSep concatStringsSep escape filterAttrs foldAttrs foldl + hasPrefix mapAttrs mapAttrsToList mkOption nameValuePair optionalString + unique ; inherit (lib.types) attrsOf submodule ; @@ -27,7 +27,7 @@ let # This requires read-write mode of evaluation: keys = n: i: import (pkgs.xinclude2nix ( (mapAttrsToList (_: f: f) (configFiles n i)) - ++ (mapAttrsToList (_: f: f) (jobFiles n i)) + ++ (unique (mapAttrsToList (_: f: f) (jobFiles n i))) )); ik = mapAttrsToList (n: i: { "${i.user}" = keys n i; } ) instances; in foldAttrs (l: r: l ++ r) [] ik; -- cgit v1.2.3