From 17b90543200de887c28ecfdd353fa4d5f076b8c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 13 Nov 2019 12:25:52 +0100
Subject: Revert "nixos/syncthing: simple versioning"

Descriptions are missing for params and type, blocking channels
from advancing.

https://nix-cache.s3.amazonaws.com/log/nkclpxwm91qhw0v1jg5dvzzckb7zh23s-nixpkgs-metrics.drv

This reverts commit 69493cc67a7be9b7913ec5a69339995956fabc63.
---
 nixos/modules/services/networking/syncthing.nix | 54 -------------------------
 1 file changed, 54 deletions(-)

(limited to 'nixos/modules/services/networking/syncthing.nix')

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 96b90021a81..165fd5970cf 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -18,7 +18,6 @@ let
     fsWatcherEnabled = folder.watch;
     fsWatcherDelayS = folder.watchDelay;
     ignorePerms = folder.ignorePerms;
-    versioning = folder.versioning;
   }) (filterAttrs (
     _: folder:
     folder.enable
@@ -221,59 +220,6 @@ in {
                 '';
               };
 
-              versioning = mkOption {
-                default = null;
-                description = ''
-                  how to keep changed/deleted files with syncthing.
-                  there are 4 different types of versioning with different parameters
-                  see https://docs.syncthing.net/users/versioning.html#simple-file-versioning
-                '';
-                example = [
-                  {
-                    versioning = {
-                      type = "simple";
-                      params.keep = "10";
-                    };
-                  }
-                  {
-                    versioning = {
-                      type = "trashcan";
-                      params.cleanoutDays = "1000";
-                    };
-                  }
-                  {
-                    versioning = {
-                      type = "staggered";
-                      params = {
-                        cleanInterval = "3600";
-                        maxAge = "31536000";
-                        versionsPath = "/syncthing/backup";
-                      };
-                    };
-                  }
-                  {
-                    versioning = {
-                      type = "external";
-                      params.versionsPath = pkgs.writers.writeBash "backup" ''
-                        folderpath="$1"
-                        filepath="$2"
-                        rm -rf "$folderpath/$filepath"
-                      '';
-                    };
-                  }
-                ];
-                type = with types; nullOr (submodule {
-                  options = {
-                    type = mkOption {
-                      type = enum [ "external" "simple" "staggered" "trashcan" ];
-                    };
-                    params = mkOption {
-                      type = attrsOf (either str path);
-                    };
-                  };
-                });
-              };
-
               rescanInterval = mkOption {
                 type = types.int;
                 default = 3600;
-- 
cgit 1.4.1