diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs')
22 files changed, 1852 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix new file mode 100644 index 000000000000..06f097e81af5 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv +, substituteAll +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +, onboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-a11y"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-3PaOIadlEdYvfNZJaoAQVDKdSTfUdn+snCa8tHmDFD0="; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit onboard; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Universal Access Plug"; + homepage = "https://github.com/elementary/switchboard-plug-a11y"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch new file mode 100644 index 000000000000..4d69390f39d9 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala +index b4ae8b0..5b8fd7e 100644 +--- a/src/Panes/Typing.vala ++++ b/src/Panes/Typing.vala +@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane { + + onboard_settings_label.clicked.connect (() => { + try { +- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE); ++ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE); + appinfo.launch (null, null); + } catch (Error e) { + warning ("%s\n", e.message); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix new file mode 100644 index 000000000000..adba2ec08017 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -0,0 +1,80 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, nix-update-script +, pantheon +, substituteAll +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +, pciutils +, elementary-feedback +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-about"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-wis6wNEOOjPLUCT9vRRhMxbKHR2Y2nZArKogSF/FQv8="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + patches = [ + # Get OS Info from GLib.Environment + # https://github.com/elementary/switchboard-plug-about/pull/128 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/5ed29988e3a895b2df66e5529df0f12a94d5517c.patch"; + sha256 = "1ipDxnpDZjpSEzZdtOeNe5U+QOXiB5M+hC3yDAsl/rQ="; + }) + + # Use Pretty Name + # https://github.com/elementary/switchboard-plug-about/pull/134 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/653d131dc8fac10ae7523f2bf6b179ffffa9c0fd.patch"; + sha256 = "AsM49Dc9/yn2tG6fqjfedeOlDXUu+iEoyNUmNYLH+zE="; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit pciutils; + elementary_feedback = elementary-feedback; + }) + ]; + + meta = with lib; { + description = "Switchboard About Plug"; + homepage = "https://github.com/elementary/switchboard-plug-about"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch new file mode 100644 index 000000000000..d458689a3253 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/src/Plug.vala b/src/Plug.vala +index c32efcbe..0cdaeaca 100644 +--- a/src/Plug.vala ++++ b/src/Plug.vala +@@ -178,7 +178,7 @@ public class About.Plug : Switchboard.Plug { + + var bug_button = new Gtk.Button.with_label (_("Report a Problem")); + bug_button.clicked.connect (() => { +- var appinfo = new GLib.DesktopAppInfo ("io.elementary.feedback.desktop"); ++ var appinfo = new GLib.DesktopAppInfo ("@elementary_feedback@/bin/io.elementary.feedback.desktop"); + if (appinfo != null) { + try { + appinfo.launch (null, null); +diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala +index f8113634..3794bad8 100644 +--- a/src/Views/HardwareView.vala ++++ b/src/Views/HardwareView.vala +@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid { + + // Graphics + try { +- Process.spawn_command_line_sync ("lspci", out graphics); ++ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics); + + if ("VGA" in graphics) { //VGA-keyword indicates graphics-line + string[] lines = graphics.split("\n"); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix new file mode 100644 index 000000000000..66596fa2ff1b --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-applications"; + version = "2.1.7"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-uiu19XyogNR0LX/2IIZM6B1JKAfqDMOHniQ29EAa9XM="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Applications Plug"; + homepage = "https://github.com/elementary/switchboard-plug-applications"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix new file mode 100644 index 000000000000..dea3c0306a32 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, bluez +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-bluetooth"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-avu9Hya3C9g8kGl3D9bLwuZBkNPdwyvLspuBWgvpXU8="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + bluez + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Bluetooth Plug"; + homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix new file mode 100644 index 000000000000..2337ef241198 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, substituteAll +, pkg-config +, vala +, libgee +, granite +, gtk3 +, libxml2 +, switchboard +, tzdata +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-datetime"; + version = "2.1.9"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-qgsU3NXqH7ryUah7rEnUrsbecV4AsOo4QfgTcWc5bc4="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + libxml2 + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Date & Time Plug"; + homepage = "https://github.com/elementary/switchboard-plug-datetime"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix new file mode 100644 index 000000000000..055a40989631 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-display"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-mjmvuSipCRGg/HSa1n1eLyVU1gERNT2ciqgz/0KqX0Y="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Displays Plug"; + homepage = "https://github.com/elementary/switchboard-plug-display"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch new file mode 100644 index 000000000000..42900c380627 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch @@ -0,0 +1,700 @@ +From 4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633 Mon Sep 17 00:00:00 2001 +Message-Id: <4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633.1599180249.git-series.worldofpeace@protonmail.ch> +From: worldofpeace <worldofpeace@protonmail.ch> +Date: Thu, 3 Sep 2020 20:43:25 -0400 +Subject: [PATCH] Remove Install Unlisted Engines function + +https://github.com/elementary/switchboard-plug-keyboard/issues/324 +--- + src/Dialogs/InstallEngineDialog.vala | 140 +------------------ + src/Dialogs/ProgressDialog.vala | 82 +---------- + src/InputMethod/Installer/InstallList.vala | 73 +--------- + src/InputMethod/Installer/UbuntuInstaller.vala | 142 +------------------ + src/InputMethod/Installer/aptd-client.vala | 93 +------------ + src/Widgets/InputMethod/AddEnginesPopover.vala | 12 +-- + src/Widgets/InputMethod/LanguagesRow.vala | 43 +----- + src/meson.build | 6 +- + 8 files changed, 591 deletions(-) + delete mode 100644 src/Dialogs/InstallEngineDialog.vala + delete mode 100644 src/Dialogs/ProgressDialog.vala + delete mode 100644 src/InputMethod/Installer/InstallList.vala + delete mode 100644 src/InputMethod/Installer/UbuntuInstaller.vala + delete mode 100644 src/InputMethod/Installer/aptd-client.vala + delete mode 100644 src/Widgets/InputMethod/LanguagesRow.vala + +diff --git a/src/Dialogs/InstallEngineDialog.vala b/src/Dialogs/InstallEngineDialog.vala +deleted file mode 100644 +index ffba3a8..0000000 +--- a/src/Dialogs/InstallEngineDialog.vala ++++ /dev/null +@@ -1,140 +0,0 @@ +-/* +-* Copyright 2019-2020 elementary, Inc. (https://elementary.io) +-* +-* This program is free software: you can redistribute it and/or modify +-* it under the terms of the GNU General Public License as published by +-* the Free Software Foundation, either version 3 of the License, or +-* (at your option) any later version. +-* +-* This program is distributed in the hope that it will be useful, +-* but WITHOUT ANY WARRANTY; without even the implied warranty of +-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-* GNU General Public License for more details. +-* +-* You should have received a copy of the GNU General Public License +-* along with this program. If not, see <https://www.gnu.org/licenses/>. +-*/ +- +-public class Pantheon.Keyboard.InputMethodPage.InstallEngineDialog : Granite.MessageDialog { +- private InstallList? engines_filter; +- +- public InstallEngineDialog (Gtk.Window parent) { +- Object ( +- primary_text: _("Choose an engine to install"), +- secondary_text: _("Select an engine from the list to install and use."), +- image_icon: new ThemedIcon ("extension"), +- transient_for: parent, +- buttons: Gtk.ButtonsType.CANCEL +- ); +- } +- +- construct { +- var languages_list = new Gtk.ListBox () { +- activate_on_single_click = true, +- expand = true, +- selection_mode = Gtk.SelectionMode.NONE +- }; +- +- foreach (var language in InstallList.get_all ()) { +- var lang = new LanguagesRow (language); +- languages_list.add (lang); +- } +- +- var back_button = new Gtk.Button.with_label (_("Languages")) { +- halign = Gtk.Align.START, +- margin = 6 +- }; +- back_button.get_style_context ().add_class (Granite.STYLE_CLASS_BACK_BUTTON); +- +- var language_title = new Gtk.Label (""); +- +- var language_header = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6); +- language_header.pack_start (back_button); +- language_header.set_center_widget (language_title); +- +- var listbox = new Gtk.ListBox () { +- expand = true +- }; +- listbox.set_filter_func (filter_function); +- listbox.set_sort_func (sort_function); +- +- foreach (var language in InstallList.get_all ()) { +- foreach (var engine in language.get_components ()) { +- listbox.add (new EnginesRow (engine)); +- } +- } +- +- var scrolled = new Gtk.ScrolledWindow (null, null); +- scrolled.add (listbox); +- +- var engine_list_grid = new Gtk.Grid () { +- orientation = Gtk.Orientation.VERTICAL +- }; +- engine_list_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW); +- engine_list_grid.add (language_header); +- engine_list_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL)); +- engine_list_grid.add (scrolled); +- +- var stack = new Gtk.Stack () { +- height_request = 200, +- width_request = 300, +- transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT +- }; +- stack.add (languages_list); +- stack.add (engine_list_grid); +- +- var frame = new Gtk.Frame (null); +- frame.add (stack); +- +- custom_bin.add (frame); +- custom_bin.show_all (); +- +- var install_button = add_button (_("Install"), Gtk.ResponseType.OK); +- install_button.sensitive = false; +- install_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); +- +- languages_list.row_activated.connect ((row) => { +- stack.visible_child = engine_list_grid; +- language_title.label = ((LanguagesRow) row).language.get_name (); +- engines_filter = ((LanguagesRow) row).language; +- listbox.invalidate_filter (); +- var adjustment = scrolled.get_vadjustment (); +- adjustment.set_value (adjustment.lower); +- }); +- +- back_button.clicked.connect (() => { +- stack.visible_child = languages_list; +- install_button.sensitive = false; +- }); +- +- listbox.selected_rows_changed.connect (() => { +- foreach (var engines_row in listbox.get_children ()) { +- ((EnginesRow) engines_row).selected = false; +- } +- +- ((EnginesRow) listbox.get_selected_row ()).selected = true; +- install_button.sensitive = true; +- }); +- +- response.connect ((response_id) => { +- if (response_id == Gtk.ResponseType.OK) { +- string engine_to_install = ((EnginesRow) listbox.get_selected_row ()).engine_name; +- UbuntuInstaller.get_default ().install (engine_to_install); +- } +- }); +- } +- +- [CCode (instance_pos = -1)] +- private bool filter_function (Gtk.ListBoxRow row) { +- if (InstallList.get_language_from_engine_name (((EnginesRow) row).engine_name) == engines_filter) { +- return true; +- } +- +- return false; +- } +- +- [CCode (instance_pos = -1)] +- private int sort_function (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) { +- return ((EnginesRow) row1).engine_name.collate (((EnginesRow) row1).engine_name); +- } +-} +diff --git a/src/Dialogs/ProgressDialog.vala b/src/Dialogs/ProgressDialog.vala +deleted file mode 100644 +index f110aca..0000000 +--- a/src/Dialogs/ProgressDialog.vala ++++ /dev/null +@@ -1,82 +0,0 @@ +-/* +-* Copyright 2011-2020 elementary, Inc. (https://elementary.io) +-* +-* This program is free software: you can redistribute it +-* and/or modify it under the terms of the GNU Lesser General Public License as +-* published by the Free Software Foundation, either version 3 of the +-* License, or (at your option) any later version. +-* +-* This program is distributed in the hope that it will be +-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +-* Public License for more details. +-* +-* You should have received a copy of the GNU General Public License along +-* with this program. If not, see http://www.gnu.org/licenses/. +-*/ +- +-public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Gtk.Dialog { +- public int progress { +- set { +- if (value >= 100) { +- destroy (); +- } +- +- progress_bar.fraction = value / 100.0; +- } +- } +- +- private Gtk.ProgressBar progress_bar; +- +- construct { +- var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale", Gtk.IconSize.DIALOG) { +- valign = Gtk.Align.START +- }; +- +- var primary_label = new Gtk.Label (null) { +- max_width_chars = 50, +- wrap = true, +- xalign = 0 +- }; +- primary_label.get_style_context ().add_class (Granite.STYLE_CLASS_PRIMARY_LABEL); +- +- unowned UbuntuInstaller installer = UbuntuInstaller.get_default (); +- switch (installer.transaction_mode) { +- case UbuntuInstaller.TransactionMode.INSTALL: +- primary_label.label = _("Installing %s").printf (installer.engine_to_address); +- break; +- case UbuntuInstaller.TransactionMode.REMOVE: +- primary_label.label = _("Removing %s").printf (installer.engine_to_address); +- break; +- } +- +- progress_bar = new Gtk.ProgressBar () { +- hexpand = true, +- valign = Gtk.Align.START, +- width_request = 300 +- }; +- +- var cancel_button = (Gtk.Button) add_button (_("Cancel"), 0); +- +- installer.bind_property ("install-cancellable", cancel_button, "sensitive"); +- +- var grid = new Gtk.Grid () { +- column_spacing = 12, +- margin = 6, +- row_spacing = 6 +- }; +- grid.attach (image, 0, 0, 1, 2); +- grid.attach (primary_label, 1, 0); +- grid.attach (progress_bar, 1, 1); +- grid.show_all (); +- +- border_width = 6; +- deletable = false; +- get_content_area ().add (grid); +- +- cancel_button.clicked.connect (() => { +- installer.cancel_install (); +- destroy (); +- }); +- } +-} +diff --git a/src/InputMethod/Installer/InstallList.vala b/src/InputMethod/Installer/InstallList.vala +deleted file mode 100644 +index 275c302..0000000 +--- a/src/InputMethod/Installer/InstallList.vala ++++ /dev/null +@@ -1,73 +0,0 @@ +-/* +-* 2019-2020 elementary, Inc. (https://elementary.io) +-* +-* This program is free software: you can redistribute it and/or modify +-* it under the terms of the GNU General Public License as published by +-* the Free Software Foundation, either version 3 of the License, or +-* (at your option) any later version. +-* +-* This program is distributed in the hope that it will be useful, +-* but WITHOUT ANY WARRANTY; without even the implied warranty of +-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-* GNU General Public License for more details. +-* +-* You should have received a copy of the GNU General Public License +-* along with this program. If not, see <https://www.gnu.org/licenses/>. +-*/ +- +-public enum Pantheon.Keyboard.InputMethodPage.InstallList { +- JA, +- KO, +- ZH; +- +- public string get_name () { +- switch (this) { +- case JA: +- return _("Japanese"); +- case KO: +- return _("Korean"); +- case ZH: +- return _("Chinese"); +- default: +- assert_not_reached (); +- } +- } +- +- public string[] get_components () { +- switch (this) { +- case JA: +- return { "ibus-anthy", "ibus-mozc", "ibus-skk" }; +- case KO: +- return { "ibus-hangul" }; +- case ZH: +- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" }; +- default: +- assert_not_reached (); +- } +- } +- +- public static InstallList get_language_from_engine_name (string engine_name) { +- switch (engine_name) { +- case "ibus-anthy": +- return JA; +- case "ibus-mozc": +- return JA; +- case "ibus-skk": +- return JA; +- case "ibus-hangul": +- return KO; +- case "ibus-cangjie": +- return ZH; +- case "ibus-chewing": +- return ZH; +- case "ibus-pinyin": +- return ZH; +- default: +- assert_not_reached (); +- } +- } +- +- public static InstallList[] get_all () { +- return { JA, KO, ZH }; +- } +-} +diff --git a/src/InputMethod/Installer/UbuntuInstaller.vala b/src/InputMethod/Installer/UbuntuInstaller.vala +deleted file mode 100644 +index b65aa1f..0000000 +--- a/src/InputMethod/Installer/UbuntuInstaller.vala ++++ /dev/null +@@ -1,142 +0,0 @@ +-/* +-* Copyright 2011-2020 elementary, Inc. (https://elementary.io) +-* +-* This program is free software: you can redistribute it +-* and/or modify it under the terms of the GNU Lesser General Public License as +-* published by the Free Software Foundation, either version 3 of the +-* License, or (at your option) any later version. +-* +-* This program is distributed in the hope that it will be +-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +-* Public License for more details. +-* +-* You should have received a copy of the GNU General Public License along +-* with this program. If not, see http://www.gnu.org/licenses/. +-*/ +- +-public class Pantheon.Keyboard.InputMethodPage.UbuntuInstaller : Object { +- private AptdProxy aptd; +- private AptdTransactionProxy proxy; +- +- public bool install_cancellable { get; private set; } +- public TransactionMode transaction_mode { get; private set; } +- public string engine_to_address { get; private set; } +- +- public signal void install_finished (string langcode); +- public signal void install_failed (); +- public signal void remove_finished (string langcode); +- public signal void progress_changed (int progress); +- +- public enum TransactionMode { +- INSTALL, +- REMOVE, +- INSTALL_MISSING, +- } +- +- Gee.HashMap<string, string> transactions; +- +- private static GLib.Once<UbuntuInstaller> instance; +- public static unowned UbuntuInstaller get_default () { +- return instance.once (() => { +- return new UbuntuInstaller (); +- }); +- } +- +- private UbuntuInstaller () {} +- +- construct { +- transactions = new Gee.HashMap<string, string> (); +- aptd = new AptdProxy (); +- +- try { +- aptd.connect_to_aptd (); +- } catch (Error e) { +- warning ("Could not connect to APT daemon"); +- } +- } +- +- public void install (string engine_name) { +- transaction_mode = TransactionMode.INSTALL; +- engine_to_address = engine_name; +- string[] packages = {}; +- packages += engine_to_address; +- +- foreach (var packet in packages) { +- message ("Packet: %s", packet); +- } +- +- aptd.install_packages.begin (packages, (obj, res) => { +- try { +- var transaction_id = aptd.install_packages.end (res); +- transactions.@set (transaction_id, "i-" + engine_name); +- run_transaction (transaction_id); +- } catch (Error e) { +- warning ("Could not queue downloads: %s", e.message); +- } +- }); +- } +- +- public void cancel_install () { +- if (install_cancellable) { +- warning ("cancel_install"); +- try { +- proxy.cancel (); +- } catch (Error e) { +- warning ("cannot cancel installation:%s", e.message); +- } +- } +- } +- +- private void run_transaction (string transaction_id) { +- proxy = new AptdTransactionProxy (); +- proxy.finished.connect (() => { +- on_apt_finshed (transaction_id, true); +- }); +- +- proxy.property_changed.connect ((prop, val) => { +- if (prop == "Progress") { +- progress_changed ((int) val.get_int32 ()); +- } +- +- if (prop == "Cancellable") { +- install_cancellable = val.get_boolean (); +- } +- }); +- +- try { +- proxy.connect_to_aptd (transaction_id); +- proxy.simulate (); +- +- proxy.run (); +- } catch (Error e) { +- on_apt_finshed (transaction_id, false); +- warning ("Could no run transaction: %s", e.message); +- } +- } +- +- private void on_apt_finshed (string id, bool success) { +- if (!success) { +- install_failed (); +- transactions.unset (id); +- return; +- } +- +- if (!transactions.has_key (id)) { //transaction already removed +- return; +- } +- +- var action = transactions.get (id); +- var lang = action[2:action.length]; +- +- message ("ID %s -> %s", id, success ? "success" : "failed"); +- +- if (action[0:1] == "i") { // install +- install_finished (lang); +- } else { +- remove_finished (lang); +- } +- +- transactions.unset (id); +- } +-} +diff --git a/src/InputMethod/Installer/aptd-client.vala b/src/InputMethod/Installer/aptd-client.vala +deleted file mode 100644 +index ee5c3f5..0000000 +--- a/src/InputMethod/Installer/aptd-client.vala ++++ /dev/null +@@ -1,93 +0,0 @@ +-/* +- * Copyright (C) 2012 Canonical Ltd +- * +- * This program is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License version 3 as +- * published by the Free Software Foundation. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see <http://www.gnu.org/licenses/>. +- * +- * Authored by Pawel Stolowski <pawel.stolowski@canonical.com> +- */ +- +-namespace Pantheon.Keyboard.InputMethodPage { +- private const string APTD_DBUS_NAME = "org.debian.apt"; +- private const string APTD_DBUS_PATH = "/org/debian/apt"; +- +- /** +- * Expose a subset of org.debian.apt interfaces -- only what's needed by applications lens. +- */ +- [DBus (name = "org.debian.apt")] +- public interface AptdService : GLib.Object { +- public abstract async string install_packages (string[] packages) throws GLib.Error; +- public abstract async string remove_packages (string[] packages) throws GLib.Error; +- public abstract async void quit () throws GLib.Error; +- } +- +- [DBus (name = "org.debian.apt.transaction")] +- public interface AptdTransactionService : GLib.Object { +- public abstract void run () throws GLib.Error; +- public abstract void simulate () throws GLib.Error; +- public abstract void cancel () throws GLib.Error; +- public signal void finished (string exit_state); +- public signal void property_changed (string property, Variant val); +- } +- +- public class AptdProxy : GLib.Object { +- private AptdService _aptd_service; +- +- public void connect_to_aptd () throws GLib.Error { +- _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, APTD_DBUS_PATH); +- } +- +- public async string install_packages (string[] packages) throws GLib.Error { +- string res = yield _aptd_service.install_packages (packages); +- return res; +- } +- +- public async string remove_packages (string[] packages) throws GLib.Error { +- string res = yield _aptd_service.remove_packages (packages); +- return res; +- } +- +- public async void quit () throws GLib.Error { +- yield _aptd_service.quit (); +- } +- } +- +- public class AptdTransactionProxy : GLib.Object { +- public signal void finished (string transaction_id); +- public signal void property_changed (string property, Variant variant); +- +- private AptdTransactionService _aptd_service; +- +- public void connect_to_aptd (string transaction_id) throws GLib.Error { +- _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, transaction_id); +- _aptd_service.finished.connect ((exit_state) => { +- debug ("aptd transaction finished: %s\n", exit_state); +- finished (transaction_id); +- }); +- _aptd_service.property_changed.connect ((prop, variant) => { +- property_changed (prop, variant); +- }); +- } +- +- public void simulate () throws GLib.Error { +- _aptd_service.simulate (); +- } +- +- public void run () throws GLib.Error { +- _aptd_service.run (); +- } +- +- public void cancel () throws GLib.Error { +- _aptd_service.cancel (); +- } +- } +-} +diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala +index 46e005d..6b56c6b 100644 +--- a/src/Widgets/InputMethod/AddEnginesPopover.vala ++++ b/src/Widgets/InputMethod/AddEnginesPopover.vala +@@ -49,8 +49,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { + }; + scrolled.add (listbox); + +- var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…")); +- + var cancel_button = new Gtk.Button.with_label (_("Cancel")); + + var add_button = new Gtk.Button.with_label (_("Add Engine")); +@@ -61,10 +59,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { + margin = 12, + spacing = 6 + }; +- button_box.add (install_button); + button_box.add (cancel_button); + button_box.add (add_button); +- button_box.set_child_secondary (install_button, true); + + var grid = new Gtk.Grid (); + grid.attach (search_entry, 0, 0); +@@ -92,14 +88,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { + listbox.invalidate_filter (); + }); + +- install_button.clicked.connect (() => { +- popdown (); +- +- var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ()); +- install_dialog.run (); +- install_dialog.destroy (); +- }); +- + cancel_button.clicked.connect (() => { + popdown (); + }); +diff --git a/src/Widgets/InputMethod/LanguagesRow.vala b/src/Widgets/InputMethod/LanguagesRow.vala +deleted file mode 100644 +index dc064ae..0000000 +--- a/src/Widgets/InputMethod/LanguagesRow.vala ++++ /dev/null +@@ -1,43 +0,0 @@ +-/* +-* 2019-2020 elementary, Inc. (https://elementary.io) +-* +-* This program is free software: you can redistribute it and/or modify +-* it under the terms of the GNU General Public License as published by +-* the Free Software Foundation, either version 3 of the License, or +-* (at your option) any later version. +-* +-* This program is distributed in the hope that it will be useful, +-* but WITHOUT ANY WARRANTY; without even the implied warranty of +-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-* GNU General Public License for more details. +-* +-* You should have received a copy of the GNU General Public License +-* along with this program. If not, see <https://www.gnu.org/licenses/>. +-*/ +- +-public class Pantheon.Keyboard.InputMethodPage.LanguagesRow : Gtk.ListBoxRow { +- public InstallList language { get; construct; } +- +- public LanguagesRow (InstallList language) { +- Object (language: language); +- } +- +- construct { +- var label = new Gtk.Label (language.get_name ()) { +- halign = Gtk.Align.START, +- hexpand = true +- }; +- +- var caret = new Gtk.Image.from_icon_name ("pan-end-symbolic", Gtk.IconSize.MENU); +- +- var grid = new Gtk.Grid () { +- margin = 3, +- margin_start = 6, +- margin_end = 6 +- }; +- grid.add (label); +- grid.add (caret); +- +- add (grid); +- } +-} +diff --git a/src/meson.build b/src/meson.build +index 28f07c1..a515419 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -16,7 +16,6 @@ plug_files = files( + 'Widgets/Shortcuts/CustomTree.vala', + 'Widgets/Layout/Display.vala', + 'Widgets/Layout/AddLayoutPopover.vala', +- 'Widgets/InputMethod/LanguagesRow.vala', + 'Widgets/InputMethod/EnginesRow.vala', + 'Widgets/InputMethod/AddEnginesPopover.vala', + 'Views/Shortcuts.vala', +@@ -36,11 +35,6 @@ plug_files = files( + 'Layout/AdvancedSettingsGrid.vala', + 'InputMethod/Utils.vala', + 'InputMethod/AddEnginesList.vala', +- 'InputMethod/Installer/UbuntuInstaller.vala', +- 'InputMethod/Installer/InstallList.vala', +- 'InputMethod/Installer/aptd-client.vala', +- 'Dialogs/ProgressDialog.vala', +- 'Dialogs/InstallEngineDialog.vala', + 'Dialogs/ConflictDialog.vala', + ) + + +base-commit: 9d9eddeb7da8450a309496c25066f4f78a9d4070 +-- +git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix new file mode 100644 index 000000000000..06bdce19f45c --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -0,0 +1,68 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, fetchpatch +, substituteAll +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, libxml2 +, libgnomekbd +, libxklavier +, xorg +, ibus +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-keyboard"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-iuv5NZ7v+rXyFsKB/PvGa/7hm9MIV8E6JnTzEGROlhM="; + }; + + patches = [ + ./0001-Remove-Install-Unlisted-Engines-function.patch + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + libxml2 + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + ibus + libgee + libgnomekbd + libxklavier + switchboard + ]; + + meta = with lib; { + description = "Switchboard Keyboard Plug"; + homepage = "https://github.com/elementary/switchboard-plug-keyboard"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix new file mode 100644 index 000000000000..67eeee584a69 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +, elementary-settings-daemon +, glib +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-mouse-touchpad"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-WJ/GRhZsSwC31HEIjHHWBy9/Skqbwor0tNVTedue3kk="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + glib + granite + gtk3 + libgee + elementary-settings-daemon + switchboard + ]; + + meta = with lib; { + description = "Switchboard Mouse & Touchpad Plug"; + homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix new file mode 100644 index 000000000000..fce9402e131f --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -0,0 +1,67 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, substituteAll +, vala +, libgee +, granite +, gtk3 +, networkmanager +, networkmanagerapplet +, libnma +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-network"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-PYgewxBblhOfOJQSeRaq8xD7qZ3083EvgUjpi92FqyI="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + networkmanager + libnma + switchboard + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit networkmanagerapplet; + }) + ]; + + + meta = with lib; { + description = "Switchboard Networking Plug"; + homepage = "https://github.com/elementary/switchboard-plug-network"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch new file mode 100644 index 000000000000..b99f59fb2684 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala +index ba9dc22..a12871a 100644 +--- a/src/Views/VPNPage.vala ++++ b/src/Views/VPNPage.vala +@@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page { + private void try_connection_editor (string args) { + try { + var appinfo = AppInfo.create_from_commandline ( +- "nm-connection-editor %s".printf (args), ++ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), + null, + GLib.AppInfoCreateFlags.NONE + ); +diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala +index 5849b69..7bbd172 100644 +--- a/src/Widgets/SettingsButton.vala ++++ b/src/Widgets/SettingsButton.vala +@@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button { + clicked.connect (() => { + try { + var appinfo = AppInfo.create_from_commandline ( +- "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE ++ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE + ); + + appinfo.launch (null, null); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix new file mode 100644 index 000000000000..8c750710aed9 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, fetchpatch +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +, elementary-notifications +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-notifications"; + version = "2.1.7"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-MBCSQ+4l0mpS2OTDRJ7+91qo0SWm5nJNYO7SZaSoVQk="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + elementary-notifications + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Notifications Plug"; + homepage = "https://github.com/elementary/switchboard-plug-notifications"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix new file mode 100644 index 000000000000..ef12cb38e1b9 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -0,0 +1,86 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, fetchpatch +, pantheon +, meson +, ninja +, pkg-config +, vala_0_46 +, libgee +, granite +, gtk3 +, libaccounts-glib +, libsignon-glib +, json-glib +, librest +, webkitgtk +, libsoup +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-onlineaccounts"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-CVYKcRty5bBEMNyoY51JAJQy6uh+U+7IvS6V/1GMCA4="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala_0_46 + ]; + + buildInputs = [ + granite + gtk3 + json-glib + libaccounts-glib + libgee + libsignon-glib + libsoup + librest + switchboard + webkitgtk + ]; + + patches = [ + # Fix build with latest vala + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch"; + sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf"; + }) + + # fix build with vala 0.48.9 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b1853b7427102b8dd94774e1e2cc455f50902263.patch"; + sha256 = "J3C71GyEHEZWSghGXlwXPHFJRhrvx6i0yvi8NIDb4WE="; + }) + ]; + + PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; + PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; + + + meta = with lib; { + description = "Switchboard Online Accounts Plug"; + homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix new file mode 100644 index 000000000000..97668d35471a --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkg-config, vala, glib +, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop +, gala, wingpanel, elementary-dock, switchboard, gettext, bamf, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-pantheon-shell"; + version = "2.8.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-CHl+4mVjrDg2gusrWOCfI++DZMWKLdvHxG3ZWMjZ2to="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + bamf + elementary-dock + elementary-settings-daemon + gala + gexiv2 + glib + gnome-desktop + granite + gtk3 + libgee + switchboard + wingpanel + ]; + + meta = with lib; { + description = "Switchboard Desktop Plug"; + homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix new file mode 100644 index 000000000000..f0cf47cfdfea --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -0,0 +1,71 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, substituteAll +, meson +, ninja +, pkg-config +, vala +, libgee +, elementary-dpms-helper +, elementary-settings-daemon +, granite +, gtk3 +, glib +, dbus +, polkit +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-power"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-swcbkaHHe9BZxMWvjdRutvYfXXrSCUJWuld1btfYeH0="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + dbus + elementary-dpms-helper + elementary-settings-daemon + glib + granite + gtk3 + libgee + polkit + switchboard + ]; + + patches = [ + (substituteAll { + src = ./dpms-helper-exec.patch; + elementary_dpms_helper = elementary-dpms-helper; + }) + ]; + + meta = with lib; { + description = "Switchboard Power Plug"; + homepage = "https://github.com/elementary/switchboard-plug-power"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch new file mode 100644 index 000000000000..335d3f296262 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch @@ -0,0 +1,13 @@ +diff --git a/src/MainView.vala b/src/MainView.vala +index 1654e68..175f220 100644 +--- a/src/MainView.vala ++++ b/src/MainView.vala +@@ -317,7 +317,7 @@ public class Power.MainView : Gtk.Grid { + + private static void run_dpms_helper () { + try { +- string[] argv = { "io.elementary.dpms-helper" }; ++ string[] argv = { "@elementary_dpms_helper@/bin/io.elementary.dpms-helper" }; + Process.spawn_async (null, argv, Environ.get (), + SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL | SpawnFlags.STDOUT_TO_DEV_NULL, + null, null); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix new file mode 100644 index 000000000000..7387ea34e4de --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -0,0 +1,65 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, fetchpatch +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, cups +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-printers"; + version = "2.1.9"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s="; + }; + + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-printers/commit/5eced5ddda6f229d7265ea0a713f6c1cd181a526.patch"; + sha256 = "lPTNqka6jjvv1JnAqVzVIQBIdDXlCOQ5ASvgZNuEUC8="; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + cups + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Printers Plug"; + homepage = "https://github.com/elementary/switchboard-plug-printers"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix new file mode 100644 index 000000000000..26e26de33b12 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -0,0 +1,78 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, nix-update-script +, pantheon +, meson +, python3 +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, glib +, polkit +, zeitgeist +, switchboard +, lightlocker +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-security-privacy"; + version = "2.2.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ="; + }; + + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/c8e422e630bbee0badcf4df26364c9e83e06bad0.patch"; + sha256 = "5Gm+muZiCraJC5JaGVVo0HDJ7KxjOpclHRW1RKsk3bc="; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + vala + ]; + + buildInputs = [ + glib + granite + gtk3 + libgee + polkit + switchboard + lightlocker + zeitgeist + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with lib; { + description = "Switchboard Security & Privacy Plug"; + homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix new file mode 100644 index 000000000000..6baaed293c9f --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, fetchpatch +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-sharing"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-/M60w14zfAUXspabvTUWlOPRrHvKtCYUio82b034k6s="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + meta = with lib; { + description = "Switchboard Sharing Plug"; + homepage = "https://github.com/elementary/switchboard-plug-sharing"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix new file mode 100644 index 000000000000..10117dd8f957 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, libgee +, granite +, gtk3 +, pulseaudio +, libcanberra +, libcanberra-gtk3 +, switchboard +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-sound"; + version = "2.2.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "sha256-ITgxLZSB4zhSaFKX7Vbf89DGI8ibIcGEQTtLjcGN2tA="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + granite + gtk3 + libcanberra + libcanberra-gtk3 + libgee + pulseaudio + switchboard + ]; + + meta = with lib; { + description = "Switchboard Sound Plug"; + homepage = "https://github.com/elementary/switchboard-plug-sound"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} |