From 4bba51b8d05bee3ecef8a51fa72985f9d9778115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Mar 2022 01:12:55 +0200 Subject: [PATCH] doh-proxy: drop --- pkgs/servers/dns/doh-proxy/default.nix | 40 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/servers/dns/doh-proxy/default.nix 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 65a742ad5f8f..6749b5d8afa2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -260,6 +260,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 62ab14368aa9..909e63f28e38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21308,8 +21308,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; };