From 467ba9cafdfd297bc5657eb361b489a0f6413976 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 26 Feb 2018 22:30:28 +0100
Subject: [PATCH] qsyncthingtray: remove deprecated option

(cherry picked from commit b47cc4bc66c918416418644282042fcec06b8823)
---
 modules/misc/news.nix          | 11 -----------
 modules/services/syncthing.nix |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index abac83238..97db99cf9 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -479,17 +479,6 @@ in
         '';
       }
 
-      {
-        time = "2018-01-25T11:35:08+00:00";
-        condition = options.services.qsyncthingtray.enable.isDefined;
-        message = ''
-          'services.qsyncthingtray' has been merged into 'services.syncthing'.
-          Please, use 'services.syncthing.tray' option to activate the tray service.
-
-          The old module will be removed on February 25, 2018.
-        '';
-      }
-
       {
         time = "2018-02-02T11:15:00+00:00";
         message = ''
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 5acf313f8..8d52943e1 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -3,12 +3,6 @@
 with lib;
 
 {
-  imports = [
-    (mkRenamedOptionModule
-      [ "services" "qsyncthingtray" "enable" ]
-      [ "services" "syncthing" "tray" ])
-  ];
-
   meta.maintainers = [ maintainers.rycee ];
 
   options = {