protonvpn-gui: 4.4.4 -> 4.6.0

pkgs/applications/networking/protonvpn-gui/default.nix

@@ -9,16 +9,9 @@
   packaging,
   proton-core,
   proton-keyring-linux,
-  proton-keyring-linux-secretservice,
   proton-vpn-api-core,
-  proton-vpn-connection,
-  proton-vpn-killswitch,
-  proton-vpn-killswitch-network-manager,
-  proton-vpn-logger,
+  proton-vpn-local-agent,
   proton-vpn-network-manager,
-  proton-vpn-network-manager-openvpn,
-  proton-vpn-network-manager-wireguard,
-  proton-vpn-session,
   pycairo,
   pygobject3,
   withIndicator ? true,
@@ -28,14 +21,14 @@
 
 buildPythonApplication rec {
   pname = "protonvpn-gui";
-  version = "4.4.4";
+  version = "4.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
     rev = "refs/tags/v${version}";
-    hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM=";
+    hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro=";
   };
 
   nativeBuildInputs = [
@@ -60,16 +53,9 @@ buildPythonApplication rec {
     packaging
     proton-core
     proton-keyring-linux
-    proton-keyring-linux-secretservice
     proton-vpn-api-core
-    proton-vpn-connection
-    proton-vpn-killswitch
-    proton-vpn-killswitch-network-manager
-    proton-vpn-logger
+    proton-vpn-local-agent
     proton-vpn-network-manager
-    proton-vpn-network-manager-openvpn
-    proton-vpn-network-manager-wireguard
-    proton-vpn-session
     pycairo
     pygobject3
   ];

pkgs/development/python-modules/proton-core/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "proton-core";
-  version = "0.2.0";
+  version = "0.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-core";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ=";
+    hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/proton-keyring-linux/default.nix

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "proton-keyring-linux";
-  version = "0.0.2";
+  version = "0.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-keyring-linux";
     rev = "refs/tags/v${version}";
-    hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU=";
+    hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys=";
   };
 
   build-system = [ setuptools ];
@@ -28,7 +28,10 @@ buildPythonPackage rec {
     proton-core
   ];
 
-  pythonImportsCheck = [ "proton.keyring_linux.core" ];
+  pythonImportsCheck = [
+    "proton.keyring_linux.core"
+    "proton.keyring_linux"
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

pkgs/development/python-modules/proton-vpn-api-core/default.nix

@@ -2,12 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  cryptography,
   setuptools,
+  jinja2,
   proton-core,
-  proton-vpn-connection,
-  proton-vpn-logger,
-  proton-vpn-killswitch,
-  proton-vpn-session,
+  pynacl,
+  aiohttp,
+  pyopenssl,
+  pytest-asyncio,
+  requests,
   sentry-sdk,
   distro,
   pytestCheckHook,
@@ -16,36 +19,47 @@
 
 buildPythonPackage rec {
   pname = "proton-vpn-api-core";
-  version = "0.32.2";
+  version = "0.35.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-api-core";
     rev = "v${version}";
-    hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI=";
+    hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
+    cryptography
     distro
+    jinja2
+    pynacl
     proton-core
-    proton-vpn-connection
-    proton-vpn-logger
-    proton-vpn-killswitch
-    proton-vpn-session
     sentry-sdk
   ];
 
-  pythonImportsCheck = [ "proton.vpn.core" ];
+  pythonImportsCheck = [
+    "proton.vpn.core"
+    "proton.vpn.connection"
+    "proton.vpn.killswitch.interface"
+    "proton.vpn.logging"
+    "proton.vpn.session"
+  ];
 
   nativeCheckInputs = [
+    aiohttp
+    pyopenssl
+    pytest-asyncio
+    requests
     pytestCheckHook
     pytest-cov-stub
   ];
 
-  preCheck = ''
+  postInstall = ''
     # Needed for Permission denied: '/homeless-shelter'
     export HOME=$(mktemp -d)
   '';