From 00e68a9d9e71988d344113a5ce44244515e9409e Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 23 Mar 2026 18:16:55 +0100 Subject: [PATCH 1/2] microsoft-edge: change update-script to also bump the edgedriver --- pkgs/by-name/mi/microsoft-edge/update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py index e6c8b344d37b..d2298c382e6f 100755 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ b/pkgs/by-name/mi/microsoft-edge/update.py @@ -40,6 +40,7 @@ def write_expression(): "upstream_version" ) os.system(f'update-source-version microsoft-edge "{version}"') + os.system(f'update-source-version msedgedriver "{version}"') write_expression() From a489471b6f6c6d78983550f20d90e0268d86b934 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 23 Mar 2026 18:18:42 +0100 Subject: [PATCH 2/2] msedgedriver: rewrite and remove architectures that do not have matching edge versions --- pkgs/by-name/ms/msedgedriver/package.nix | 37 +++++------------------- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index d576d98ecea3..9a8804b97bf3 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,33 +11,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - # finding a version that has all 4 builds is a pain - # https://msedgewebdriverstorage.z22.web.core.windows.net/?form=MA13LH - version = "130.0.2849.1"; + version = "146.0.3856.84"; - src = - let - inherit (stdenvNoCC.hostPlatform) system; - selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); - suffix = selectSystem { - x86_64-linux = "linux64"; - aarch64-linux = "arm64"; - x86_64-darwin = "mac64"; - aarch64-darwin = "mac64_m1"; - }; - - hash = selectSystem { - x86_64-linux = "sha256-U6YGD2PAhVUa7f+R5pmKLazGLOBbf3bRqzlwIJewA+w="; - aarch64-linux = "sha256-QJ1jRw8kkWbT8US5qI8DMZI/7Q8yJWpFXrfzGdxDWKE="; - x86_64-darwin = "sha256-Ejcv1DtuEiLJvTsv48AwoCQlFO3xM9PkM3HvZG65AC4="; - aarch64-darwin = "sha256-ykn4bYREE6xmJY02WiCRGsGnyWjnmnZM8FemK4XZqhc="; - }; - in - fetchzip { - url = "https://msedgedriver.azureedge.net/${finalAttrs.version}/edgedriver_${suffix}.zip"; - inherit hash; - stripRoot = false; - }; + src = fetchzip { + url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; + hash = "sha256-WMfJQYfs8Y7fllPTy1UZ/mQmz+L/xb8neqhj457pTuE="; + stripRoot = false; + }; buildInputs = [ glib @@ -46,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nss ]; - nativeBuildInputs = lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ]; installPhase = if stdenvNoCC.hostPlatform.isDarwin then @@ -75,9 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ cholli ]; platforms = [ "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" ]; mainProgram = "msedgedriver"; };