From a586c14cc436b01673af2738b702dbcea18fc123 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 26 Oct 2018 13:58:18 +0000 Subject: [PATCH 1/4] python3Packages.priority: init at 1.3.0 --- .../python-modules/priority/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/priority/default.nix diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix new file mode 100644 index 00000000000..90b58b665de --- /dev/null +++ b/pkgs/development/python-modules/priority/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: + +buildPythonPackage rec { + pname = "priority"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; + }; + + checkInputs = [ pytest hypothesis ]; + checkPhase = '' + PYTHONPATH="src:$PYTHONPATH" pytest + ''; + + meta = with lib; { + homepage = https://python-hyper.org/priority/; + description = "A pure-Python implementation of the HTTP/2 priority tree"; + license = licenses.mit; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 043d20d0482..e732eb38bb3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1856,6 +1856,8 @@ in { poyo = callPackage ../development/python-modules/poyo { }; + priority = callPackage ../development/python-modules/priority { }; + prov = callPackage ../development/python-modules/prov { }; pudb = callPackage ../development/python-modules/pudb { }; From cd1ff3beded0ca8fcb7afd63df83ba0df1ee3eb4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 26 Oct 2018 14:00:23 +0000 Subject: [PATCH 2/4] python3Packages.aiohttp_remotes: init at 0.1.2 --- .../aiohttp-remotes/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/aiohttp-remotes/default.nix diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix new file mode 100644 index 00000000000..51120d07121 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchpatch, buildPythonPackage, fetchPypi +, aiohttp, pytest, pytestcov, pytest-aiohttp +}: + +buildPythonPackage rec { + pname = "aiohttp_remotes"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc"; + }; + + patches = [ + (fetchpatch { + url = https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch; + sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs"; + }) + ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ pytest pytestcov pytest-aiohttp ]; + checkPhase = '' + python -m pytest + ''; + + meta = with lib; { + homepage = https://github.com/wikibusiness/aiohttp-remotes; + description = "A set of useful tools for aiohttp.web server"; + license = licenses.mit; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e732eb38bb3..98afb639631 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -708,6 +708,8 @@ in { aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; ajpy = callPackage ../development/python-modules/ajpy { }; From 1f1bd5c8e8050ee07c1ffae24359f5ee26c58a68 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 26 Oct 2018 14:01:25 +0000 Subject: [PATCH 3/4] python3Packages.aioh2: init at 0.2.2 Tests skipped due to https://github.com/decentfox/aioh2/issues/17. --- .../python-modules/aioh2/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/aioh2/default.nix diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix new file mode 100644 index 00000000000..fdeb5fb0082 --- /dev/null +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -0,0 +1,23 @@ +{ 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98afb639631..1d5ff1778df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -702,6 +702,8 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; + aioh2 = callPackage ../development/python-modules/aioh2 { }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { }; From 39edfe5a2dbf1a128e0d36754b7a200dce5dba1d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 26 Oct 2018 14:31:35 +0000 Subject: [PATCH 4/4] doh-proxy: init at 0.0.8 --- pkgs/servers/dns/doh-proxy/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create 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 new file mode 100644 index 00000000000..ac44dbbf04d --- /dev/null +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "doh-proxy"; + version = "0.0.8"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c"; + }; + + propagatedBuildInputs = with python3Packages; + [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ]; + doCheck = false; # Trouble packaging unittest-data-provider + + 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/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ace934df95..244af730540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13208,6 +13208,8 @@ with pkgs; dex-oidc = callPackage ../servers/dex { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { }; + dgraph = callPackage ../servers/dgraph { }; dico = callPackage ../servers/dico { };