diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix index 302e5ee10e15..7b0be65c8afa 100644 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -4,17 +4,8 @@ fetch = { type = "git"; url = "https://github.com/cenkalti/backoff"; - rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; - sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "ce6abff51712df5da11095fb41dd4b0353559797"; - sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m"; + rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; + sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; }; } { @@ -22,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/syncthing/syncthing"; - rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8"; - sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9"; + rev = "7fba8cf759a3b48cfc1507a8c32355865500a571"; + sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5"; }; } { @@ -31,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/zillode/notify"; - rev = "2da5cc9881e8f16bab76b63129c7781898f97d16"; - sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40"; + rev = "df33c1a773b462f936a149c36696c018c047eaa9"; + sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s"; }; } ] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index f1343d4a67ed..8d9a813f961c 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "syncthing-inotify-${version}"; - version = "0.8.3"; + version = "0.8.4"; goPackagePath = "github.com/syncthing/syncthing-inotify"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "syncthing"; repo = "syncthing-inotify"; rev = "v${version}"; - sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; + sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw"; }; goDeps = ./inotify-deps.nix; @@ -25,6 +25,8 @@ buildGoPackage rec { substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ $bin/etc/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify ''; meta = with stdenv.lib; {