diff options
4 files changed, 33 insertions, 38 deletions
diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 7751452d5fb8..004930491a39 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -1,4 +1,5 @@ { lib +, auditwheel , buildPythonPackage , git , greenlet @@ -6,6 +7,7 @@ , pyee , python , pythonOlder +, setuptools , setuptools-scm , playwright-driver }: @@ -16,15 +18,15 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.38.0"; - format = "setuptools"; + version = "1.40.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "microsoft"; repo = "playwright-python"; rev = "refs/tags/v${version}"; - hash = "sha256-K3ZLDnDtV9PWX0etVv6RIDHp0vZZ7b7DGJ1GjP2kfXU="; + hash = "sha256-+gq/aFq/rQpl04LbaZXGxL35iIX1Wi/motYg5jwv91I="; }; patches = [ @@ -46,10 +48,13 @@ buildPythonPackage rec { git commit -m "workaround setuptools-scm" substituteInPlace setup.py \ - --replace "greenlet==2.0.1" "greenlet>=2.0.1" \ - --replace "pyee==8.1.0" "pyee>=8.1.0" \ - --replace "setuptools-scm==7.0.5" "setuptools-scm>=7.0.5" \ - --replace "wheel==0.38.1" "wheel>=0.37.1" + --replace "setuptools-scm==8.0.4" "setuptools-scm" \ + --replace "wheel==0.41.2" "wheel" + + substituteInPlace pyproject.toml \ + --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.41.2", "auditwheel==5.4.0"]' \ + 'requires = ["setuptools", "setuptools-scm", "wheel", "auditwheel"]' \ + --replace 'version_file = "playwright/_repo_version.py"' "" # Skip trying to download and extract the driver. # This is done manually in postInstall instead. @@ -62,7 +67,7 @@ buildPythonPackage rec { ''; - nativeBuildInputs = [ git setuptools-scm ]; + nativeBuildInputs = [ git setuptools-scm setuptools auditwheel ]; propagatedBuildInputs = [ greenlet diff --git a/pkgs/development/web/playwright-test/node-packages.json b/pkgs/development/web/playwright-test/node-packages.json index c931097f5bff..1da87aa5b4ef 100644 --- a/pkgs/development/web/playwright-test/node-packages.json +++ b/pkgs/development/web/playwright-test/node-packages.json @@ -1,3 +1,3 @@ [ - {"@playwright/test": "1.38.0"} + {"@playwright/test": "1.40.0"} ] diff --git a/pkgs/development/web/playwright-test/node-packages.nix b/pkgs/development/web/playwright-test/node-packages.nix index af235b221051..70c51050f597 100644 --- a/pkgs/development/web/playwright-test/node-packages.nix +++ b/pkgs/development/web/playwright-test/node-packages.nix @@ -4,48 +4,38 @@ let sources = { - "fsevents-2.3.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - }; - "playwright-1.38.0" = { + "playwright-1.40.0" = { name = "playwright"; packageName = "playwright"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz"; - sha512 = "fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A=="; + url = "https://registry.npmjs.org/playwright/-/playwright-1.40.0.tgz"; + sha512 = "gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw=="; }; }; - "playwright-core-1.38.0" = { + "playwright-core-1.40.0" = { name = "playwright-core"; packageName = "playwright-core"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz"; - sha512 = "f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g=="; + url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.0.tgz"; + sha512 = "fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q=="; }; }; }; in { - "@playwright/test-1.38.0" = nodeEnv.buildNodePackage { + "@playwright/test-1.40.0" = nodeEnv.buildNodePackage { name = "_at_playwright_slash_test"; packageName = "@playwright/test"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz"; - sha512 = "xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw=="; + url = "https://registry.npmjs.org/@playwright/test/-/test-1.40.0.tgz"; + sha512 = "PdW+kn4eV99iP5gxWNSDQCbhMaDVej+RXL5xr6t04nbKLCBwYtA046t7ofoczHOm8u6c+45hpDKQVZqtqwkeQg=="; }; dependencies = [ - sources."fsevents-2.3.2" - sources."playwright-1.38.0" - sources."playwright-core-1.38.0" + sources."playwright-1.40.0" + sources."playwright-core-1.40.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 9dc0401a2e2d..2ced22b559a0 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -30,15 +30,15 @@ let { pname = "playwright-driver"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { url = "https://playwright.azureedge.net/builds/driver/${filename}"; sha256 = { - x86_64-linux = "1zs8mfn41k5kv1r6vw8x3hw7z7ghmwfrvdhx9lvcllhrdiqzqkbm"; - aarch64-linux = "0m2mnvhfqyqjwmb0jdmwdsw0xacr85g5wy0dipl0i8ylb9zjzq7z"; - x86_64-darwin = "0jik9d80ina2439nmnd4frmmcjimyqr888gwrm6i136hla27i3a9"; - aarch64-darwin = "1ma2f51hz5xjp55yn9x1s4qg62df12lrr4dy4kdqc6wiqdxc96f3"; + x86_64-linux = "0y9n23r4yfcgm4a50rfgicl91vrllak0d8h26yagh6h8hl0r3nhh"; + aarch64-linux = "0zd456klidi4sg7wahfrdbs2bwiq3q6ngxd4iv3vi9f9w9nq2p2k"; + x86_64-darwin = "0yaiwg9821w9nszzkrp5skzf5792nahvfqnr4axk84dcngslxvmk"; + aarch64-darwin = "1b1jmv6l97ss8c4sc3n1xckn05fpq3fihjbjxr2qz6i9dsy3xj57"; }.${system} or throwSystem; }; |