Merge recent master into staging

Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
parent 20be024d1b 0c398f6040
commit 06fea81c6e
140 changed files with 5000 additions and 2572 deletions
@@ -59,6 +59,7 @@ in

  config = mkIf cfg.enable (mkMerge [
    { environment.systemPackages = [ pkgs.docker ];
+      users.extraGroups.docker.gid = config.ids.gids.docker;
    }
    (mkIf cfg.socketActivation {