colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #214939 from mguentner/playwright_1_30_0

Browse Source 
playwright: 1.27.1 -> 1.31.1
This commit is contained in:
Weijia Wang 2023-04-17 10:06:55 +03:00 committed by GitHub
commit 8edbe93f6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/python-modules/playwright/default.nix
View File

@ -3,7 +3,6 @@
, buildPythonPackage , buildPythonPackage
, chromium , chromium
, ffmpeg , ffmpeg
, firefox
, git , git
, greenlet , greenlet
, jq , jq
@ -24,7 +23,7 @@ let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}"; throwSystem = throw "Unsupported system: ${system}";
driverVersion = "1.27.1"; driverVersion = "1.31.1";
driver = let driver = let
suffix = { suffix = {
@ -41,10 +40,10 @@ let
src = fetchurl { src = fetchurl {
url = "https://playwright.azureedge.net/builds/driver/${filename}"; url = "https://playwright.azureedge.net/builds/driver/${filename}";
sha256 = { sha256 = {
x86_64-linux = "0x71b4kb8hlyacixipgfbgjgrbmhckxpbmrs2xk8iis7n5kg7539"; x86_64-linux = "1wg49kfs8fflmx8g01bkckbjkghhwy7c44akckjf7dp4lbh1z8fd";
aarch64-linux = "125lih7g2gj91k7j196wy5a5746wyfr8idj3ng369yh5wl7lfcfv"; aarch64-linux = "0f09a0cxqxihy8lmbjzii80jkpf3n5xlvhjpgdkwmrr3wh0nnixj";
x86_64-darwin = "0z2kww4iby1izkwn6z2ai94y87bkjvwak8awdmjm8sgg00pa9l1a"; x86_64-darwin = "1zd0dz8jazymcpa1im5yzxb7rwl6wn4xz19lpz83bnpd1njq01b3";
aarch64-darwin = "0qajh4ac5lr1sznb2c471r5c5g2r0dk2pyqz8vhvnbk36r524h1h"; aarch64-darwin = "0hcn80zm9aki8hzsf1cljzcmi4iaw7fascs8ajj0qcwqkkm4jnw0";
}.${system} or throwSystem; }.${system} or throwSystem;
}; };
@ -98,13 +97,11 @@ let
meta.platforms = lib.platforms.darwin; meta.platforms = lib.platforms.darwin;
}; };
browsers-linux = { withFirefox ? true, withChromium ? true }: let browsers-linux = {}: let
fontconfig = makeFontsConf { fontconfig = makeFontsConf {
fontDirectories = []; fontDirectories = [];
}; };
in runCommand ("playwright-browsers" in runCommand "playwright-browsers"
+ lib.optionalString (withFirefox && !withChromium) "-firefox"
+ lib.optionalString (!withFirefox && withChromium) "-chromium")
{ {
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
@ -112,7 +109,6 @@ let
]; ];
} ('' } (''
BROWSERS_JSON=${driver}/package/browsers.json BROWSERS_JSON=${driver}/package/browsers.json
'' + lib.optionalString withChromium ''
CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON) CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON)
mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux
@ -121,11 +117,7 @@ let
makeWrapper ${chromium}/bin/chromium $out/chromium-$CHROMIUM_REVISION/chrome-linux/chrome \ makeWrapper ${chromium}/bin/chromium $out/chromium-$CHROMIUM_REVISION/chrome-linux/chrome \
--set SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ --set SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
--set FONTCONFIG_FILE ${fontconfig} --set FONTCONFIG_FILE ${fontconfig}
'' + lib.optionalString withFirefox ''
FIREFOX_REVISION=$(jq -r '.browsers[] | select(.name == "firefox").revision' $BROWSERS_JSON)
mkdir -p $out/firefox-$FIREFOX_REVISION/firefox
ln -s ${firefox}/bin/firefox $out/firefox-$FIREFOX_REVISION/firefox/firefox
'' + ''
FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON) FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON)
mkdir -p $out/ffmpeg-$FFMPEG_REVISION mkdir -p $out/ffmpeg-$FFMPEG_REVISION
ln -s ${ffmpeg}/bin/ffmpeg $out/ffmpeg-$FFMPEG_REVISION/ffmpeg-linux ln -s ${ffmpeg}/bin/ffmpeg $out/ffmpeg-$FFMPEG_REVISION/ffmpeg-linux
@ -133,7 +125,7 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "playwright"; pname = "playwright";
version = "1.27.1"; version = "1.31.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -141,7 +133,7 @@ buildPythonPackage rec {
owner = "microsoft"; owner = "microsoft";
repo = "playwright-python"; repo = "playwright-python";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-cI/4GdkmTikoP9O0Skh/0jCxxRypRua0231iKcxtBcY="; hash = "sha256-zVJiRIJDWmFdMCGK9siewiYgjeeTuOPY1wWxArcZDJg";
}; };
patches = [ patches = [
@ -163,10 +155,10 @@ buildPythonPackage rec {
git commit -m "workaround setuptools-scm" git commit -m "workaround setuptools-scm"
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "greenlet==1.1.3" "greenlet>=1.1.3" \ --replace "greenlet==2.0.1" "greenlet>=2.0.1" \
--replace "pyee==8.1.0" "pyee>=8.1.0" \ --replace "pyee==8.1.0" "pyee>=8.1.0" \
--replace "setuptools-scm==7.0.5" "setuptools-scm>=7.0.5" \ --replace "setuptools-scm==7.0.5" "setuptools-scm>=7.0.5" \
--replace "wheel==0.37.1" "wheel>=0.37.1" --replace "wheel==0.38.1" "wheel>=0.37.1"
# Skip trying to download and extract the driver. # Skip trying to download and extract the driver.
# This is done manually in postInstall instead. # This is done manually in postInstall instead.
@ -207,8 +199,7 @@ buildPythonPackage rec {
x86_64-darwin = browsers-mac; x86_64-darwin = browsers-mac;
aarch64-darwin = browsers-mac; aarch64-darwin = browsers-mac;
}.${system} or throwSystem; }.${system} or throwSystem;
browsers-chromium = browsers-linux { withFirefox = false; }; browsers-chromium = browsers-linux { };
browsers-firefox = browsers-linux { withChromium = false; };
tests = { tests = {
inherit driver browsers; inherit driver browsers;