public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35410 from jtojnar/syncthing-gtk-0.9.3 

syncthing-gtk: 0.9.2.7 → 0.9.3
This commit is contained in:
Jan Tojnar 2018-04-28 22:02:00 +02:00 committed by GitHub
parent 844c08ec0a 094683ac36
commit f92d9364e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/syncthing-gtk/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: { stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
buildPythonApplication rec { buildPythonApplication rec {
version = "0.9.2.7"; version = "0.9.3.1";
name = "syncthing-gtk-${version}"; name = "syncthing-gtk-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing-gtk"; repo = "syncthing-gtk";
rev = "v${version}"; rev = "v${version}";
sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -18,8 +18,8 @@ buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 librsvg gtk3 librsvg libappindicator-gtk3
libnotify libnotify gnome3.adwaita-icon-theme
# Schemas with proxy configuration # Schemas with proxy configuration
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
]; ];
@ -32,7 +32,7 @@ buildPythonApplication rec {
./disable-syncthing-binary-configuration.patch ./disable-syncthing-binary-configuration.patch
(substituteAll { (substituteAll {
src = ./paths.patch; src = ./paths.patch;
killall = "${psmisc}/bin/killall"; killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall";
syncthing = "${syncthing}/bin/syncthing"; syncthing = "${syncthing}/bin/syncthing";
}) })
]; ];

40
pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
View File

@ -1,5 +1,5 @@
--- a/find-daemon.glade --- a/glade/find-daemon.glade
+++ b/find-daemon.glade +++ b/glade/find-daemon.glade
@@ -112,6 +112,7 @@ @@ -112,6 +112,7 @@
<object class="GtkEntry" id="vsyncthing_binary"> <object class="GtkEntry" id="vsyncthing_binary">
<property name="visible">True</property> <property name="visible">True</property>
@ -16,6 +16,24 @@
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="yalign">0.51999998092651367</property> <property name="yalign">0.51999998092651367</property>
--- a/glade/ui-settings.glade
+++ b/glade/ui-settings.glade
@@ -943,6 +943,7 @@
<property name="label" translatable="yes">_Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="sensitive">False</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="yalign">0.51999998092651367</property>
@@ -974,6 +975,7 @@
<object class="GtkEntry" id="vsyncthing_binary">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="sensitive">False</property>
<property name="hexpand">True</property>
<signal name="changed" handler="cb_check_value" swapped="no"/>
</object>
--- a/syncthing_gtk/configuration.py --- a/syncthing_gtk/configuration.py
+++ b/syncthing_gtk/configuration.py +++ b/syncthing_gtk/configuration.py
@@ -168,6 +168,8 @@ @@ -168,6 +168,8 @@
@ -57,21 +75,3 @@
self.add_page(GenerateKeysPage()) self.add_page(GenerateKeysPage())
self.add_page(HttpSettingsPage()) self.add_page(HttpSettingsPage())
self.add_page(SaveSettingsPage()) self.add_page(SaveSettingsPage())
--- a/ui-settings.glade
+++ b/ui-settings.glade
@@ -943,6 +943,7 @@
<property name="label" translatable="yes">_Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="sensitive">False</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="yalign">0.51999998092651367</property>
@@ -974,6 +975,7 @@
<object class="GtkEntry" id="vsyncthing_binary">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="sensitive">False</property>
<property name="hexpand">True</property>
<signal name="changed" handler="cb_check_value" swapped="no"/>
</object>