From b3645ffc0d2b26a40998a1b67df9410521437cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2024 14:54:36 -0800 Subject: [PATCH 1/6] python311Packages.proton-vpn-session: 0.6.2-unstable-2023-10-24 -> 0.6.5 Diff: https://github.com/ProtonVPN/python-proton-vpn-session/compare/419b25bd1823f78d1219dc4cc441eeaf37646068...v0.6.5 --- .../python-modules/proton-vpn-session/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix index b61bed91682a..38d89bb6d3e0 100644 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ b/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -14,16 +14,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-session"; - version = "0.6.2-unstable-2023-10-24"; + version = "0.6.5"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-session"; - rev = "419b25bd1823f78d1219dc4cc441eeaf37646068"; - hash = "sha256-YPyNxbKxw+670bNQZ7U5nljyUjsNJ+k7eL+HpGiSCLk="; + rev = "refs/tags/v${version}"; + hash = "sha256-1oyCxBO9YqMopbw88UJF8k4BJFP4+m23NwSrqTYqcg8="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=proton.vpn.session --cov-report term" "" + --replace-fail "--cov=proton.vpn.session --cov-report term" "" ''; pythonImportsCheck = [ "proton.vpn.session" ]; From 75c65468353220bacdf9b8e9c6bf68ce433e6665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2024 14:57:45 -0800 Subject: [PATCH 2/6] python311Packages.proton-vpn-api-core: 0.20.1-unstable-2023-10-10 -> 0.20.3 Diff: https://github.com/ProtonVPN/python-proton-vpn-api-core/compare/9c03fc30d3ff08559cab3644eadde027b029375d...v0.20.3 --- .../proton-vpn-api-core/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 0906d2bd4248..ba8869e42daa 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -11,16 +11,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.20.1-unstable-2023-10-10"; + version = "0.20.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; - rev = "9c03fc30d3ff08559cab3644eadde027b029375d"; - hash = "sha256-vnz1+NazQceAs9KA3Jq0tsJditRoG/LoBR+0wuDzzHk="; + rev = "refs/tags/v${version}"; + hash = "sha256-acck0Nc/15soTJBC/4y83ID9fjF/q4vrYr6SsLAAVRY="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=proton/vpn/core/ --cov-report html --cov-report term" "" + --replace-fail "--cov=proton/vpn/core/ --cov-report html --cov-report term" "" ''; pythonImportsCheck = [ "proton.vpn.core" ]; @@ -52,11 +52,6 @@ buildPythonPackage { export HOME=$(mktemp -d) ''; - disabledTestPaths = [ - # Has a single test failing with Permission denied: '/run' - "tests/test_session.py" - ]; - meta = with lib; { description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core"; From b89f0ff860967ffd9d1ba4c6322d162ced19a11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2024 15:02:23 -0800 Subject: [PATCH 3/6] python311Packages.proton-vpn-logger: 0.2.1-unstable-2023-05-10 -> 0.2.1 Diff: https://github.com/ProtonVPN/python-proton-vpn-logger/compare/0acbc1ab41a65cbc9ceb340e3db011e6f89eb65a...v0.2.1 --- .../python-modules/proton-vpn-logger/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix index 6091c2b25a1e..9c581f400c73 100644 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ b/pkgs/development/python-modules/proton-vpn-logger/default.nix @@ -6,16 +6,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-logger"; - version = "0.2.1-unstable-2023-05-10"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-logger"; - rev = "0acbc1ab41a65cbc9ceb340e3db011e6f89eb65a"; - hash = "sha256-VIggBKopAAKiNdQ5ypG1qI74E2WMDwDSriSuka/DBKA="; + rev = "refs/tags/v${version}"; + hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=proton/vpn/logging/ --cov-report html --cov-report term" "" + --replace-fail "--cov=proton/vpn/logging/ --cov-report html --cov-report term" "" ''; pythonImportsCheck = [ "proton.vpn.logging" ]; From 8d32deb0ee077ce35be5919077eca009d310eb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2024 15:05:10 -0800 Subject: [PATCH 4/6] python311Packages.proton-vpn-network-manager: 0.3.0-unstable-2023-09-05 -> 0.3.3 Diff: https://github.com/ProtonVPN/python-proton-vpn-network-manager/compare/6ffd04fa0ae88a89d2b733443317066ef23b3ccd...v0.3.3 --- .../proton-vpn-network-manager/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index f8874e1d0f3a..ccd84eda6698 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -8,19 +8,20 @@ , proton-vpn-connection , pycairo , pygobject3 +, pytest-asyncio , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.3.0-unstable-2023-09-05"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; - rev = "6ffd04fa0ae88a89d2b733443317066ef23b3ccd"; - hash = "sha256-Bqlwo7U/mwodQarl30n3/BNETqit1MVQUJT+mAhC6AI="; + rev = "refs/tags/v${version}"; + hash = "sha256-UEXoIFLB3/q3G3ASrgsXxF21iT5rCWm4knGezcmxmnk="; }; nativeBuildInputs = [ @@ -40,12 +41,13 @@ buildPythonPackage { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" "" + --replace-fail "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" "" ''; pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; From 2e255065509f9bc8b6fd5b765242b5c1031bd2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2024 15:19:17 -0800 Subject: [PATCH 5/6] python311Packages.proton-vpn-connection: 0.11.0-unstable-2023-09-05 -> 0.11.3 Diff: https://github.com/ProtonVPN/python-proton-vpn-connection/compare/747ccacb5350ad59f2a09953b8d20c5c161aab54...v0.11.3 --- .../python-modules/proton-vpn-connection/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix index 7acbb173e8b6..2257130c20e0 100644 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -9,16 +9,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-connection"; - version = "0.11.0-unstable-2023-09-05"; + version = "0.11.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-connection"; - rev = "747ccacb5350ad59f2a09953b8d20c5c161aab54"; - hash = "sha256-WyMG0kmwBKoWc0mHnaop9E0upPAYHFwS/A9I1//WwlY="; + rev = "refs/tags/v${version}"; + hash = "sha256-RuLnc/olI8S09WFG126N2xZgW4gf+DDpRstcelqMhs4="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=proton.vpn.connection --cov-report html --cov-report term" "" + --replace-fail "--cov=proton.vpn.connection --cov-report html --cov-report term" "" ''; pythonImportsCheck = [ "proton.vpn.connection" ]; From 47bcf4a4ddd7cde063ad3b8c6fcca15de254f951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2024 14:52:29 -0800 Subject: [PATCH 6/6] protonvpn-gui: 4.1.0-unstable-2023-10-25 -> 4.1.10 Diff: https://github.com/ProtonVPN/proton-vpn-gtk-app/compare/713324e9e4ee9f030c8115072cae379eb3340c42...v4.1.10 --- pkgs/applications/networking/protonvpn-gui/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index df0afdee4da4..e273a3242739 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -27,14 +27,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.1.0-unstable-2023-10-25"; + version = "4.1.10"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; - rev = "713324e9e4ee9f030c8115072cae379eb3340c42"; - hash = "sha256-DfuM4b2cSIA8j9Ux3TzInRCvzQGb9LvJDSwRhfadBPY="; + rev = "refs/tags/v${version}"; + hash = "sha256-D06dMMjzFE7gIGFpIH/+0xmVCckqAWLkb3lc2ZmxNZs="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=proton --cov-report=html --cov-report=term" "" + --replace-fail "--cov=proton --cov-report=html --cov-report=term" "" ''; postInstall = ''