From c54a8f58b45cec6a48ba2ff957a66209a124422d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Nov 2022 08:56:29 +0800 Subject: [PATCH 1/6] pantheon.elementary-calendar: 6.1.1 -> 6.1.2 --- .../pantheon/apps/elementary-calendar/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index d90a56af2bb6..404935756ddb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; rev = version; - sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo="; + sha256 = "sha256-psUVgl/7pmmf+8dP8ghBx5C1u4UT9ncXuVYvDJOYeOI="; }; patches = [ @@ -40,13 +40,6 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch"; sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; }) - - # GridDay: Fix day in month in grid with GLib 2.73.1+ - # https://github.com/elementary/calendar/pull/763 - (fetchpatch { - url = "https://github.com/elementary/calendar/commit/20b0983c85935bedef065b786ec8bbca55ba7d9e.patch"; - sha256 = "sha256-Tw9uNqqRAC+vOp7EWzZVeDmZxt3hTGl9UIP21FcunqA="; - }) ]; nativeBuildInputs = [ From 61d4e5b8652ad96f06313950c77ad31f48d7c631 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Nov 2022 08:58:05 +0800 Subject: [PATCH 2/6] pantheon.elementary-files: 6.2.0 -> 6.2.1 --- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index e34f0b901daf..bc91455fe389 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.2.0"; + version = "6.2.1"; outputs = [ "out" "dev" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-V1otkc1Og7J/A68j+4MrJzOtAH6PHSfj5fSpjKhhwo4="; + sha256 = "sha256-pJFeMG2aGaMkS00fSoRlMR2YSg5YzwqwaQT8G7Gk5S4="; }; nativeBuildInputs = [ From b37c519c1aadea7f7f91bef05137fa1996d89ab3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Nov 2022 09:00:37 +0800 Subject: [PATCH 3/6] pantheon.elementary-photos: 2.7.5 -> 2.8.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 7edbc04e3ede..218a89a7d5b1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.5"; + version = "2.8.0"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-zM32+bva+QD1Z/0vUD7K0/tnSzo+7GGLjJ1ytr64c0I="; + sha256 = "sha256-VhJggQMy1vk21zNA5pR4uAPGCwnIxLUHVO58AZs+h6s="; }; nativeBuildInputs = [ From b18da0dfe8fa0c6a36447e4cef0b1a7dd638f2c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Nov 2022 09:06:23 +0800 Subject: [PATCH 4/6] pantheon.elementary-greeter: 6.1.0 -> 6.1.1 --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index d8aa9483abef..72d06e8a11fb 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "sha256-CY+dPSyQ/ovSdI80uEipDdnWy1KjbZnwpn9sd8HrbPQ="; + sha256 = "sha256-6rjZOX9JOTjZwqWVWTtKjGNy8KgWllE9VQZzwhuBAwE="; }; patches = [ From 51244a007b3cd93531bd3f68099b1822c289ee3b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Nov 2022 09:15:33 +0800 Subject: [PATCH 5/6] pantheon.wingpanel-applications-menu: 2.10.2 -> 2.11.0 --- .../applications-menu/default.nix | 6 ++- .../applications-menu/fix-paths.patch | 46 +++++++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) 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 badfec690eb5..ec3edff71cd6 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "elementary"; repo = "applications-menu"; rev = version; - sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk="; + sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M="; }; patches = [ @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + doCheck = true; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; 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 index aea828b36336..29b26c4bdd23 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch @@ -1,8 +1,21 @@ -diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala -index 886a44cd..a4601da6 100644 ---- a/src/synapse-plugins/calculator-plugin.vala -+++ b/src/synapse-plugins/calculator-plugin.vala -@@ -50,9 +50,7 @@ namespace Synapse { +diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala +index 542e7aa..228c6d7 100644 +--- a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala ++++ b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala +@@ -83,7 +83,7 @@ namespace Synapse { + Pid pid; + int read_fd, write_fd; + /* Must include math library to get non-integer results and to access standard math functions */ +- string[] argv = {"bc", "-l"}; ++ string[] argv = {"@bc@", "-l"}; + + Process.spawn_async_with_pipes ( + null, argv, null, +diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala +index d14f1de..35c8621 100644 +--- a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala ++++ b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala +@@ -49,9 +49,7 @@ namespace Synapse { _("Calculator"), _("Calculate basic expressions."), "accessories-calculator", @@ -13,12 +26,17 @@ index 886a44cd..a4601da6 100644 ); } -@@ -94,7 +92,7 @@ namespace Synapse { - Pid pid; - int read_fd, write_fd; - /* Must include math library to get non-integer results and to access standard math functions */ -- string[] argv = {"bc", "-l"}; -+ string[] argv = {"@bc@", "-l"}; - string? solution = null; - - try { +diff --git a/src/synapse-plugins/converter-plugin/converter-plugin.vala b/src/synapse-plugins/converter-plugin/converter-plugin.vala +index 8d230cc..ed31927 100644 +--- a/src/synapse-plugins/converter-plugin/converter-plugin.vala ++++ b/src/synapse-plugins/converter-plugin/converter-plugin.vala +@@ -46,9 +46,7 @@ namespace Synapse { + _("Converter"), + _("Convert between units."), + "accessories-converter", +- register_plugin, +- Environment.find_program_in_path ("bc") != null, +- _("bc is not installed") ++ register_plugin + ); + } From c6fae535ace02000fbeb76a7792fd65a133c421c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Nov 2022 09:42:10 +0800 Subject: [PATCH 6/6] touchegg: 2.0.14 -> 2.0.15 --- pkgs/tools/inputmethods/touchegg/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index d58df8bd2478..c20fd50453ec 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,16 +18,23 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-2ZuFZ2PHhbxNTmGdlZONgPfEJC7lI5Rc6dgiBj7VG2o="; + sha256 = "sha256-oz3+hNNjQ/5vXWPMuhA2N2KK8W8S42WeSeDbhV4oJ9M="; }; patches = lib.optionals withPantheon [ + # Required for the next patch to apply + # Reverts https://github.com/JoseExposito/touchegg/pull/603 + (fetchpatch { + url = "https://github.com/JoseExposito/touchegg/commit/34e947181d84620021601e7f28deb1983a154da8.patch"; + sha256 = "sha256-qbWwmEzVXvDAhhrGvMkKN4YNtnFfRW+Yra+i6VEQX4g="; + revert = true; + }) # Disable per-application gesture by default to make sure the default # config does not conflict with Pantheon switchboard settings. (fetchpatch {