diff --git a/pkgs/by-name/ro/roadtools/package.nix b/pkgs/by-name/ro/roadtools/package.nix new file mode 100644 index 000000000000..c3c59509fd82 --- /dev/null +++ b/pkgs/by-name/ro/roadtools/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication roadtools diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 6d8f93eb30b9..c7a23b4b31e7 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + cbor2, cryptography, buildPythonPackage, fetchPypi, @@ -10,19 +11,22 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "roadlib"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { - inherit pname version; - hash = "sha256-WKlbYTIw7A5d4UCxeFgtQ1/dTecqQVzSheImnrb2Hmw="; + inherit (finalAttrs) pname version; + hash = "sha256-al1FnLcKAFWRY43weXtsS8DN5pXCO1qFUw1vwLfZvGM="; }; build-system = [ setuptools ]; dependencies = [ + cbor2 cryptography pyjwt requests @@ -44,4 +48,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 84dd5b524ba0..404a48ca47de 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -17,12 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "roadrecon"; - version = "1.7.4"; + version = "2.0.0"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-V/McstT+2LAlNe4HHQ0xNfAIM0ExFstyEL3qQrEfkoQ="; + hash = "sha256-wzr0J6tGhsZdjTDeIeSzCRTquiw4iZ8FxqFEl1fC2iU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/roadtools/default.nix b/pkgs/development/python-modules/roadtools/default.nix index 32a43c9aa703..30e137620f87 100644 --- a/pkgs/development/python-modules/roadtools/default.nix +++ b/pkgs/development/python-modules/roadtools/default.nix @@ -8,19 +8,21 @@ roadtx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "roadtools"; version = "0.0.2"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RxRbcT9uhQBYRDqq1asYDIwqrji14zi7dwRuQLXJiyQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ roadrecon roadlib roadtx @@ -33,5 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/dirkjanm/ROADtools"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "roadtools"; }; -} +}) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 85e63038ab23..003c90868315 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -7,19 +7,21 @@ requests, roadlib, selenium, - selenium-wire, + selenium-wire-roadtx, setuptools, signxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "roadtx"; - version = "1.21.1"; + version = "1.22.0"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { - inherit pname version; - hash = "sha256-UxyyvVWuRE/Uh7zUtSN6GdRdintNpFAHVQ+ufc+uFjU="; + inherit (finalAttrs) pname version; + hash = "sha256-2GIJAjLxOqy3E+5j1gnby8F5IAvdnChMT4Lfq5I5zeE="; }; build-system = [ setuptools ]; @@ -30,7 +32,7 @@ buildPythonPackage rec { requests roadlib selenium - selenium-wire + selenium-wire-roadtx signxml ]; @@ -42,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/selenium-wire-roadtx/default.nix b/pkgs/development/python-modules/selenium-wire-roadtx/default.nix new file mode 100644 index 000000000000..f3b333bd7bb7 --- /dev/null +++ b/pkgs/development/python-modules/selenium-wire-roadtx/default.nix @@ -0,0 +1,91 @@ +{ + lib, + blinker, + brotli, + buildPythonPackage, + certifi, + cryptography, + fetchFromGitHub, + gunicorn, + h2, + httpbin, + hyperframe, + kaitaistruct, + nix-update-script, + pyasn1, + pyopenssl, + pyparsing, + pysocks, + pytestCheckHook, + ruamel-yaml, + selenium, + setuptools, + wsproto, + zstandard, +}: + +buildPythonPackage (finalAttrs: { + pname = "selenium-wire-roadtx"; + version = "0-unstable-2026-05-20"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "dirkjanm"; + repo = "selenium-wire-roadtx"; + rev = "98e91ea9e2472902d19b4a328a2ea08539b488b9"; + hash = "sha256-WhGsgIuJrbc6Emq9B0uin7FUKc/qPH9E1DUjt/FIVZs="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + blinker + brotli + certifi + cryptography + h2 + hyperframe + kaitaistruct + pyasn1 + pyopenssl + pyparsing + pysocks + ruamel-yaml + selenium + wsproto + zstandard + ]; + + nativeCheckInputs = [ + gunicorn + httpbin + pytestCheckHook + ]; + + pythonImportsCheck = [ "seleniumwire" ]; + + disabledTestPaths = [ + # Don't run End2End tests + "tests/end2end/test_end2end.py" + # Don't run MitM tests + "tests/seleniumwire/test_server.py" + ]; + + disabledTests = [ + # Tests require setup + "BackendIntegrationTest" + # AssertionError + "test_save_response" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser"; + homepage = "https://github.com/dirkjanm/selenium-wire-roadtx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd369638c47a..59128805b25d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17810,6 +17810,8 @@ self: super: with self; { selenium-wire = callPackage ../development/python-modules/selenium-wire { }; + selenium-wire-roadtx = callPackage ../development/python-modules/selenium-wire-roadtx { }; + semantic-version = callPackage ../development/python-modules/semantic-version { }; semaphore-bot = callPackage ../development/python-modules/semaphore-bot { };