tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

pantheon.switchboard-plug-network: 2.5.0 -> 8.0.0

https://github.com/elementary/switchboard-plug-network/compare/2.5.0...8.0.0

Bobby Rong 3d09da64 887b03c8

+42 -18
unified split
+10 -8
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
··· 7 , pkg-config 8 , substituteAll 9 , vala 10 , libgee 11 - , granite 12 - , gtk3 13 , networkmanager 14 , networkmanagerapplet 15 - , libnma 16 , switchboard 17 }: 18 19 stdenv.mkDerivation rec { 20 pname = "switchboard-plug-network"; 21 - version = "2.5.0"; 22 23 src = fetchFromGitHub { 24 owner = "elementary"; 25 repo = pname; 26 rev = version; 27 - hash = "sha256-Dd7sZ66iyfuoHeQYrhlx9G9g4ylGq1IBlkTF5zFlVBQ="; 28 }; 29 30 patches = [ ··· 42 ]; 43 44 buildInputs = [ 45 - granite 46 - gtk3 47 libgee 48 networkmanager 49 - libnma 50 switchboard 51 ]; 52
··· 7 , pkg-config 8 , substituteAll 9 , vala 10 + , libadwaita 11 , libgee 12 + , granite7 13 + , gtk4 14 , networkmanager 15 , networkmanagerapplet 16 + , libnma-gtk4 17 , switchboard 18 }: 19 20 stdenv.mkDerivation rec { 21 pname = "switchboard-plug-network"; 22 + version = "8.0.0"; 23 24 src = fetchFromGitHub { 25 owner = "elementary"; 26 repo = pname; 27 rev = version; 28 + hash = "sha256-N/S4oO7wwOMJZhQeqAeLBOMEsJtoKItxmGhsLHMuOoM="; 29 }; 30 31 patches = [ ··· 43 ]; 44 45 buildInputs = [ 46 + granite7 47 + gtk4 48 + libadwaita 49 libgee 50 networkmanager 51 + libnma-gtk4 52 switchboard 53 ]; 54
+32 -10
pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
··· 1 diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala 2 - index ba9dc22..a12871a 100644 3 --- a/src/Views/VPNPage.vala 4 +++ b/src/Views/VPNPage.vala 5 - @@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page { 6 private void try_connection_editor (string args) { 7 try { 8 var appinfo = AppInfo.create_from_commandline ( ··· 11 null, 12 GLib.AppInfoCreateFlags.NONE 13 ); 14 - diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala 15 - index 5849b69..7bbd172 100644 16 - --- a/src/Widgets/SettingsButton.vala 17 - +++ b/src/Widgets/SettingsButton.vala 18 - @@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button { 19 - clicked.connect (() => { 20 try { 21 var appinfo = AppInfo.create_from_commandline ( 22 - - "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE 23 - + "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE 24 ); 25 26 appinfo.launch (null, null);
··· 1 diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala 2 + index 21488d1e..f9915e5d 100644 3 --- a/src/Views/VPNPage.vala 4 +++ b/src/Views/VPNPage.vala 5 + @@ -279,7 +279,7 @@ public class Network.VPNPage : Network.Widgets.Page { 6 private void try_connection_editor (string args) { 7 try { 8 var appinfo = AppInfo.create_from_commandline ( ··· 11 null, 12 GLib.AppInfoCreateFlags.NONE 13 ); 14 + diff --git a/src/Widgets/Page.vala b/src/Widgets/Page.vala 15 + index cbcc8357..c6276d5a 100644 16 + --- a/src/Widgets/Page.vala 17 + +++ b/src/Widgets/Page.vala 18 + @@ -189,7 +189,7 @@ namespace Network.Widgets { 19 + protected void edit_connections () { 20 try { 21 var appinfo = AppInfo.create_from_commandline ( 22 + - "nm-connection-editor", null, AppInfoCreateFlags.NONE 23 + + "@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE 24 + ); 25 + appinfo.launch (null, null); 26 + } catch (Error e) { 27 + @@ -200,7 +200,7 @@ namespace Network.Widgets { 28 + protected void open_advanced_settings () { 29 + try { 30 + var appinfo = AppInfo.create_from_commandline ( 31 + - "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE 32 + + "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE 33 ); 34 35 appinfo.launch (null, null); 36 + diff --git a/src/Widgets/VPN/VPNInfoDialog.vala b/src/Widgets/VPN/VPNInfoDialog.vala 37 + index e647c43b..44ce61c6 100644 38 + --- a/src/Widgets/VPN/VPNInfoDialog.vala 39 + +++ b/src/Widgets/VPN/VPNInfoDialog.vala 40 + @@ -70,7 +70,7 @@ public class Network.Widgets.VPNInfoDialog : Granite.MessageDialog { 41 + if (response == 1) { 42 + try { 43 + var appinfo = AppInfo.create_from_commandline ( 44 + - "nm-connection-editor --edit=%s".printf (connection.get_uuid ()), 45 + + "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (connection.get_uuid ()), 46 + null, 47 + GLib.AppInfoCreateFlags.NONE 48 + );