From 809effe63b29084c41ecdfbd320f29d95c63e3e4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 10 Jul 2023 22:16:50 +0700 Subject: [PATCH 1/2] python3Packages.ping3: init at 4.0.4 --- .../python-modules/ping3/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/ping3/default.nix diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix new file mode 100644 index 000000000000..c5dd49ba0d59 --- /dev/null +++ b/pkgs/development/python-modules/ping3/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, setuptools +, wheel +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ping3"; + version = "4.0.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HqEqz2dS1GZmFjQf18Y5PGZM/8UQxpPvBvc2+yZ6E7o="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "ping3" ]; + + meta = with lib; { + description = "A pure python3 version of ICMP ping implementation using raw socket"; + homepage = "https://pypi.org/project/ping3"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a8949202ad9..cc86af662231 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7546,6 +7546,8 @@ self: super: with self; { pfzy = callPackage ../development/python-modules/pfzy { }; + ping3 = callPackage ../development/python-modules/ping3 { }; + pg8000 = callPackage ../development/python-modules/pg8000 { }; pgcli = callPackage ../development/python-modules/pgcli { }; From e647fd4bf4c9bfe284f6b5ae07fac65da6378639 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 10 Jul 2023 22:19:59 +0700 Subject: [PATCH 2/2] mullvad-closest: init at unstable-2023-07-09 --- .../mullvad-closest/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/mullvad-closest/default.nix diff --git a/pkgs/development/python-modules/mullvad-closest/default.nix b/pkgs/development/python-modules/mullvad-closest/default.nix new file mode 100644 index 000000000000..c5d45dfd1751 --- /dev/null +++ b/pkgs/development/python-modules/mullvad-closest/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, setuptools +, click +, geopy +, ping3 +, requests +, tabulate +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "mullvad-closest"; + version = "unstable-2023-07-09"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Ch00k"; + repo = "mullvad-closest"; + rev = "894d2075a520fcad238256725245030374693a16"; + hash = "sha256-scJiYjEmnDDElE5rHdPbnnuNjjRB0/X3vNGLoi2MAmo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + click + geopy + ping3 + requests + tabulate + ]; + + pythonImportsCheck = [ "mullvad_closest" ]; + + meta = with lib; { + description = "Find Mullvad servers with the lowest latency at your location"; + homepage = "https://github.com/Ch00k/mullvad-closest"; + license = licenses.unlicense; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25aa16c42024..12bdc194b42e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25957,6 +25957,8 @@ with pkgs; mullvad-browser = callPackage ../applications/networking/browsers/mullvad-browser { }; + mullvad-closest = with python3Packages; toPythonApplication mullvad-closest; + mycorrhiza = callPackage ../servers/mycorrhiza { }; napalm = with python3Packages; toPythonApplication ( diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc86af662231..394da81eb339 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6520,6 +6520,8 @@ self: super: with self; { mullvad-api = callPackage ../development/python-modules/mullvad-api { }; + mullvad-closest = callPackage ../development/python-modules/mullvad-closest { }; + mulpyplexer = callPackage ../development/python-modules/mulpyplexer { }; multidict = callPackage ../development/python-modules/multidict { };