From 8e49f65f24ddc8bccc47f5667ff9da35b35cd65a Mon Sep 17 00:00:00 2001 From: Johannes Rosenberger Date: Mon, 29 Jul 2019 17:59:02 +0200 Subject: [PATCH] vdirsyncer: allow option userName, disallow userNameCommand 1. account option `userName` is now allowed by `programs.vdirsyncer` 2. The commented out account option `userNameCommand` was required to be set by `programs.vdirsyncer` (e.g. as `null`). It is now disallowed (commented out) by vdirsyncer. --- modules/programs/vdirsyncer.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/programs/vdirsyncer.nix b/modules/programs/vdirsyncer.nix index f8df5764b..bdbf93ebc 100644 --- a/modules/programs/vdirsyncer.nix +++ b/modules/programs/vdirsyncer.nix @@ -36,7 +36,8 @@ let ((getAttrs [ "type" "url" - "userNameCommand" + "userName" + #"userNameCommand" "passwordCommand" ] a.remote) // (if a.vdirsyncer == null