summary refs log tree commit diff
path: root/nixos/modules/services/continuous-integration
diff options
context:
space:
mode:
authorMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2017-05-22 11:44:22 +0100
committerMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2017-05-22 12:01:27 +0100
commitcb5cb0bf9572337339c468b7a28fd01885b4a827 (patch)
treee4c73ab9c40310cbe6b100a0af6721cdc97175f8 /nixos/modules/services/continuous-integration
parent777d5ee7323e6dfdd17939d1ea14be9c700fe5c8 (diff)
downloadnixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.tar
nixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.tar.gz
nixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.tar.bz2
nixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.tar.lz
nixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.tar.xz
nixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.tar.zst
nixlib-cb5cb0bf9572337339c468b7a28fd01885b4a827.zip
services.jenkins.plugins: fix initial case
Diffstat (limited to 'nixos/modules/services/continuous-integration')
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index a480937417da..11adf74b9ed5 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -103,7 +103,7 @@ in {
 
       plugins = mkOption {
         default = null;
-        #type = types.nullOr (types.attrsOf types.package);
+        type = types.nullOr (types.attrsOf types.package);
         description = ''
           A set of plugins to activate. Note that this will completely
           remove and replace any previously installed plugins. If you
@@ -175,7 +175,7 @@ in {
                       (n: v: "cp ${v} ${cfg.home}/plugins/${n}.hpi")
                       cfg.plugins;
                 in ''
-                  rm -r ${cfg.home}/plugins
+                  rm -r ${cfg.home}/plugins || true
                   mkdir -p ${cfg.home}/plugins
                   ${lib.strings.concatStringsSep "\n" pluginCmds}
                 '';