From 53b09d37915148d2ecd5445b0805aeadc88046ec Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 7 Apr 2022 20:11:28 +0800 Subject: [PATCH 1/3] pantheon.gala: 6.3.0 -> 6.3.1 --- .../pantheon/desktop/gala/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 75447adf4a26..0cab4d2e08f5 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -26,29 +25,19 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw="; + sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y="; }; patches = [ + # We look for plugins in `/run/current-system/sw/lib/` because + # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch - # Session crashes when switching windows with Alt+Tab - # https://github.com/elementary/gala/issues/1312 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch"; - sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc="; - }) - # WindowSwitcher: Clear indicator background - # https://github.com/elementary/gala/pull/1318 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/cce53acffecba795b6cc48916d4621a47996d2c9.patch"; - sha256 = "sha256-5aTZE6poo4sQMTLfk9Nhw4G4BW8i9dvpWktizRIS58Q="; - }) ]; nativeBuildInputs = [ From abc7fcc7d446b986b6d1351471cb96b5be003ae4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 7 Apr 2022 20:13:46 +0800 Subject: [PATCH 2/3] pantheon.elementary-notifications: 6.0.0 -> 6.0.1 --- .../pantheon/services/elementary-notifications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 5a78bb9c8a2b..4cea8b0894d2 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; rev = version; - sha256 = "0jfppafbc8jwhhnillylicz4zfds789d8b31ifsx0qijlxa7kji9"; + sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg="; }; nativeBuildInputs = [ From b46cbe495cc4e24da4fed89f1f9eb589a10d1aad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 7 Apr 2022 20:15:45 +0800 Subject: [PATCH 3/3] pantheon.switchboard-plug-keyboard: 2.6.0 -> 2.7.0 --- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 1118d52fb43c..18ccac20bb53 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc="; + sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw="; }; patches = [