From 0ec78fe13131955594a0fc90e312bf34a062f4c1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:12:41 -0400 Subject: [PATCH 01/13] pantheon.appcenter: 3.2.3 -> 3.2.4 https://github.com/elementary/appcenter/releases/tag/3.2.4 --- pkgs/desktops/pantheon/apps/appcenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 81415420873..9b1178403ea 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "12gql86vn12zbkw368blxk0cl9fgs22dyj02xnimjc8b6s80yib4"; + sha256 = "0nhgf5lgy74liml3kzijldan3qgrxh2721yvjdk4jf83b0g1b7yb"; }; passthru = { From d484e6a9e979ba5276cadc7cfea7786bb48af813 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:13:16 -0400 Subject: [PATCH 02/13] pantheon.elementary-photos: 2.6.5 -> 2.7.0 https://github.com/elementary/photos/releases/tag/2.7.0 --- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index ea74686e504..77dba6c7214 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.6.5"; + version = "2.7.0"; repoName = "photos"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0r6d9y936nw4bn0jvixi1p62dy8qsgl2bx8g3889fndnhfnhbjv0"; + sha256 = "09jjic165rmprc2cszsgj2m3j3f5p8v9pxx5mj66a0gj3ar3hfbd"; }; passthru = { From cac487d149839ced694be2a2168ad4383681769e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:13:47 -0400 Subject: [PATCH 03/13] pantheon.wingpanel: 2020-04-04 -> 2.3.1 no changes --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index b5a5f9395c6..0fe63ace387 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "unstable-2020-04-04"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "366f0f6ffa59f7ee2583d000dd334cb764f9a2b8"; - sha256 = "172r1k8m1saq80q6g2hxy4ajks8liaw9pl6lixasrzi2hsnrx53h"; + rev = version; + sha256 = "0yvn1crylrdc9gq6gc7v4ynb5ii4n0c3bnswfq72p8cs3vvvvv24"; }; passthru = { From b810ce57f7d23e43a5b5b4e1fea9a14b6ca25180 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:14:34 -0400 Subject: [PATCH 04/13] pantheon.pantheon-agent-polkit: 1.0.0 -> 1.0.1 just translations --- .../pantheon/services/pantheon-agent-polkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index f244e0e4637..52518a628f8 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1yybblprcn0cgcf9j76yckqcimm4h8l41cczxjvgp789p1pki3bn"; + sha256 = "137809mplrsff1isxwbwa2v2y9ixhwzm4khiijm4mmjchi75wpvx"; }; passthru = { From 082d977eacb07d7d01a5457e61109c1c265952b3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:16:00 -0400 Subject: [PATCH 05/13] pantheon.elementary-capnet-assist: 2.2.4 -> 2.2.5 just translations --- .../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 d41750f8dfc..ca597eccf96 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.4"; + version = "2.2.5"; repoName = "capnet-assist"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1"; + sha256 = "09pl1ynrmqjj844np4ww2i18z7kgx5kmj5ggfp8lqmxgsny7g8m3"; }; passthru = { From ac2f83c1ad55d878137eb2812b828c0c5c897362 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:18:30 -0400 Subject: [PATCH 06/13] pantheon.wingpanel-indicators-bluetooth: 2.1.4 -> 2.1.5 --- .../desktop/wingpanel-indicators/bluetooth/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 93ddb0e1dee..8bd7b8a9315 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -7,6 +7,7 @@ , ninja , vala , gtk3 +, glib , granite , libnotify , wingpanel @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1"; + sha256 = "0ylbpai05b300h07b94xcmw9xi7qx13l1q38zlg2n95d3c5264dp"; }; passthru = { @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + glib # for glib-compile-schemas libxml2 meson ninja @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glib granite gtk3 libgee From 45e3470ae478b90a6c6d00fdb2d9112ebb2906ad Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:19:22 -0400 Subject: [PATCH 07/13] pantheon.switchboard-plug-about: 2.6.1 -> 2.6.2 just translations --- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d501cba7c06..bec5c45386c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71"; + sha256 = "1cjhip0abc0y5w6cqnjcgi48bfrackp45gz7955l66hxhnm5wyw6"; }; passthru = { From a86f2a18ad70bfd8e4c4e10caeb309445f7d9d99 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:20:04 -0400 Subject: [PATCH 08/13] pantheon.switchboard-plug-display: 2.2.0 -> 2.2.1 https://github.com/elementary/switchboard-plug-display/releases/tag/2.2.1 --- .../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index bd9669e2499..f81c0b76eb7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-display"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh"; + sha256 = "1racp0mxiaix9afx25ryskdcyi335fz8yh8nwgdxbqbm6jpyq4zs"; }; passthru = { From c8a38c9ee14e5322f5ee7f2bc8d0bf4c6671cf75 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:20:43 -0400 Subject: [PATCH 09/13] pantheon.switchboard-plug-applications: 2.1.6 -> 2.1.7 https://github.com/elementary/switchboard-plug-applications/releases/tag/2.1.7 --- .../pantheon/apps/switchboard-plugs/applications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 0d0a7507afe..0c8dc6b4c77 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg"; + sha256 = "0wzm390g8di4ks3w637a0wl4j7g89j321xkz5msd9058gksvaaxs"; }; passthru = { From cc1550c1acf0abc8b6c4f1ad742b8986797dd0f2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:21:15 -0400 Subject: [PATCH 10/13] pantheon.switchboard-plug-mouse-touchpad: 2.4.0 -> 2.4.1 https://github.com/elementary/switchboard-plug-mouse-touchpad/releases/tag/2.4.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 5a4eaf79b38..d44d3580a15 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.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7"; + sha256 = "19y1n05pc3j0px5pql5338vzrq6hjw209s8l2l70ha4i4r978qir"; }; passthru = { From 3c4cf5db81dd0413874f286da397fe0a705314b3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:23:26 -0400 Subject: [PATCH 11/13] pantheon.switchboard-plug-pantheon-shell: 2.8.2 -> 2.8.3 Don't need backgrounds patch anymore because of my patch upstream [0] https://github.com/elementary/switchboard-plug-pantheon-shell/releases/tag/2.8.3 [0]: https://github.com/elementary/switchboard-plug-pantheon-shell/commit/541b1711feb7c7c44a8985eb9fd3ec05ac60bafd --- .../pantheon-shell/backgrounds.patch | 26 ------------------- .../pantheon-shell/default.nix | 8 ++---- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch deleted file mode 100644 index a1b019179d1..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/set-wallpaper-contract/set-wallpaper.vala b/set-wallpaper-contract/set-wallpaper.vala -index 3e02089..7ce7041 100644 ---- a/set-wallpaper-contract/set-wallpaper.vala -+++ b/set-wallpaper-contract/set-wallpaper.vala -@@ -38,7 +38,7 @@ namespace SetWallpaperContractor { - - """; - -- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds"; -+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds"; - - private int delay_value = 60; - -diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala -index 4be14fa..aa8832f 100644 ---- a/src/Views/Wallpaper.vala -+++ b/src/Views/Wallpaper.vala -@@ -38,7 +38,7 @@ public class Wallpaper : Gtk.Grid { - FileAttribute.THUMBNAIL_IS_VALID - }; - -- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds"; -+ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds"; - - public Switchboard.Plug plug { get; construct set; } - private GLib.Settings settings; 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 ab9ecbc5a33..d806271d789 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z"; + sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8"; }; passthru = { @@ -42,10 +42,6 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded - ]; - meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; From e7d592edb6d8b32e673a7a45de3be8cfcfa92088 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:24:56 -0400 Subject: [PATCH 12/13] pantheon.switchboard-plug-security-privacy: 2.2.2 -> 2.2.3 * gtk toolbar to actionbar https://github.com/elementary/switchboard-plug-security-privacy/releases/tag/2.2.3 --- .../apps/switchboard-plugs/security-privacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9d457aedc96..4e26137613a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1dwq9rqswgnnglhrgcpvrp6shn3pb4x8f8f23x84sqakb430idp7"; + sha256 = "1rgbw2kfcq7cdpvl6sy6r6d4iprm1j2n3knbnbxy8sylfc83bwri"; }; passthru = { From dd805599a92933e407489505f294cdd34c485559 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 10 Apr 2020 12:26:32 -0400 Subject: [PATCH 13/13] pantheon.wingpanel-applications-menu: 2.5.0 -> 2.6.0 https://github.com/elementary/applications-menu/releases/tag/2.6.0 --- .../applications-menu/bc.patch | 24 ------------------- .../applications-menu/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch deleted file mode 100644 index 264a4a5b26d..00000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lib/synapse-plugins/calculator-plugin.vala b/lib/synapse-plugins/calculator-plugin.vala -index 1b5fa06..076c0c7 100644 ---- a/lib/synapse-plugins/calculator-plugin.vala -+++ b/lib/synapse-plugins/calculator-plugin.vala -@@ -51,9 +51,7 @@ namespace Synapse { - _("Calculator"), - _("Calculate basic expressions."), - "accessories-calculator", -- register_plugin, -- Environment.find_program_in_path ("bc") != null, -- _("bc is not installed")); -+ register_plugin); - } - - static construct { -@@ -90,7 +88,7 @@ namespace Synapse { - if (matched) { - Pid pid; - int read_fd, write_fd; -- string[] argv = {"bc", "-l"}; -+ string[] argv = {"@exec@", "-l"}; - string? solution = null; - - try { 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 34c29c1b72a..bd2c1c66f72 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.5.0"; + version = "2.6.0"; repoName = "applications-menu"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d"; + sha256 = "16ki1x6697jmfqajynx2zvwqrpjpshnd08y7vf6g7xc7zwwh38c5"; }; passthru = {