From f445a8f8b9f5d94af222755c06a823ba9c345d60 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 11 Mar 2026 12:20:41 +0200 Subject: [PATCH] playwright: use binaries for ubuntu24.04 --- .../web/playwright/browser-downloads-test.js | 4 ++-- .../web/playwright/browser-downloads.nix | 8 +++---- pkgs/development/web/playwright/firefox.nix | 4 ++-- pkgs/development/web/playwright/webkit.nix | 24 ++++--------------- 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/development/web/playwright/browser-downloads-test.js b/pkgs/development/web/playwright/browser-downloads-test.js index eac7f57ef585..5f4ec96259c0 100644 --- a/pkgs/development/web/playwright/browser-downloads-test.js +++ b/pkgs/development/web/playwright/browser-downloads-test.js @@ -13,8 +13,8 @@ const browserDownloads = JSON.parse(fs.readFileSync(expectedConfigPath, "utf8")) const browserNames = Object.keys(browserDownloads); const hostPlatformBySystem = { - "x86_64-linux": "ubuntu22.04-x64", - "aarch64-linux": "ubuntu22.04-arm64", + "x86_64-linux": "ubuntu24.04-x64", + "aarch64-linux": "ubuntu24.04-arm64", "x86_64-darwin": "mac15", "aarch64-darwin": "mac15-arm64", }; diff --git a/pkgs/development/web/playwright/browser-downloads.nix b/pkgs/development/web/playwright/browser-downloads.nix index 4d83892e0531..f399b582672f 100644 --- a/pkgs/development/web/playwright/browser-downloads.nix +++ b/pkgs/development/web/playwright/browser-downloads.nix @@ -33,15 +33,15 @@ in }; firefox = { - x86_64-linux = mk (registryUrl "firefox" "firefox-ubuntu-22.04.zip") true; - aarch64-linux = mk (registryUrl "firefox" "firefox-ubuntu-22.04-arm64.zip") true; + x86_64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04.zip") true; + aarch64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04-arm64.zip") true; x86_64-darwin = mk (registryUrl "firefox" "firefox-mac.zip") false; aarch64-darwin = mk (registryUrl "firefox" "firefox-mac-arm64.zip") false; }; webkit = { - x86_64-linux = mk (registryUrl "webkit" "webkit-ubuntu-22.04.zip") false; - aarch64-linux = mk (registryUrl "webkit" "webkit-ubuntu-22.04-arm64.zip") false; + x86_64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04.zip") false; + aarch64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04-arm64.zip") false; x86_64-darwin = mk (registryUrl "webkit" "webkit-mac-15.zip") false; aarch64-darwin = mk (registryUrl "webkit" "webkit-mac-15-arm64.zip") false; }; diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index bde369168cf0..a9a1f840fc89 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -19,8 +19,8 @@ let inherit (download) url stripRoot; hash = { - x86_64-linux = "sha256-HBmCV6AFdQ2qTuCIa7WaCiSHU8Am7S+xhpmEWU6DL/U="; - aarch64-linux = "sha256-peP032z4GOoUp1WAszvzyeXnROw6RwRffG+KRe1Qf9k="; + x86_64-linux = "sha256-+mwhR8QQ9fs7hD3C4Xn9xcL8LRU+rt2JO8Gcg/KjqRU="; + aarch64-linux = "sha256-drL8jduYK0rnmLYW9jzSTKHb0pKaezMnpER5kLikEvY="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 6ba1f52cb216..17ddcf5c3d83 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -19,7 +19,7 @@ gst_all_1, harfbuzz, harfbuzzFull, - icu70, + icu74, lcms, libavif, libdrm, @@ -67,20 +67,6 @@ let }; } ); - libavif' = libavif.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "0.9.3"; - src = fetchFromGitHub { - owner = "AOMediaCodec"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds="; - }; - postPatch = ""; - patches = [ ]; - } - ); - libjxl' = libjxl.overrideAttrs ( finalAttrs: previousAttrs: { version = "0.8.2"; @@ -133,8 +119,8 @@ let inherit (download) url stripRoot; hash = { - x86_64-linux = "sha256-h9dM6RR5WhUPHdZgn5yiJlM7QrhlDVaivnaHQCEZbXQ="; - aarch64-linux = "sha256-sOtPdOBmPLqApGGVhgH51OW3aoTv1Y40RfCSax7CyC4="; + x86_64-linux = "sha256-Ei08TuR+WedVAfKRSeRQq7ZhULgxXQIV0bQPcNFYhr4="; + aarch64-linux = "sha256-/+tven7ksYhXQxPYfazyZhNsgvE8rr3A28fZPwL4c9s="; } .${system} or throwSystem; }; @@ -158,9 +144,9 @@ let gst_all_1.gstreamer harfbuzz harfbuzzFull - icu70 + icu74 lcms - libavif' + libavif libdrm libepoxy libevent