commit 47d0a11a60c18a396f5fec8d36f9a88ca5dd9198 · pyrox.dev/nixpkgs

+56

pkgs/applications/networking/syncthing-gtk/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonApplication rec {

     

       4
       4
       +
         version = "0.9.2.7";

     

       5
       5
       +
         name = "syncthing-gtk-${version}";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "syncthing";

     

       9
       9
       +
           repo = "syncthing-gtk";

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [

     

       15
       15
       +
           wrapGAppsHook

     

       16
       16
       +
           # For setup hook populating GI_TYPELIB_PATH

     

       17
       17
       +
           gobjectIntrospection

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         buildInputs = [

     

       21
       21
       +
           gtk3 (librsvg.override { enableIntrospection = true; })

     

       22
       22
       +
           libnotify

     

       23
       23
       +
           # Schemas with proxy configuration

     

       24
       24
       +
           gnome3.gsettings_desktop_schemas

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           dateutil pyinotify pygobject3 bcrypt

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         patches = [

     

       32
       32
       +
           ./disable-syncthing-binary-configuration.patch

     

       33
       33
       +
           (substituteAll {

     

       34
       34
       +
             src = ./paths.patch;

     

       35
       35
       +
             killall = "${psmisc}/bin/killall";

     

       36
       36
       +
             syncthing = "${syncthing}/bin/syncthing";

     

       37
       37
       +
           })

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         postPatch = ''

     

       41
       41
       +
           substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"

     

       42
       42
       +
           substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"

     

       43
       43
       +
           substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share"

     

       44
       44
       +
           substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share"

     

       45
       45
       +
           substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share"

     

       46
       46
       +
           substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk"

     

       47
       47
       +
         '';

     

       48
       48
       +
       

     

       49
       49
       +
         meta = with stdenv.lib; {

     

       50
       50
       +
           description = "GTK3 & python based GUI for Syncthing";

     

       51
       51
       +
           maintainers = with maintainers; [ ];

     

       52
       52
       +
           platforms = syncthing.meta.platforms;

     

       53
       53
       +
           homepage = https://github.com/syncthing/syncthing-gtk;

     

       54
       54
       +
           license = licenses.gpl2;

     

       55
       55
       +
         };

     

       56
       56
       +
       }

+77

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

···

       1
       1
       +
       --- a/find-daemon.glade

     

       2
       2
       +
       +++ b/find-daemon.glade

     

       3
       3
       +
       @@ -112,6 +112,7 @@

     

       4
       4
       +
                          <object class="GtkEntry" id="vsyncthing_binary">

     

       5
       5
       +
                            <property name="visible">True</property>

     

       6
       6
       +
                            <property name="can_focus">True</property>

     

       7
       7
       +
       +                    <property name="sensitive">False</property>

     

       8
       8
       +
                            <property name="margin_right">20</property>

     

       9
       9
       +
                            <signal name="changed" handler="cb_check_value" swapped="no"/>

     

       10
       10
       +
                          </object>

     

       11
       11
       +
       @@ -126,6 +127,7 @@

     

       12
       12
       +
                            <property name="label" translatable="yes">_Browse...</property>

     

       13
       13
       +
                            <property name="visible">True</property>

     

       14
       14
       +
                            <property name="can_focus">True</property>

     

       15
       15
       +
       +                    <property name="sensitive">False</property>

     

       16
       16
       +
                            <property name="receives_default">True</property>

     

       17
       17
       +
                            <property name="use_underline">True</property>

     

       18
       18
       +
                            <property name="yalign">0.51999998092651367</property>

     

       19
       19
       +
       --- a/syncthing_gtk/configuration.py

     

       20
       20
       +
       +++ b/syncthing_gtk/configuration.py

     

       21
       21
       +
       @@ -168,6 +168,8 @@

     

       22
       22
       +
        			yield k

     

       23
       23
       +
        	

     

       24
       24
       +
        	def get(self, key):

     

       25
       25
       +
       +		if key == "syncthing_binary":

     

       26
       26
       +
       +			return self.REQUIRED_KEYS[key][1]

     

       27
       27
       +
        		return self.values[key]

     

       28
       28
       +
        	

     

       29
       29
       +
        	def set(self, key, value):

     

       30
       30
       +
       --- a/syncthing_gtk/finddaemondialog.py

     

       31
       31
       +
       +++ b/syncthing_gtk/finddaemondialog.py

     

       32
       32
       +
       @@ -163,7 +163,7 @@

     

       33
       33
       +
        		self["lblDownloadProgress"].set_markup(_("Download failed."))

     

       34
       34
       +
        		self["btDownload"].set_visible(True)

     

       35
       35
       +
        		self["pbDownload"].set_visible(False)

     

       36
       36
       +
       -		self["vsyncthing_binary"].set_sensitive(True)

     

       37
       37
       +
       +		self["vsyncthing_binary"].set_sensitive(False)

     

       38
       38
       +
        		self["btBrowse"].set_sensitive(True)

     

       39
       39
       +
        		self["btSave"].set_sensitive(True)

     

       40
       40
       +
        	

     

       41
       41
       +
       @@ -179,7 +179,7 @@

     

       42
       42
       +
        	

     

       43
       43
       +
        	def cb_extract_finished(self, downloader, *a):

     

       44
       44
       +
        		""" Called after extraction is finished """

     

       45
       45
       +
       -		self["vsyncthing_binary"].set_sensitive(True)

     

       46
       46
       +
       +		self["vsyncthing_binary"].set_sensitive(False)

     

       47
       47
       +
        		self["btBrowse"].set_sensitive(True)

     

       48
       48
       +
        		self["vsyncthing_binary"].set_text(downloader.get_target())

     

       49
       49
       +
        		self["lblDownloadProgress"].set_markup("<b>" + _("Download finished.") + "</b>")

     

       50
       50
       +
       --- a/syncthing_gtk/wizard.py

     

       51
       51
       +
       +++ b/syncthing_gtk/wizard.py

     

       52
       52
       +
       @@ -60,7 +60,6 @@

     

       53
       53
       +
        		self.quit_button.connect("clicked", lambda *a : self.emit("cancel"))

     

       54
       54
       +
        		# Pages

     

       55
       55
       +
        		self.add_page(IntroPage(self))

     

       56
       56
       +
       -		self.add_page(FindDaemonPage())

     

       57
       57
       +
        		self.add_page(GenerateKeysPage())

     

       58
       58
       +
        		self.add_page(HttpSettingsPage())

     

       59
       59
       +
        		self.add_page(SaveSettingsPage())

     

       60
       60
       +
       --- a/ui-settings.glade

     

       61
       61
       +
       +++ b/ui-settings.glade

     

       62
       62
       +
       @@ -943,6 +943,7 @@

     

       63
       63
       +
                            <property name="label" translatable="yes">_Browse...</property>

     

       64
       64
       +
                            <property name="visible">True</property>

     

       65
       65
       +
                            <property name="can_focus">True</property>

     

       66
       66
       +
       +                    <property name="sensitive">False</property>

     

       67
       67
       +
                            <property name="receives_default">True</property>

     

       68
       68
       +
                            <property name="use_underline">True</property>

     

       69
       69
       +
                            <property name="yalign">0.51999998092651367</property>

     

       70
       70
       +
       @@ -974,6 +975,7 @@

     

       71
       71
       +
                          <object class="GtkEntry" id="vsyncthing_binary">

     

       72
       72
       +
                            <property name="visible">True</property>

     

       73
       73
       +
                            <property name="can_focus">True</property>

     

       74
       74
       +
       +                    <property name="sensitive">False</property>

     

       75
       75
       +
                            <property name="hexpand">True</property>

     

       76
       76
       +
                            <signal name="changed" handler="cb_check_value" swapped="no"/>

     

       77
       77
       +
                          </object>

+22

pkgs/applications/networking/syncthing-gtk/paths.patch

···

       1
       1
       +
       --- a/syncthing_gtk/configuration.py

     

       2
       2
       +
       +++ b/syncthing_gtk/configuration.py

     

       3
       3
       +
       @@ -30,7 +30,7 @@

     

       4
       4
       +
        		"autokill_daemon"			: (int, 2),	# 0 - never kill, 1 - always kill, 2 - ask

     

       5
       5
       +
        		"daemon_priority"			: (int, 0), # uses nice values

     

       6
       6
       +
        		"max_cpus"					: (int, 0), # 0 for all cpus

     

       7
       7
       +
       -		"syncthing_binary"			: (str, "/usr/bin/syncthing"),

     

       8
       8
       +
       +		"syncthing_binary"			: (str, "@syncthing@"),

     

       9
       9
       +
        		"syncthing_arguments"		: (str, ""),

     

       10
       10
       +
        		"minimize_on_start"			: (bool, False),

     

       11
       11
       +
        		"folder_as_path"			: (bool, True),

     

       12
       12
       +
       --- a/syncthing_gtk/tools.py

     

       13
       13
       +
       +++ b/syncthing_gtk/tools.py

     

       14
       14
       +
       @@ -303,7 +303,7 @@

     

       15
       15
       +
        			return False

     

       16
       16
       +
        		# signal 0 doesn't kill anything, but killall exits with 1 if

     

       17
       17
       +
        		# named process is not found

     

       18
       18
       +
       -		p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])

     

       19
       19
       +
       +		p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"])

     

       20
       20
       +
        		p.communicate()

     

       21
       21
       +
        		return p.returncode == 0

     

       22
       22
       +
        	else:

pkgs/top-level/all-packages.nix

···

       17222
       17222
        
       

     

       17223
       17223
        
         syncthing013 = callPackage ../applications/networking/syncthing013 { };

     

       17224
       17224
        
       

     

       17225
       17225
       +
         syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { };

     

       17226
       17226
       +
       

     

       17225
       17227
        
         syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { };

     

       17226
       17228
        
       

     

       17227
       17229
        
         syncthing-tray = callPackage ../applications/misc/syncthing-tray { };

+2 -40

pkgs/top-level/python-packages.nix

···

       17329
       17329
        
       

     

       17330
       17330
        
         sybil = callPackage ../development/python-modules/sybil { };

     

       17331
       17331
        
       

     

       17332
       17332
       -
         syncthing-gtk = buildPythonPackage rec {

     

       17333
       17333
       -
           version = "0.9.2.3";

     

       17334
       17334
       -
           name = "syncthing-gtk-${version}";

     

       17335
       17335
       -
           src = pkgs.fetchFromGitHub {

     

       17336
       17336
       -
             owner = "syncthing";

     

       17337
       17337
       -
             repo = "syncthing-gtk";

     

       17338
       17338
       -
             rev = "v${version}";

     

       17339
       17339
       -
             sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42";

     

       17340
       17340
       -
           };

     

       17341
       17341
       -
       

     

       17342
       17342
       -
           disabled = isPy3k;

     

       17343
       17343
       -
       

     

       17344
       17344
       -
           propagatedBuildInputs = with self; [ pkgs.syncthing dateutil pyinotify

     

       17345
       17345
       -
             pkgs.libnotify

     

       17346
       17346
       -
             (pkgs.librsvg.override { withGTK = true; })

     

       17347
       17347
       -
             pkgs.psmisc pygobject3 pkgs.gtk3

     

       17348
       17348
       -
           ];

     

       17349
       17349
       -
       

     

       17350
       17350
       -
           preFixup = ''

     

       17351
       17351
       -
             wrapProgram $out/bin/syncthing-gtk \

     

       17352
       17352
       -
               --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       17353
       17353
       -
               --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"

     

       17354
       17354
       -
           '';

     

       17355
       17355
       -
       

     

       17356
       17356
       -
           patchPhase = ''

     

       17357
       17357
       -
               substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"

     

       17358
       17358
       -
               substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"

     

       17359
       17359
       -
               substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share"

     

       17360
       17360
       -
               substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share"

     

       17361
       17361
       -
               substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk"

     

       17362
       17362
       -
           '';

     

       17363
       17363
       -
       

     

       17364
       17364
       -
           meta = {

     

       17365
       17365
       -
             description = " GTK3 & python based GUI for Syncthing ";

     

       17366
       17366
       -
             maintainers = with maintainers; [ ];

     

       17367
       17367
       -
             platforms = pkgs.syncthing.meta.platforms;

     

       17368
       17368
       -
             homepage = "https://github.com/syncthing/syncthing-gtk";

     

       17369
       17369
       -
             license = licenses.gpl2;

     

       17370
       17370
       -
           };

     

       17371
       17371
       -
         };

     

       17332
       17332
       +
         # legacy alias

     

       17333
       17333
       +
         syncthing-gtk = pkgs.syncthing-gtk;

     

       17372
       17334
        
       

     

       17373
       17335
        
         systemd = callPackage ../development/python-modules/systemd {

     

       17374
       17336
        
           inherit (pkgs) pkgconfig systemd;