Merge pull request #281304 from fabaff/pyppeteer-fix

python311Packages.pyppeteer: refactor

authored by Fabian Affolter and committed by GitHub 8a62b7cb ba15cbd1

+20 -12
+13 -11
pkgs/development/python-modules/pyppeteer/default.nix
··· 18 buildPythonPackage rec { 19 pname = "pyppeteer"; 20 version = "1.0.2"; 21 - format = "pyproject"; 22 23 - disabled = pythonOlder "3.6"; 24 25 src = fetchFromGitHub { 26 - owner = pname; 27 - repo = pname; 28 - rev = version; 29 hash = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; 30 }; 31 32 nativeBuildInputs = [ 33 poetry-core 34 ]; ··· 48 pytest-xdist 49 pytestCheckHook 50 ]; 51 - 52 - postPatch = '' 53 - substituteInPlace pyproject.toml \ 54 - --replace 'pyee = "^8.1.0"' 'pyee = "*"' \ 55 - --replace 'websockets = "^9.1"' 'websockets = "*"' 56 - ''; 57 58 disabledTestPaths = [ 59 # Requires network access ··· 89 meta = with lib; { 90 description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; 91 homepage = "https://github.com/pyppeteer/pyppeteer"; 92 license = licenses.mit; 93 maintainers = with maintainers; [ kmein ]; 94 };
··· 18 buildPythonPackage rec { 19 pname = "pyppeteer"; 20 version = "1.0.2"; 21 + pyproject = true; 22 23 + disabled = pythonOlder "3.7"; 24 25 src = fetchFromGitHub { 26 + owner = "pyppeteer"; 27 + repo = "pyppeteer"; 28 + rev = "refs/tags/${version}"; 29 hash = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; 30 }; 31 32 + postPatch = '' 33 + substituteInPlace pyproject.toml \ 34 + --replace 'pyee = "^8.1.0"' 'pyee = "*"' \ 35 + --replace 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \ 36 + --replace 'websockets = "^10.0"' 'websockets = "*"' 37 + ''; 38 + 39 nativeBuildInputs = [ 40 poetry-core 41 ]; ··· 55 pytest-xdist 56 pytestCheckHook 57 ]; 58 59 disabledTestPaths = [ 60 # Requires network access ··· 90 meta = with lib; { 91 description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; 92 homepage = "https://github.com/pyppeteer/pyppeteer"; 93 + changelog = "https://github.com/pyppeteer/pyppeteer/blob/${version}/CHANGELOG.md"; 94 license = licenses.mit; 95 maintainers = with maintainers; [ kmein ]; 96 };
+7 -1
pkgs/tools/security/theharvester/default.nix
··· 15 hash = "sha256-tnCiI4bte2RSWSkEL2rwFz6WFjfRMMFiEBOvv3QMyos="; 16 }; 17 18 nativeBuildInputs = with python3.pkgs; [ 19 poetry-core 20 ]; ··· 68 ''; 69 homepage = "https://github.com/laramies/theHarvester"; 70 changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}"; 71 maintainers = with maintainers; [ c0bw3b fab treemo ]; 72 - license = licenses.gpl2Only; 73 }; 74 }
··· 15 hash = "sha256-tnCiI4bte2RSWSkEL2rwFz6WFjfRMMFiEBOvv3QMyos="; 16 }; 17 18 + postPatch = '' 19 + # Requirements are pinned 20 + sed -i 's/==.*//' requirements/base.txt 21 + ''; 22 + 23 nativeBuildInputs = with python3.pkgs; [ 24 poetry-core 25 ]; ··· 73 ''; 74 homepage = "https://github.com/laramies/theHarvester"; 75 changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}"; 76 + license = licenses.gpl2Only; 77 maintainers = with maintainers; [ c0bw3b fab treemo ]; 78 + mainProgram = "theHarvester"; 79 }; 80 }