Unverified Commit 0828adcd authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #270835 from NixOS/backport-270479-to-release-23.11 

[Backport release-23.11] microsoft-edge: 119.0.2151.44 -> 119.0.2151.72
parents 13e2aebd b9687795

pkgs/applications/networking/browsers/microsoft-edge/browser.nix

+6 −6
Original line number Diff line number Diff line 
{ 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 = [
@@ -128,13 +128,13 @@ stdenv.mkDerivation rec { 
      --set-rpath "${libPath.libGLESv2}" \

      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 = ''

pkgs/applications/networking/browsers/microsoft-edge/default.nix

+6 −6
Original line number Diff line number Diff line 
{

  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=";

  };

}

pkgs/applications/networking/browsers/microsoft-edge/update.py

+1 −1
Original line number Diff line number Diff line
@@ -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)