Skip to content

Commit

Permalink
protonvpn-gui: 4.4.4 -> 4.6.0, deprecate obsolete dependencies
Browse files Browse the repository at this point in the history
Update the protonvpn-gui package to the latest version.

The proton-vpn-network-manager-wireguard and proton-vpn-network-manager-openvpn
modules are now legacy: The same functionality is now in proton-vpn-network-manager
module, version 0.6.3 and upwards.

proton-vpn-connection functionality was integrated in the
proton-vpn-api-core module.

proton-vpn-session functionality was integrated in the proton-vpn-api-core module.

proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module.

proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module

proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module

proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module

proton-vpn-logger functionality was integrated in the proton-vpn-api-core module
  • Loading branch information
Steinhagen committed Oct 16, 2024
1 parent df8b2f0 commit c13d610
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 543 deletions.
16 changes: 2 additions & 14 deletions pkgs/applications/networking/protonvpn-gui/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +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-local-agent,
proton-vpn-logger,
proton-vpn-network-manager,
proton-vpn-session,
pycairo,
pygobject3,
withIndicator ? true,
Expand All @@ -27,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 = [
Expand All @@ -59,15 +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-local-agent
proton-vpn-logger
proton-vpn-network-manager
proton-vpn-session
pycairo
pygobject3
];
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ buildPythonPackage rec {
proton-core
];

pythonImportsCheck = [ "proton.keyring_linux.core" ];
pythonImportsCheck = [
"proton.keyring_linux.core"
"proton.keyring_linux"
];

nativeCheckInputs = [
pytestCheckHook
Expand Down
36 changes: 25 additions & 11 deletions pkgs/development/python-modules/proton-vpn-api-core/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -26,26 +29,37 @@ buildPythonPackage rec {
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)
'';
Expand Down
67 changes: 0 additions & 67 deletions pkgs/development/python-modules/proton-vpn-connection/default.nix

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c13d610

Please sign in to comment.