From 0e7b2947771cf25f69545f3caa016ba58a2a6221 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 15:56:49 -0500 Subject: [PATCH 01/16] pantheon.updateScript: support an OAUTH_TOKEN Sometimes I get rate limited. --- pkgs/desktops/pantheon/update.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/update.sh b/pkgs/desktops/pantheon/update.sh index 8d002fe47c2..4897697d94f 100755 --- a/pkgs/desktops/pantheon/update.sh +++ b/pkgs/desktops/pantheon/update.sh @@ -114,7 +114,26 @@ EOF function get_latest_tag ( ) { repo_name="$1" - curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name' + OAUTH_TOKEN=$(printenv OAUTH_TOKEN) + + if [ -n "$OAUTH_TOKEN" ]; then + curl \ + --silent \ + --show-error \ + --fail \ + -X GET \ + --header "Authorization: token $OAUTH_TOKEN" \ + "https://api.github.com/repos/elementary/$repo_name/releases/latest" \ + | jq -r '.tag_name' + else + curl \ + --silent \ + --show-error \ + --fail \ + -X GET \ + "https://api.github.com/repos/elementary/$repo_name/releases/latest" \ + | jq -r '.tag_name' + fi } # From 3b7f41130017669eaa182284b59d7d7fff043b72 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:18:03 -0500 Subject: [PATCH 02/16] pantheon.elementary-calculator: 1.5.3 -> 1.5.4 https://github.com/elementary/calculator/releases/tag/1.5.4 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 4cdaacddbeb..3c73de6e7a9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.5.3"; + version = "1.5.4"; repoName = "calculator"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0ibnj3zm93p8ghiy8gbbm0vlig9mnqjsvvp1cpw62dnap0qixdcg"; + sha256 = "0053bdzn5viqlni6qg6q39nma6bsddmhnafa0mzggiv8l4qasbrx"; }; passthru = { From 6bd1a2222cddc8bc24c773fcbf450e9a6874735d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:18:38 -0500 Subject: [PATCH 03/16] pantheon.elementary-videos: 2.6.3 -> 2.7.0 https://github.com/elementary/videos/releases/tag/2.7.0 --- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 9132707db2b..e934a944df8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.6.3"; + version = "2.7.0"; repoName = "videos"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx"; + sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7"; }; passthru = { From 5ddded73dca228e2c8bf056f2f2176c916aaa27f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:27:13 -0500 Subject: [PATCH 04/16] pantheon.elementary-wallpapers: 5.4 -> 5.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now uses meson build system 💖. https://github.com/elementary/wallpapers/releases/tag/5.5.0 --- .../artwork/elementary-wallpapers/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index c48dd761e08..8a497372862 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,11 +1,14 @@ { stdenv , fetchFromGitHub , pantheon +, meson +, ninja +, gettext }: stdenv.mkDerivation rec { pname = "elementary-wallpapers"; - version = "5.4"; + version = "5.5.0"; repoName = "wallpapers"; @@ -13,9 +16,15 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1ihvv9v8m5f2n2v3bgg769l52wbg241zgp3d45q6phk7p8s1gz3s"; + sha256 = "0c63nds2ylqgcp39s13mfwhipgyw8cirn0bhybp291l5g86ii6s3"; }; + nativeBuildInputs = [ + gettext + meson + ninja + ]; + passthru = { updateScript = pantheon.updateScript { inherit repoName; @@ -23,14 +32,6 @@ stdenv.mkDerivation rec { }; }; - dontBuild = true; - dontConfigure = true; - - installPhase = '' - mkdir -p $out/share/backgrounds/elementary - cp -av *.jpg $out/share/backgrounds/elementary - ''; - meta = with stdenv.lib; { description = "Collection of wallpapers for elementary"; homepage = https://github.com/elementary/wallpapers; From 5f8ae4ab94f9b6f88eb41262de5a5b9dd4fa263c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:37:39 -0500 Subject: [PATCH 05/16] pantheon.wingpanel-applications-menu: 2.4.4 -> 2.5.0 https://github.com/elementary/applications-menu/releases/tag/2.5.0 --- .../applications-menu/default.nix | 11 ++++----- .../applications-menu/fix-paths.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index a266223eced..ca9abadf9ba 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.4.4"; + version = "2.5.0"; repoName = "applications-menu"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "09ssxn264v6nzrxgk529kpdxq5j3b14z8mbwq0gni1bgjcla773d"; + sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d"; }; passthru = { @@ -73,13 +73,10 @@ stdenv.mkDerivation rec { "--sysconfdir=${placeholder "out"}/etc" ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - patches = [ (substituteAll { - src = ./bc.patch; - exec = "${bc}/bin/bc"; + src = ./fix-paths.patch; + bc = "${bc}/bin/bc"; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch new file mode 100644 index 00000000000..25e3891a205 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch @@ -0,0 +1,24 @@ +diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala +index 18ca3af..f5d1076 100644 +--- a/src/synapse-plugins/calculator-plugin.vala ++++ b/src/synapse-plugins/calculator-plugin.vala +@@ -44,9 +44,7 @@ namespace Synapse { + _("Calculator"), + _("Calculate basic expressions."), + "accessories-calculator", +- register_plugin, +- Environment.find_program_in_path ("bc") != null, +- _("bc is not installed") ++ register_plugin + ); + } + +@@ -87,7 +85,7 @@ namespace Synapse { + if (matched) { + Pid pid; + int read_fd, write_fd; +- string[] argv = {"bc", "-l"}; ++ string[] argv = {"@bc@", "-l"}; + string? solution = null; + + try { From 1ab687e92f2dd61df2f58b0ebd31b7adf2973025 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:39:50 -0500 Subject: [PATCH 06/16] pantheon.wingpanel-indicator-bluetooth: 2.1.3 -> 2.1.4 https://github.com/elementary/wingpanel-indicator-bluetooth/releases/tag/2.1.4 --- .../desktop/wingpanel-indicators/bluetooth/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 3a462219f1e..965d9800c5b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9"; + sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1"; }; passthru = { @@ -48,8 +48,6 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py From 6761cd3da9fd1a1ef03061632ebd96ed5bab4d07 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:40:32 -0500 Subject: [PATCH 07/16] pantheon.wingpanel-indicator-notifications: 2.1.2 -> 2.1.4 https://github.com/elementary/wingpanel-indicator-notifications/releases/tag/2.1.3 --- .../desktop/wingpanel-indicators/notifications/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 4dbf6528c70..78512b341bb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1960s3xcsx6yjlnk0csf1m66s1z1sj5rym9b2fy7pm2nan47z3ld"; + sha256 = "1lx023z7xxlgwh0br48fw5w7xw673p2sqxwl1gz9f54xx7rv81py"; }; passthru = { @@ -44,8 +44,6 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - meta = with stdenv.lib; { description = "Notifications Indicator for Wingpanel"; homepage = https://github.com/elementary/wingpanel-indicator-notifications; From 8e2d53c570f6757a59f1532c9d224804beb5b69d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:41:23 -0500 Subject: [PATCH 08/16] pantheon.wingpanel-indicator-session: 2.2.5 -> 2.2.6 https://github.com/elementary/wingpanel-indicator-session/releases/tag/2.2.6 --- .../desktop/wingpanel-indicators/session/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 7efb03f9d66..c80da53986a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0lqh9g6qq09m744gncspm79lbwx1vjl1d6j2szwcq9f0jdm01pm5"; + sha256 = "0pzknbm0hg4kf2izfg1mcmyildfzwyq1hh0xhlq16gsmakq4ld26"; }; passthru = { @@ -44,8 +44,6 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - meta = with stdenv.lib; { description = "Session Indicator for Wingpanel"; homepage = https://github.com/elementary/wingpanel-indicator-session; From df58afae558c732685c8c4fca700576a577412ce Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:42:00 -0500 Subject: [PATCH 09/16] pantheon.wingpanel-indicator-sound: 2.1.3 -> 2.1.4 https://github.com/elementary/wingpanel-indicator-sound/releases/tag/2.1.4 --- .../pantheon/desktop/wingpanel-indicators/sound/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index fa89cca68c0..12654ff5509 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0lgjl969c7s31nszh6d4pr1vsxfdsizplsihvd8r02mm1mlxmsda"; + sha256 = "00r3dqkyp7k34xwn12l0dbzfmz70084lblxchykmk77pgzid2a0b"; }; passthru = { @@ -52,8 +52,6 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py From e85797486770ec5250d494636d4aa4e59b17d70c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:42:41 -0500 Subject: [PATCH 10/16] pantheon.elementary-capnet-assist: 2.2.3 -> 2.2.4 https://github.com/elementary/capnet-assist/releases/tag/2.2.4 --- .../pantheon/services/elementary-capnet-assist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 6305c872b2f..b4982fcf6be 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.2.3"; + version = "2.2.4"; repoName = "capnet-assist"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji"; + sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1"; }; passthru = { From 23b11cc24c6912cee35d8d23c18cec283edac00c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 20:43:52 -0500 Subject: [PATCH 11/16] pantheon.elementary-calendar: 2019-10-29 -> 5.0.3 https://github.com/elementary/calendar/releases/tag/5.0.1 https://github.com/elementary/calendar/releases/tag/5.0.2 https://github.com/elementary/calendar/releases/tag/5.0.3 --- .../desktops/pantheon/apps/elementary-calendar/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 4e5f69fc9e6..4f4244fa03e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -25,22 +25,21 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "unstable-2019-10-29"; + version = "5.0.3"; repoName = "calendar"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "7d201fc5ea9e8dc25c46427397594fcab2016ed6"; # needed for libical 2.0 compat - sha256 = "11bqf3nxrj1sfd0qq5h0jsmimc6mwkd2g7q9ycizn9x5ak2gb8xi"; + rev = version; + sha256 = "1dqcmh585fjib4m8bs7qy23fv429s7q9nbcqnn0vvmy1n36fic4m"; }; passthru = { updateScript = pantheon.updateScript { inherit repoName; attrPath = pname; - versionPolicy = "master"; }; }; From 1575b3971cc0fb5cb4d088f67548b719b417e3f6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 22:25:15 -0500 Subject: [PATCH 12/16] pantheon.switchboard-with-plugs: don't use hardcode patches There are really becoming a pain to maintain. --- .../mouse-touchpad/default.nix | 10 +-- .../hardcode-settings-daemon-gsettings.patch | 76 ------------------- .../pantheon-shell/default.nix | 12 +-- .../pantheon-shell/hardcode-gsettings.patch | 39 ---------- .../apps/switchboard-plugs/power/default.nix | 10 +-- .../power/hardcode-gsettings.patch | 20 ----- .../security-privacy/default.nix | 10 +-- .../security-privacy/hardcode-gsettings.patch | 33 -------- .../pantheon/apps/switchboard/wrapper.nix | 21 +++-- 9 files changed, 22 insertions(+), 209 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 7578b779058..e5ef82fbf79 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -24,15 +24,6 @@ stdenv.mkDerivation rec { sha256 = "1cg69nbdf4mcr16mi71aw9j8877lyj8yxjfk9bd3sml8f4fh7mmr"; }; - patches = [ - ./hardcode-settings-daemon-gsettings.patch - ]; - - postPatch = '' - substituteInPlace src/Views/Clicking.vala \ - --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon} - ''; - passthru = { updateScript = pantheon.updateScript { repoName = pname; @@ -51,6 +42,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + elementary-settings-daemon switchboard ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch deleted file mode 100644 index 591ed9fc152..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/Views/Clicking.vala b/src/Views/Clicking.vala -index cc4431b..d12ddfe 100644 ---- a/src/Views/Clicking.vala -+++ b/src/Views/Clicking.vala -@@ -123,42 +123,39 @@ public class MouseTouchpad.ClickingView : Granite.SimpleSettingsPage { - content_area.attach (hold_scale, 3, 3); - content_area. attach (hold_help, 1, 4, 3); - -- var xsettings_schema = SettingsSchemaSource.get_default ().lookup ( -- "org.gnome.settings-daemon.plugins.xsettings", -- true -- ); -- -- if (xsettings_schema != null) { -- var primary_paste_switch = new Gtk.Switch (); -- primary_paste_switch.halign = Gtk.Align.START; -+ SettingsSchemaSource daemon_schema_source = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS@", null, true); -+ SettingsSchema xsettings_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.plugins.xsettings", false); - -- var primary_paste_help = new Gtk.Label ( -- _("Middle or three-finger clicking on an input will paste any selected text") -- ); -- primary_paste_help.margin_bottom = 18; -- primary_paste_help.wrap = true; -- primary_paste_help.xalign = 0; -- primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); -- -- content_area.attach (new SettingLabel (_("Middle click paste:")), 0, 5); -- content_area.attach (primary_paste_switch, 1, 5); -- content_area.attach (primary_paste_help, 1, 6, 3); -- -- var xsettings = new GLib.Settings ("org.gnome.settings-daemon.plugins.xsettings"); -- primary_paste_switch.notify["active"].connect (() => { -- on_primary_paste_switch_changed (primary_paste_switch, xsettings); -- }); -+ var primary_paste_switch = new Gtk.Switch (); -+ primary_paste_switch.halign = Gtk.Align.START; - -- var current_value = xsettings.get_value ("overrides").lookup_value ( -- "Gtk/EnablePrimaryPaste", -- VariantType.INT32 -- ); -- if (current_value != null) { -- primary_paste_switch.active = current_value.get_int32 () == 1; -- } -+ var primary_paste_help = new Gtk.Label ( -+ _("Middle or three-finger clicking on an input will paste any selected text") -+ ); -+ primary_paste_help.margin_bottom = 18; -+ primary_paste_help.wrap = true; -+ primary_paste_help.xalign = 0; -+ primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); -+ -+ content_area.attach (new SettingLabel (_("Middle click paste:")), 0, 5); -+ content_area.attach (primary_paste_switch, 1, 5); -+ content_area.attach (primary_paste_help, 1, 6, 3); -+ -+ var xsettings = new GLib.Settings.full (xsettings_schema, null, null); -+ primary_paste_switch.notify["active"].connect (() => { -+ on_primary_paste_switch_changed (primary_paste_switch, xsettings); -+ }); -+ -+ var current_value = xsettings.get_value ("overrides").lookup_value ( -+ "Gtk/EnablePrimaryPaste", -+ VariantType.INT32 -+ ); -+ if (current_value != null) { -+ primary_paste_switch.active = current_value.get_int32 () == 1; - } - -- var daemon_settings = new GLib.Settings ("org.gnome.settings-daemon.peripherals.mouse"); -+ SettingsSchema daemon_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.peripherals.mouse", false); -+ var daemon_settings = new GLib.Settings.full (daemon_schema, null, null); - daemon_settings.bind ("double-click", double_click_speed_adjustment, "value", SettingsBindFlags.DEFAULT); - - var a11y_mouse_settings = new GLib.Settings ("org.gnome.desktop.a11y.mouse"); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index cd48b9d1d78..f8fdb01aee6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -36,24 +36,16 @@ stdenv.mkDerivation rec { granite gtk3 libgee + gala + wingpanel plank switchboard ]; patches = [ ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded - ./hardcode-gsettings.patch ]; - postPatch = '' - substituteInPlace src/Views/Appearance.vala \ - --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala} - substituteInPlace src/Views/HotCorners.vala \ - --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala} - substituteInPlace src/Views/Appearance.vala \ - --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel} - ''; - meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch deleted file mode 100644 index d337cf2e7b7..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala -index c8300cc..fc48a0e 100644 ---- a/src/Views/Appearance.vala -+++ b/src/Views/Appearance.vala -@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid { - attach (text_size_label, 0, 2); - attach (text_size_modebutton, 1, 2); - -- var animations_settings = new Settings (ANIMATIONS_SCHEMA); -+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema animations_schema = gala_schema_source.lookup (ANIMATIONS_SCHEMA, false); -+ -+ var animations_settings = new Settings.full (animations_schema, null, null); - animations_settings.bind (ANIMATIONS_KEY, animations_switch, "active", SettingsBindFlags.DEFAULT); - -- var panel_settings = new Settings (PANEL_SCHEMA); -+ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false); -+ -+ var panel_settings = new GLib.Settings.full (panel_schema, null, null); - panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT); - - var interface_settings = new Settings (INTERFACE_SCHEMA); -diff --git a/src/Views/HotCorners.vala b/src/Views/HotCorners.vala -index 481e7c5..d102d03 100644 ---- a/src/Views/HotCorners.vala -+++ b/src/Views/HotCorners.vala -@@ -30,7 +30,10 @@ public class HotCorners : Gtk.Grid { - row_spacing = 24; - halign = Gtk.Align.CENTER; - -- behavior_settings = new GLib.Settings ("org.pantheon.desktop.gala.behavior"); -+ -+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema behavior_schema = gala_schema_source.lookup ("org.pantheon.desktop.gala.behavior", false); -+ behavior_settings = new GLib.Settings.full (behavior_schema, null, null); - - custom_command_revealer = new Gtk.Revealer (); - diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 1639181193a..9ace7219ee0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus + elementary-dpms-helper + elementary-settings-daemon glib granite gtk3 @@ -56,16 +58,8 @@ stdenv.mkDerivation rec { src = ./dpms-helper-exec.patch; elementary_dpms_helper = elementary-dpms-helper; }) - ./hardcode-gsettings.patch ]; - postPatch = '' - substituteInPlace src/MainView.vala \ - --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper} - substituteInPlace src/MainView.vala \ - --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon} - ''; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services"; PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch deleted file mode 100644 index caacdad6eda..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/MainView.vala b/src/MainView.vala -index 1654e68..ad8fed9 100644 ---- a/src/MainView.vala -+++ b/src/MainView.vala -@@ -46,8 +46,13 @@ public class Power.MainView : Gtk.Grid { - - var label_size = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); - -- settings = new GLib.Settings ("org.gnome.settings-daemon.plugins.power"); -- elementary_dpms_settings = new GLib.Settings ("io.elementary.dpms"); -+ SettingsSchemaSource gsd_sss = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS_PATH@", null, true); -+ SettingsSchema gsd_schema = gsd_sss.lookup ("org.gnome.settings-daemon.plugins.power", false); -+ settings = new GLib.Settings.full (gsd_schema, null, null); -+ -+ SettingsSchemaSource dpms_sss = new SettingsSchemaSource.from_directory ("@DPMS_HELPER_GSETTINGS_PATH@", null, true); -+ SettingsSchema elementary_dpms_schema = dpms_sss.lookup ("io.elementary.dpms", false); -+ elementary_dpms_settings = new GLib.Settings.full (elementary_dpms_schema, null, null); - - battery = new Battery (); - power_supply = new PowerSupply (); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 5c72af92397..e8d21478cc9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -48,21 +48,13 @@ stdenv.mkDerivation rec { libgee polkit switchboard + lightlocker zeitgeist ]; - patches = [ - ./hardcode-gsettings.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py - - substituteInPlace src/Views/LockPanel.vala \ - --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker} - substituteInPlace src/Views/FirewallPanel.vala \ - --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch deleted file mode 100644 index 24a104248f8..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala -index 0335c29..481b1c8 100644 ---- a/src/Views/FirewallPanel.vala -+++ b/src/Views/FirewallPanel.vala -@@ -49,7 +49,11 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage { - } - - construct { -- settings = new Settings ("io.elementary.switchboard.security-privacy"); -+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false); -+ -+ settings = new Settings.full (security_privacy_schema, null, null); -+ - disabled_rules = new Gee.HashMap (); - load_disabled_rules (); - -diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala -index 4f523f9..7135a83 100644 ---- a/src/Views/LockPanel.vala -+++ b/src/Views/LockPanel.vala -@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage { - } - - construct { -- locker = new Settings ("apps.light-locker"); -+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@LIGHTLOCKER_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema locker_schema = sss.lookup ("apps.light-locker", false); -+ -+ locker = new Settings.full (locker_schema, null, null); - - var lock_suspend_label = new Gtk.Label (_("Lock on suspend:")); - var lock_suspend_switch = new Gtk.Switch (); diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 756ae86bb19..c0abb172806 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -1,4 +1,6 @@ -{ makeWrapper +{ wrapGAppsHook +, glib +, lib , symlinkJoin , switchboard , switchboardPlugs @@ -11,13 +13,22 @@ in symlinkJoin { name = "${switchboard.name}-with-plugs"; - paths = [ switchboard ] ++ selectedPlugs; + paths = [ + switchboard + ] ++ selectedPlugs; - buildInputs = [ makeWrapper ]; + buildInputs = [ + wrapGAppsHook + glib + ] ++ (lib.forEach selectedPlugs (x: x.buildInputs)) + ++ selectedPlugs; postBuild = '' - wrapProgram $out/bin/io.elementary.switchboard \ - --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard" + make_glib_find_gsettings_schemas + + gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard") + + wrapGAppsHook ''; inherit (switchboard) meta; From a0f3043189569de5ed08fdeebd883c69254189cb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 22:25:40 -0500 Subject: [PATCH 13/16] pantheon.switchboard-plug-power: don't override pkgconfig We submitted a patch upstream to fix this. --- .../pantheon/apps/switchboard-plugs/power/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 9ace7219ee0..df2051d8040 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -60,11 +60,6 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services"; - PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc"; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - meta = with stdenv.lib; { description = "Switchboard Power Plug"; homepage = https://github.com/elementary/switchboard-plug-power; From 5b2f269fd8499752c775c1c2b5b67aa2ba432db9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Nov 2019 22:30:54 -0500 Subject: [PATCH 14/16] pantheon.wingpanel: wrap in the same way as switchboard --- .../pantheon/desktop/wingpanel/wrapper.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 6b554d89caa..253c61b7790 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -1,5 +1,6 @@ { lib -, makeWrapper +, wrapGAppsHook +, glib , symlinkJoin , wingpanel , wingpanelIndicators @@ -13,17 +14,27 @@ in symlinkJoin { name = "${wingpanel.name}-with-indicators"; - paths = [ wingpanel ] ++ selectedIndicators; + paths = [ + wingpanel + ] ++ selectedIndicators; - buildInputs = [ makeWrapper ]; + buildInputs = [ + glib + wrapGAppsHook + ] ++ (lib.forEach selectedIndicators (x: x.buildInputs)) + ++ selectedIndicators; # We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu # has a plugin to search switchboard settings postBuild = '' - wrapProgram $out/bin/wingpanel \ - --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \ - --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \ - --suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators} + make_glib_find_gsettings_schemas + + gappsWrapperArgs+=( + --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" + --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" + ) + + wrapGAppsHook ''; inherit (wingpanel) meta; From e43b2033313f7e8dc5d3766a80ec76f212424313 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 1 Dec 2019 17:41:13 -0500 Subject: [PATCH 15/16] pantheon.switchboard-plug-mouse-touchpad: 2.3.0 -> 2.3.1 https://github.com/elementary/switchboard-plug-mouse-touchpad/releases/tag/2.3.1 --- .../apps/switchboard-plugs/mouse-touchpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index e5ef82fbf79..c7f2fcce458 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1cg69nbdf4mcr16mi71aw9j8877lyj8yxjfk9bd3sml8f4fh7mmr"; + sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn"; }; passthru = { From 8d29ff6209b147f1fff8203d49667aadc8206cab Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 1 Dec 2019 17:42:53 -0500 Subject: [PATCH 16/16] pantheon.wingpanel-indicator-datetime: 2.2.0 -> 2.2.1 https://github.com/elementary/wingpanel-indicator-datetime/releases/tag/2.2.1 --- .../desktop/wingpanel-indicators/datetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 91549342052..a356b9c15d9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1whdx0vgm0qbbzsw8dg2liz3cbh3ad5ybkriy4lmx5ynyhpbz0sx"; + sha256 = "0y8lfrrkzcj8nw94jqawbxr4jz41ac0z539kkr3n3x0qmx72md2y"; }; passthru = {