syncthing,qsyncthingtray: remove syncthing-inotify

syncthing-inotify is replaced by the new syncthing "fswatcher" feature.

4 files changed, 1 insertions, 62 deletions

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 763435da564d..88628c63c9ce 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null
 , qtbase, qtwebengine, qtwebkit
 , cmake
-, syncthing, syncthing-inotify ? null
+, syncthing
 , preferQWebView ? false
 , preferNative   ? true }:
 
@@ -34,7 +34,6 @@ mkDerivation rec {
     ${lib.optionalString stdenv.isLinux ''
       substituteInPlace includes/platforms/linux/posixUtils.hpp \
         --replace '"/usr/local/bin/syncthing"'         '"${syncthing}/bin/syncthing"' \
-        --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \
         --replace '"pgrep -x'                          '"${procps}/bin/pgrep -x'
     ''}
 
diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix
deleted file mode 100644
index e5e554db67b8..000000000000
--- a/pkgs/applications/networking/syncthing/inotify-deps.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
-  {
-    goPackagePath = "github.com/syncthing/syncthing";
-    fetch = {
-      type = "git";
-      url = "https://github.com/syncthing/syncthing";
-      rev = "d0061c172caecd3baf61f3ff720f56fdb805186e";
-      sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
-      sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
-    };
-  }
-]
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
deleted file mode 100644
index e33501a17158..000000000000
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  name = "syncthing-inotify-${version}";
-  version = "0.8.6";
-
-  goPackagePath = "github.com/syncthing/syncthing-inotify";
-
-  src = fetchFromGitHub {
-    owner  = "syncthing";
-    repo   = "syncthing-inotify";
-    rev    = "v${version}";
-    sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl";
-  };
-
-  goDeps = ./inotify-deps.nix;
-
-  postInstall = ''
-    mkdir -p $bin/lib/systemd/{system,user}
-
-    substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \
-               $bin/lib/systemd/system/syncthing-inotify@.service \
-               --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
-
-    substitute $src/etc/linux-systemd/user/syncthing-inotify.service \
-               $bin/lib/systemd/user/syncthing-inotify.service \
-               --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/syncthing/syncthing-inotify;
-    description = "File watcher intended for use with Syncthing";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ joko peterhoeg ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a537468db5a..b91dc7535dfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17525,8 +17525,6 @@ with pkgs;
 
   syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { };
 
-  syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { };
-
   syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
 
   # linux only by now