Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

syncthing-gtk: 0.9.2.3 → 0.9.2.7 #32016

Merged
merged 7 commits into from Jan 29, 2018
Merged

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Nov 25, 2017

Motivation for this change
  • Move from python-packages to applications
  • Some clean ups
  • Patch to always use the syncthing binary from nixpkgs – by default, it saves the syncthing path to a config file on first run, which, of course, breaks after update+GC.
  • Update to latest version

I was not able to test it fully due to kozec/syncthing-gtk#379 but it starts at least.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Nov 25, 2017

Also syncthing is started on my machine, syncthing-gtk freezes as in the screenshot
https://dl.thalheim.io/gFnXsN-MjNYWWdmSELIjXw/2017-11-25.vkuux.png

(.syncthing-gtk-wrapped:8655): GLib-GIO-CRITICAL **: g_dbus_proxy_new_sync: assertion 'G_IS_DBUS_CONNECTION (connection)' failed
I StatusIcon    Using backend StatusIconGTK3 (primary)
(.syncthing-gtk-wrapped:8655): Gtk-WARNING **: Invalid icon size 24
(.syncthing-gtk-wrapped:8655): Gdk-CRITICAL **: gdk_window_thaw_toplevel_updates: assertion 'window->update_and_descendants_freeze_count > 0' failed
E Daemon        g-io-error-quark: Could not connect to 127.0.0.1: Connection refused (39)
Traceback (most recent call last):
  File "/nix/store/m8r32mfxj7xp5k365zk3prjz1fj95i2c-syncthing-gtk-0.9.2.7/lib/python2.7/site-packages/syncthing_gtk/daemon.py", line 413, in _rest_connected
    con = sc.connect_to_service_finish(results)
Error: g-io-error-quark: Could not connect to 127.0.0.1: Connection refused (39)
E Daemon        g-io-error-quark: Could not connect to 127.0.0.1: Connection refused (39)
Traceback (most recent call last):
  File "/nix/store/m8r32mfxj7xp5k365zk3prjz1fj95i2c-syncthing-gtk-0.9.2.7/lib/python2.7/site-packages/syncthing_gtk/daemon.py", line 413, in _rest_connected
    con = sc.connect_to_service_finish(results)
Error: g-io-error-quark: Could not connect to 127.0.0.1: Connection refused (39)
E Daemon        g-io-error-quark: Could not connect to 127.0.0.1: Connection refused (39)
Traceback (most recent call last):
  File "/nix/store/m8r32mfxj7xp5k365zk3prjz1fj95i2c-syncthing-gtk-0.9.2.7/lib/python2.7/site-packages/syncthing_gtk/daemon.py", line 413, in _rest_connected
    con = sc.connect_to_service_finish(results)
Error: g-io-error-quark: Could not connect to 127.0.0.1: Connection refused (39)
/nix/store/8j8fm38dndhiwillqqr0rahavhdclsjl-python2.7-pygobject-3.24.1/lib/python2.7/site-packages/gi/module.py:178: Warning: cannot register existing type 'RsvgHandle'
  g_type = info.get_g_type()
/nix/store/8j8fm38dndhiwillqqr0rahavhdclsjl-python2.7-pygobject-3.24.1/lib/python2.7/site-packages/gi/module.py:178: Warning: g_once_init_leave: assertion 'result != 0' failed
  g_type = info.get_g_type()
/nix/store/8j8fm38dndhiwillqqr0rahavhdclsjl-python2.7-pygobject-3.24.1/lib/python2.7/site-packages/gi/module.py:212: Warning: g_type_get_qdata: assertion 'node != NULL' failed
  type_ = g_type.pytype
/nix/store/8j8fm38dndhiwillqqr0rahavhdclsjl-python2.7-pygobject-3.24.1/lib/python2.7/site-packages/gi/module.py:226: Warning: g_type_get_qdata: assertion 'node != NULL' failed
  g_type.pytype = wrapper
/nix/store/8j8fm38dndhiwillqqr0rahavhdclsjl-python2.7-pygobject-3.24.1/lib/python2.7/site-packages/gi/module.py:226: Warning: g_type_set_qdata: assertion 'node != NULL' failed
  g_type.pytype = wrapper

Do I need to share a folder to sync first?

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 25, 2017

@Mic92 Starting the daemon is expected. Sharing a folder should not be necessary. For me, the app freezes even on Ubuntu, it probably communicates with the daemon on the UI thread or something.

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 26, 2018

@thanegill, @jokogr I see you have touched this package previously, could you please test this changes?

@fpletz
Copy link
Member

fpletz commented Jan 29, 2018

I've rebased this PR to master and syncthing-gtk seems to work for me. It starts the daemon and I can change settings. The icons are broken though.

@jtojnar Should we just merge this instead of #34277?

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 29, 2018

I think the icons would be broken in the other PR as well.

Yes, if it works, I would prefer merging this one since it has more fixes.

@jtojnar jtojnar merged commit 47d0a11 into NixOS:master Jan 29, 2018
@jtojnar jtojnar deleted the syncthing-gtk branch January 29, 2018 00:33
@cumber
Copy link
Contributor

cumber commented Jan 29, 2018

Thanks! I was going to suggest just merging this instead of my PR.

I can confirm that syncthing-gtk built from master now works. I get a bunch of messages on stderr about icons, but in the GUI everything still looks the way I expected it to (I use syncthing-gtk regularly); I don't think that's new, and it doesn't seem to matter.

@FRidh
Copy link
Member

FRidh commented Jan 29, 2018

For next time, please consider squashing certain commits. In this case it adds quite some noise to the Nixpkgs history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants