setcap-wrapper: Merging with upstream master and resolving conflicts

2017-01-25 11:08:05 -08:00
parent 1f9494b752 104c3db659
commit bae00e8aa8
4612 changed files with 200748 additions and 124553 deletions
@@ -100,6 +100,7 @@ in

      extraConfig = mkOption {
        default = "";
+        type = types.lines;
        description = ''
          <filename>munin-node.conf</filename> extra configuration. See
          <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />