diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-02-26 11:04:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-26 11:04:33 +0800 |
commit | f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93 (patch) | |
tree | 8f499ef6f6d09564bb3efd3bdb6401a358ad027a /pkgs/applications/networking | |
parent | c99fb2b5bce8b6450a03618175a6037a26964418 (diff) | |
parent | 5643128ff2ad22e5011747b63ba1f70e034c80d6 (diff) | |
download | nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.gz nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.bz2 nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.lz nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.xz nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.zst nixlib-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.zip |
Merge pull request #35432 from timokau/syncthing-deprecate-inotify
syncthing,qsyncthingtray: remove syncthing-inotify
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/syncthing/inotify-deps.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/networking/syncthing/inotify.nix | 37 |
2 files changed, 0 insertions, 58 deletions
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; - }; -} |