diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-19 00:02:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 00:02:36 +0000 |
| commit | b7aba4fb0f6e828ff725e027490406f437e4ddee (patch) | |
| tree | 6973ff677fe6bc06bb5de0ad7c320b7d316032ba /pkgs/applications/networking/browsers | |
| parent | 5ee636b083ffb63540cfac8b5fa594951fd1f319 (diff) | |
| parent | 861771aac25619fb24c57d846f77cf820f421658 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/microsoft-edge/browser.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/microsoft-edge/default.nix | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 8ec4b523e4b08..227442b1e4b6a 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -30,6 +30,7 @@ , at-spi2-core , libuuid , systemd +, wayland }: let @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXrandr libxkbcommon gtk3 pango cairo gdk-pixbuf mesa - alsa-lib at-spi2-core xorg.libxshmfence systemd + alsa-lib at-spi2-core xorg.libxshmfence systemd wayland ]; naclHelper = lib.makeLibraryPath [ glib nspr atk libdrm xorg.libxcb mesa xorg.libX11 diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 4acdd563d66f7..c769937ee86bc 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "101.0.1210.19"; + version = "103.0.1264.21"; revision = "1"; - sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p"; + sha256 = "sha256:1336i0hy7xnla0pi4vahaxshhmivi1zljhaxyg63352bc7w9j64f"; }; dev = import ./browser.nix { channel = "dev"; - version = "102.0.1227.0"; + version = "104.0.1287.1"; revision = "1"; - sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x"; + sha256 = "sha256:10h360vfsfql42i6mpdvf8d0219506ipbk3hdpwl0jhlsphmhw61"; }; stable = import ./browser.nix { channel = "stable"; - version = "100.0.1185.44"; + version = "102.0.1245.44"; revision = "1"; - sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89"; + sha256 = "sha256:10r12xlkcnag5jdmnwpqsbkjx1ih1027l573vxmcxmvpmj6y4373"; }; } |