diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-25 06:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 06:01:06 +0000 |
| commit | a2f216a00334b1350df235e7c6613c6f3e9022af (patch) | |
| tree | 6779b884ad1111a870d396ce0aed720b026b9418 /pkgs/desktops | |
| parent | c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e (diff) | |
| parent | 343b5c8134ac2387088f7662b2c4938361a714f1 (diff) | |
| download | nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.tar nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.tar.gz nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.tar.bz2 nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.tar.lz nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.tar.xz nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.tar.zst nixpkgs-a2f216a00334b1350df235e7c6613c6f3e9022af.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index c984824a8c5..31cf6d12eb8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # build: support webkit2gtk-4.1 # https://github.com/elementary/mail/pull/794 (fetchpatch { - url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; - sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch"; + sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs="; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 52c92888f97..11268ab814b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { patches = [ # build: support evolution-data-server 3.45 - # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248 (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; - sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch"; + sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k="; }) ]; |