git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #167698 from bobby285271/pantheon

Pantheon updates 2022-04-07

commit95c599aed7aa34a1ad64ba5e1514ffde8b0571e7 authorBobby Rong <rjl931189261@126.com> dateSat 9 Apr 2022, 11:39 (5 years ago) parentefc8de6b46cbe4
3 files changed+8−19
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix+2−2 pkgs/desktops/pantheon/desktop/gala/default.nix+4−15 pkgs/desktops/pantheon/services/elementary-notifications/default.nix+2−2
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix+2−2
@@ -23,13 +23,13 @@
2323
2424stdenv.mkDerivation rec {
2525 pname = "switchboard-plug-keyboard";
26− version = "2.6.0";
26+ version = "2.7.0";
2727
2828 src = fetchFromGitHub {
2929 owner = "elementary";
3030 repo = pname;
3131 rev = version;
32− sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
32+ sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw=";
3333 };
3434
3535 patches = [
pkgs/desktops/pantheon/desktop/gala/default.nix+4−15
@@ -1,7 +1,6 @@
11{ lib
22, stdenv
33, fetchFromGitHub
4−, fetchpatch
54, nix-update-script
65, pkg-config
76, meson
@@ -26,29 +25,19 @@
2625
2726stdenv.mkDerivation rec {
2827 pname = "gala";
29− version = "6.3.0";
28+ version = "6.3.1";
3029
3130 src = fetchFromGitHub {
3231 owner = "elementary";
3332 repo = pname;
3433 rev = version;
35− sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw=";
34+ sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y=";
3635 };
3736
3837 patches = [
38+ # We look for plugins in `/run/current-system/sw/lib/` because
39+ # there are multiple plugin providers (e.g. gala and wingpanel).
3940 ./plugins-dir.patch
40− # Session crashes when switching windows with Alt+Tab
41− # https://github.com/elementary/gala/issues/1312
42− (fetchpatch {
43− url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
44− sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
45− })
46− # WindowSwitcher: Clear indicator background
47− # https://github.com/elementary/gala/pull/1318
48− (fetchpatch {
49− url = "https://github.com/elementary/gala/commit/cce53acffecba795b6cc48916d4621a47996d2c9.patch";
50− sha256 = "sha256-5aTZE6poo4sQMTLfk9Nhw4G4BW8i9dvpWktizRIS58Q=";
51− })
5241 ];
5342
5443 nativeBuildInputs = [
pkgs/desktops/pantheon/services/elementary-notifications/default.nix+2−2
@@ -17,13 +17,13 @@
1717
1818stdenv.mkDerivation rec {
1919 pname = "elementary-notifications";
20− version = "6.0.0";
20+ version = "6.0.1";
2121
2222 src = fetchFromGitHub {
2323 owner = "elementary";
2424 repo = "notifications";
2525 rev = version;
26− sha256 = "0jfppafbc8jwhhnillylicz4zfds789d8b31ifsx0qijlxa7kji9";
26+ sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg=";
2727 };
2828
2929 nativeBuildInputs = [