diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index ff0a4a90ad2d..ae888ee750e9 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -22,14 +22,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.9.7"; + version = "4.12.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; tag = "v${version}"; - hash = "sha256-xpMXpYLLui+1bjK72VPhUT6T/sYpoqN2Jz6sczKJO5U="; + hash = "sha256-pDTzqTiGAisVEHwez526z9C9GzNkMWl6Cui8E6siIXo="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ buildPythonApplication rec { mkdir -p $out/share/{applications,pixmaps} # Fix the desktop file to correctly identify the wrapped app and show the icon during runtime - substitute ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications/protonvpn-app.desktop \ + substitute ${src}/rpmbuild/SOURCES/proton.vpn.app.gtk.desktop $out/share/applications/proton.vpn.app.gtk.desktop \ --replace-fail "StartupWMClass=protonvpn-app" "StartupWMClass=.protonvpn-app-wrapped" install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps ''; diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index b0f67a37c87d..ac38a66dfddf 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.4.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; tag = "v${version}"; - hash = "sha256-EZsPw2kPgY42MQxrXt7yAtCNSmSNN5AYxx7SllwsbvA="; + hash = "sha256-ZT/LkppzeEDGs9aOCx561fA1EgAShPCnMs8c05mgF0k="; }; build-system = [ setuptools ]; @@ -58,6 +58,7 @@ buildPythonPackage rec { # No working transports found "test_auto_works_on_prod" "test_ping" + "test_raw_ping" "test_successful" "test_without_pinning" # Failed assertions diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 7566f1e087cb..eb1884884140 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; tag = "v${version}"; - hash = "sha256-wT+0S3dGanLwqRrpCooAwy/RDyZDn1aEdJ7eWvwVfiY="; + hash = "sha256-deld1MjuTjgjXBCUuDzYABRjN4gT1mz+duV0Qj4IWCg="; }; build-system = [ setuptools ]; 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 b74f34be696b..7b3ef2e8cd00 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, cryptography, + fido2, setuptools, jinja2, proton-core, @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.42.5"; + version = "4.13.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-sSLBo2nTn7rvtSZqCWZLwca5DRIgqSkImRM6U6/xJ70="; + hash = "sha256-DJXKfUkV0ojL9UjM6cyFAOkdYhzZZU9L3z1ARjIQnUI="; }; build-system = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { dependencies = [ cryptography distro + fido2 jinja2 pynacl proton-core diff --git a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix index 2a285cde4da9..373fcdd04a91 100644 --- a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -5,6 +5,7 @@ python, buildPythonPackage, cargo, + pypaInstallHook, rustPlatform, }: @@ -36,6 +37,7 @@ buildPythonPackage rec { cargoBuildType = "release"; nativeBuildInputs = [ cargo + pypaInstallHook rustPlatform.cargoSetupHook rustPlatform.cargoBuildHook ]; @@ -45,14 +47,10 @@ buildPythonPackage rec { rustPlatform.cargoCheckHook ]; - installPhase = '' - runHook preInstall - - # manually install the python binding - mkdir -p $out/${python.sitePackages}/proton/vpn/ - cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python.sitePackages}/proton/vpn/local_agent.so - - runHook postInstall + postBuild = '' + ${python.interpreter} scripts/build_wheel.py + mkdir -p ./dist + cp ./target/*.whl ./dist ''; pythonImportsCheck = [ "proton.vpn.local_agent" ]; @@ -62,6 +60,9 @@ buildPythonPackage rec { homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ sebtm ]; + maintainers = with lib.maintainers; [ + sebtm + rapiteanu + ]; }; } 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 1d1da8138ed5..1a87e16f3265 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.12.14"; + version = "0.13.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; tag = "v${version}"; - hash = "sha256-flZeEdmGXsSFHtlm6HrBtuwOcYJFjWmkMvGgnHL4cPw="; + hash = "sha256-VMaj85oFxLkloR6hdeRHwVTBl44Mx5WEjOl9FnLf8+w="; }; nativeBuildInputs = [