From 30358e72db240d34e82b765311ed2388a705518a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 18:38:51 +0200 Subject: [PATCH 1/2] python311Packages.urwid-mitmproxy: init at 2.1.2.1 --- .../urwid-mitmproxy/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/urwid-mitmproxy/default.nix diff --git a/pkgs/development/python-modules/urwid-mitmproxy/default.nix b/pkgs/development/python-modules/urwid-mitmproxy/default.nix new file mode 100644 index 000000000000..60dd32fc6fc3 --- /dev/null +++ b/pkgs/development/python-modules/urwid-mitmproxy/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, glibcLocales +, pythonOlder +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "urwid-mitmproxy"; + version = "2.1.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "urwid-mitmproxy"; + rev = "refs/tags/${version}"; + hash = "sha256-93AauYWbrG/2smAhbNKGE0twGJZ2u9gBetlXGCpciH8="; + }; + + pythonImportsCheck = [ + "urwid" + ]; + + # Tests which assert on strings don't decode results correctly, see urwid + doCheck = false; + + meta = with lib; { + description = "Urwid fork used by mitmproxy"; + homepage = "https://github.com/mitmproxy/urwid-mitmproxy"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dc8e5159f28..6be23538c7aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13312,6 +13312,8 @@ self: super: with self; { urwidtrees = callPackage ../development/python-modules/urwidtrees { }; + urwid-mitmproxy = callPackage ../development/python-modules/urwid-mitmproxy { }; + urwid-readline = callPackage ../development/python-modules/urwid-readline { }; usb-devices = callPackage ../development/python-modules/usb-devices { }; From 35d7746db9ba7fa6f5dc2626c2b1cdf1baa10075 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 20:11:22 +0200 Subject: [PATCH 2/2] python311Packages.aioquic-mitmproxy: init at 0.9.20.3 --- .../aioquic-mitmproxy/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/aioquic-mitmproxy/default.nix diff --git a/pkgs/development/python-modules/aioquic-mitmproxy/default.nix b/pkgs/development/python-modules/aioquic-mitmproxy/default.nix new file mode 100644 index 000000000000..7fab497b2603 --- /dev/null +++ b/pkgs/development/python-modules/aioquic-mitmproxy/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, certifi +, cryptography +, fetchFromGitHub +, pylsqpack +, pyopenssl +, pytestCheckHook +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "aioquic-mitmproxy"; + version = "0.9.20.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "meitinger"; + repo = "aioquic_mitmproxy"; + rev = "refs/tags/${version}"; + hash = "sha256-VcIbtrcA0dBEE52ZD90IbXoh6L3wDUbr2kFJikts6+w="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + certifi + cryptography + pylsqpack + pyopenssl + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioquic" + ]; + + meta = with lib; { + description = "QUIC and HTTP/3 implementation in Python"; + homepage = "https://github.com/meitinger/aioquic_mitmproxy"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6be23538c7aa..26bd100cfca4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -316,6 +316,8 @@ self: super: with self; { aioquic = callPackage ../development/python-modules/aioquic { }; + aioquic-mitmproxy = callPackage ../development/python-modules/aioquic-mitmproxy { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -13312,10 +13314,10 @@ self: super: with self; { urwidtrees = callPackage ../development/python-modules/urwidtrees { }; - urwid-mitmproxy = callPackage ../development/python-modules/urwid-mitmproxy { }; - urwid-readline = callPackage ../development/python-modules/urwid-readline { }; + urwid-mitmproxy = callPackage ../development/python-modules/urwid-mitmproxy { }; + usb-devices = callPackage ../development/python-modules/usb-devices { }; usbrelay-py = callPackage ../os-specific/linux/usbrelay/python.nix { };