Unverified Commit bb74c098 authored by Lucas Savva's avatar Lucas Savva
Browse files

microsoft-edge: 111.0.1661.44 -> 113.0.1774.42 

Fixed the $out/bin/microsoft-edge-stable symlink which is
part of the source archive to point to the correct binary.
Resolves execution problems via `nix run nixpkgs#microsoft-edge`.

Also added trailing newline to update.py.
parent 4cee688e

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

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ stdenv.mkDerivation rec { 
    cp -R opt usr/bin usr/share $out



    ${if channel == "stable"

      then ""

      then "ln -sf $out/bin/${longName} $out/bin/${baseName}-${channel}"

      else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"}



    ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName}

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

    version = "113.0.1774.42";

    revision = "1";

    sha256 = "sha256-ePViYQZUteMBkV7AkvsoQwPVxibMB68LDWgg7d82iIE=";

    sha256 = "sha256-gd9ub3WppnYuK7Ul57r66+ioYHCopz8MoDdxqWb3Ukg=";

  };

  beta = import ./browser.nix {

    channel = "beta";

    version = "112.0.1722.15";

    version = "114.0.1823.18";

    revision = "1";

    sha256 = "sha256-Ba6f5MOBTtY8bUxCcMySQCWqDvOiI1hLnuwcIspReq8=";

    sha256 = "sha256-58oe/82jad0v+cqR1l5NZjdAI0EJDyICMR1l6z2DLsE=";

  };

  dev = import ./browser.nix {

    channel = "dev";

    version = "113.0.1741.1";

    version = "115.0.1851.0";

    revision = "1";

    sha256 = "sha256-1d92bQAoiTkqWgiWdUBn3VKBYCRP1KCvPiu7cQTFVio=";

    sha256 = "sha256-PmfMe+B/JtvPhBGhQBUgoWjhKokTwCdG9y+GYl0VCMk=";

  };

}

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

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ def nix_expressions(latest: dict[str, Packages]): 
def write_expression():

    latest = latest_packages(packages())

    channel_strs = nix_expressions(latest)

    nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), '  ') + '\n}'

    nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), '  ') + '\n}\n'

    with open('default.nix', 'w') as f:

        f.write(nix_expr)