Unverified Commit 4b1aab22 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #265841 from SuperSandro2000/mitmproxy-2 

python310Packages.mitmproxy-rs: fix platforms; python3Packages.mitmproxy-wireguard: drop
parents 72711e74 10496208

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

+0 −1
Original line number Diff line number Diff line
@@ -45,6 +45,5 @@ buildPythonPackage rec { 
    changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

    platforms = platforms.all;

  };

}

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

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, stdenv

, darwin

, pytestCheckHook

, pythonOlder

, rustPlatform

, setuptools-rust

}:



buildPythonPackage rec {

  pname = "mitmproxy-wireguard";

  version = "0.1.23";

  format = "pyproject";



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "decathorpe";

    repo = "mitmproxy_wireguard";

    rev = "refs/tags/${version}";

    hash = "sha256-z9ucTBLLRXc1lcHA0r1wUleoP8X7yIlHrtdZdLD9qJk=";

  };



  buildInputs = lib.optionals stdenv.isDarwin [

    darwin.libiconv

    darwin.apple_sdk.frameworks.Security

  ];



  nativeBuildInputs = [

    setuptools-rust

  ] ++ (with rustPlatform; [

    cargoSetupHook

    maturinBuildHook

  ]);



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-qgyAaUpyuWVYMxUA4Gg8inlUMlSLo++16+nVvmDMhTQ=";

  };



  # Module has no tests, only a test client

  doCheck = false;



  pythonImportsCheck = [

    "mitmproxy_wireguard"

  ];



  meta = with lib; {

    description = "WireGuard frontend for mitmproxy";

    homepage = "https://github.com/decathorpe/mitmproxy_wireguard";

    changelog = "https://github.com/decathorpe/mitmproxy_wireguard/releases/tag/${version}";

    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

  };

}

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ mapAliases ({ 
  mir_eval = mir-eval; # added 2024-01-07

  mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12

  mistune_2_0 = mistune; # added 2022-08-12

  mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06

  mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28

  mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21

  mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -7127,8 +7127,6 @@ self: super: with self; { 














  mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { };



























  mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { };



























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





























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