diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index ba0666e3618..89415b02a07 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, wrapGAppsHook, gnome3, python2Packages }: python2Packages.buildPythonApplication rec { - version = "0.9.2.3"; + version = "0.9.2.7"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42"; + sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python2Packages; [ - dateutil pyinotify pygobject3 + dateutil pyinotify pygobject3 bcrypt ]; patches = [ diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch index 12ea6bb4f2e..6c516e98acb 100644 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -18,7 +18,7 @@ 0.51999998092651367 --- a/syncthing_gtk/configuration.py +++ b/syncthing_gtk/configuration.py -@@ -166,6 +166,8 @@ +@@ -168,6 +168,8 @@ yield k def get(self, key): @@ -49,10 +49,10 @@ self["lblDownloadProgress"].set_markup("" + _("Download finished.") + "") --- a/syncthing_gtk/wizard.py +++ b/syncthing_gtk/wizard.py -@@ -58,7 +58,6 @@ +@@ -60,7 +60,6 @@ self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) # Pages - self.add_page(IntroPage()) + self.add_page(IntroPage(self)) - self.add_page(FindDaemonPage()) self.add_page(GenerateKeysPage()) self.add_page(HttpSettingsPage())