Unverified Commit 6a1689a7 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

python3Packages.mitmproxy: move aioquic v1.2.0 to top-level definitions (#494462)

parents c8e8e466 ef7a1aaa

pkgs/development/python-modules/mitmproxy/default.nix

+2 −16
Original line number Diff line number Diff line 
{

  lib,

  aioquic,

  aioquic_1_2,

  argon2-cffi,

  asgiref,

  bcrypt,
@@ -9,7 +9,6 @@ 
  certifi,

  cryptography,

  fetchFromGitHub,

  fetchPypi,

  flask,

  h11,

  h2,
@@ -29,7 +28,6 @@ 
  pytest-timeout,

  pytest-xdist,

  pytestCheckHook,

  pythonRelaxDepsHook,

  requests,

  ruamel-yaml,

  setuptools,
@@ -40,18 +38,6 @@ 
  zstandard,

}:



let

  # Workaround for https://github.com/mitmproxy/mitmproxy/pull/7953

  # nixpkgs' aioquic was updated to 1.3.0, which contains breaking changes that are unpatched in mitmproxy as of right now

  aioquic' = aioquic.overrideAttrs (old: rec {

    version = "1.2.0";

    src = fetchPypi {

      pname = "aioquic";

      inherit version;

      hash = "sha256-+RJjuz9xlIxciRW01Q7jcABPIKQW9n+rPcyQVWx+cZk=";

    };

  });

in

buildPythonPackage rec {

  pname = "mitmproxy";

  version = "12.2.1";
@@ -81,7 +67,7 @@ buildPythonPackage rec { 
  build-system = [ setuptools ];



  dependencies = [

    aioquic'

    aioquic_1_2

    argon2-cffi

    asgiref

    brotli

pkgs/top-level/python-packages.nix

+10 −0
Original line number Diff line number Diff line
@@ -458,6 +458,16 @@ self: super: with self; { 














  aioquic = callPackage ../development/python-modules/aioquic { };



























  aioquic_1_2 = self.aioquic.overrideAttrs rec {













    version = "1.2.0";

























    src = pkgs.fetchPypi {













      pname = "aioquic";













      inherit version;













      hash = "sha256-+RJjuz9xlIxciRW01Q7jcABPIKQW9n+rPcyQVWx+cZk=";













    };













  };



























  aioraven = callPackage ../development/python-modules/aioraven { };





























  aiorecollect = callPackage ../development/python-modules/aiorecollect { };