diff options
| author | Rhys Davies <rhys@memes.nz> | 2023-11-27 14:48:22 +1300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-11-29 06:21:39 +0000 |
| commit | b96877958c6220ee34393fcda534cc8d0126b10a (patch) | |
| tree | 4ec821ee327ee9d44a1ade23aab159d01db36a8e | |
| parent | Merge pull request #270833 from NixOS/backport-269607-to-release-23.11 (diff) | |
| download | nixpkgs-origin/backport-270479-to-release-23.11.tar.gz | |
microsoft-edge: 119.0.2151.44 -> 119.0.2151.72origin/backport-270479-to-release-23.11
(cherry picked from commit 353ec7d15489e325d442d25b9d811f5b3b886349)
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 3577c2a12b25..12ef901bbcb3 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -1,4 +1,4 @@ -{ channel, version, revision, sha256 }: +{ channel, version, revision, hash }: { stdenv , fetchurl @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ @@ -129,12 +129,12 @@ stdenv.mkDerivation rec { opt/microsoft/${shortName}/libGLESv2.so patchelf \ - --set-rpath "${libPath.libsmartscreenn}" \ - opt/microsoft/${shortName}/libsmartscreenn.so - - patchelf \ --set-rpath "${libPath.liboneauth}" \ opt/microsoft/${shortName}/liboneauth.so + '' + lib.optionalString (lib.versionOlder version "120") '' + patchelf \ + --set-rpath "${libPath.libsmartscreenn}" \ + opt/microsoft/${shortName}/libsmartscreenn.so ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index d034c68d85fa..51b3d6730862 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "119.0.2151.44"; + version = "119.0.2151.72"; revision = "1"; - sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; + hash = "sha256-thBx/+6thNXXKppA11IOG5EiMx7pA9FA3vSkwa9+F0o="; }; beta = import ./browser.nix { channel = "beta"; - version = "119.0.2151.44"; + version = "120.0.2210.22"; revision = "1"; - sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; + hash = "sha256-GayVVZbtGLQmmXu+k4wdsD+rPwGiSPHnQwzVYyKWhHM="; }; dev = import ./browser.nix { channel = "dev"; - version = "120.0.2186.2"; + version = "121.0.2220.3"; revision = "1"; - sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; + hash = "sha256-M3r+SLp3lQ7oWDYoM7aNZDC5wbMxFZggsu0Iuyyw/cw="; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index f32b669f0360..616dc0999505 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -52,7 +52,7 @@ def nix_expressions(latest: dict[str, Packages]): channel = "{channel}"; version = "{version}"; revision = "{revision}"; - sha256 = "{sri}"; + hash = "{sri}"; }};''' ) channel_strs.append(channel_str) |