diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix deleted file mode 100644 index 1ae997c60e8c..000000000000 --- a/pkgs/development/python-modules/aioh2/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, h2, priority }: - -buildPythonPackage rec { - pname = "aioh2"; - version = "0.2.2"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "03i24wzpw0mrnrpck3w6qy83iigwl7n99sdrndqzxfyrc69b99wd"; - }; - - propagatedBuildInputs = [ h2 priority ]; - - doCheck = false; # https://github.com/decentfox/aioh2/issues/17 - - meta = with lib; { - homepage = "https://github.com/decentfox/aioh2"; - description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; - license = licenses.bsd3; - maintainers = [ maintainers.qyliss ]; - broken = true; # requires h2<4 - }; -} diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix deleted file mode 100644 index 8128ec6f04d4..000000000000 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, python3Packages }: - -with python3Packages; -buildPythonApplication rec { - pname = "doh-proxy"; - version = "0.0.9"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; - }; - - nativeBuildInputs = [ pytest-runner flake8]; - - propagatedBuildInputs = [ - aioh2 - dnspython - aiohttp-remotes - ]; - - checkInputs = [ - asynctest - unittest-data-provider - pytest - pytest-cov - pytest-aiohttp - ]; - - # attempts to resolve address - checkPhase = '' - pytest -k 'not servers' - ''; - - meta = with lib; { - homepage = "https://facebookexperimental.github.io/doh-proxy/"; - description = "A proof of concept DNS-Over-HTTPS proxy"; - license = licenses.bsd3; - maintainers = [ maintainers.qyliss ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 09208dd45f3f..6f9aadf4b76a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -310,6 +310,7 @@ mapAliases ({ docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 + doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30 docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 925585ea6114..88a1aa43d99f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21211,8 +21211,6 @@ with pkgs; dex2jar = callPackage ../development/tools/java/dex2jar { }; - doh-proxy = callPackage ../servers/dns/doh-proxy { }; - doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f259b7cc7f68..cbbde9c8802c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 asyncio-nats-client = nats-py; # added 2022-02-08 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78c579c3c6ba..b675f9355377 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -289,8 +289,6 @@ in { aiogithubapi = callPackage ../development/python-modules/aiogithubapi { }; - aioh2 = callPackage ../development/python-modules/aioh2 { }; - aioharmony = callPackage ../development/python-modules/aioharmony { }; aiohomekit = callPackage ../development/python-modules/aiohomekit { };