aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2016-10-16 14:02:12 +0300
committerIgor Pashev <pashev.igor@gmail.com>2016-10-16 14:02:12 +0300
commit04253856ed906130613d47a73f2eda95f77b0518 (patch)
tree0698f268c783f01c66463d170fba7219af69c676
parent2a1cb909dec7feb1fc6a3530bd9d70cd3de82884 (diff)
downloadnixsap-04253856ed906130613d47a73f2eda95f77b0518.tar.gz
jenkins: pick up only unique job files
-rw-r--r--modules/apps/jenkins/default.nix8
1 files 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;