From 37702145d23109bc0d59cecb326640fa4342892c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Wed, 23 Apr 2025 00:33:36 +0300 Subject: [PATCH 1/6] proton-vpn-local-agent: 1.4.4 -> 1.4.5 Update the package to the latest version. --- pkgs/by-name/pr/proton-vpn-local-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix index c9a25a988dcd..98b8ce3c2a97 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "proton-vpn-local-agent"; - version = "1.4.4"; + version = "1.4.5"; useFetchCargoVendor = true; - cargoHash = "sha256-i/qJwN8693MRaWTcvGGcWMCqclyOOIb/wlqiUilOhzQ="; + cargoHash = "sha256-RrMhkOZyG0JBEk+ikRpQtsNVR6Jt94u71+srQ6qMq5U="; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-local-agent"; rev = version; - hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o="; + hash = "sha256-njulvM8CNURy5Gy8thOT08y4cq9T68Ktl6wlfvg5I4w="; }; sourceRoot = "${src.name}/python-proton-vpn-local-agent"; From 30dd3cef6aea023ea98b65ee72a0ce9d70ab524d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Wed, 23 Apr 2025 00:37:01 +0300 Subject: [PATCH 2/6] python3Packages.proton-vpn-network-manager: remove broken tag --- .../python-modules/proton-vpn-network-manager/default.nix | 1 - 1 file changed, 1 deletion(-) 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 da9b102da053..937c54b5c103 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -77,7 +77,6 @@ buildPythonPackage rec { ''; meta = { - broken = true; # ModuleNotFoundError: No module named 'proton.vpn.local_agent' description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; license = lib.licenses.gpl3Only; From ee1b3b499abaf6ac81425eb9038bd64906fa2c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Wed, 23 Apr 2025 00:41:16 +0300 Subject: [PATCH 3/6] python3Packages.proton-vpn-api-core: 0.42.3 -> 0.42.4 --- .../python-modules/proton-vpn-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0361703a9df8..babb3c02bcf4 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.42.3"; + version = "0.42.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-/GV5DFWc6RBWP723APNxn9FTxdePumYOtdwDQEg4ccA="; + hash = "sha256-WzyxBeIiOXDxyv0/guPWO16pN41ZVXnxd6iiiZ+bLR4="; }; build-system = [ From fe652dea626d8344668d370c15b83e6902dddc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Wed, 23 Apr 2025 00:46:58 +0300 Subject: [PATCH 4/6] protonvpn-gui: 4.9.5 -> 4.9.6 Update the package to the latest version --- pkgs/applications/networking/protonvpn-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 3bc4d3be4d81..eb4d15dc1986 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.5"; + version = "4.9.6"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; - tag = "v${version}"; - hash = "sha256-mXRTXr7u049pgPRK5gwaGfQUmUl4vlKca4lRH06HZj8="; + tag = "${version}"; + hash = "sha256-Undf3qSClcRa1e9f6B/1hLPIjc2KPG745AXxYHQA0nE="; }; nativeBuildInputs = [ From df30da3e5b68a5bf6679efddc6e7b92910fd3a13 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 18:00:11 +0200 Subject: [PATCH 5/6] proton-vpn-local-agent: move to python3Packages --- .../proton-vpn-local-agent/default.nix} | 38 ++++++++++++++++--- pkgs/top-level/aliases.nix | 3 ++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 37 insertions(+), 6 deletions(-) rename pkgs/{by-name/pr/proton-vpn-local-agent/package.nix => development/python-modules/proton-vpn-local-agent/default.nix} (52%) diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix similarity index 52% rename from pkgs/by-name/pr/proton-vpn-local-agent/package.nix rename to pkgs/development/python-modules/proton-vpn-local-agent/default.nix index 98b8ce3c2a97..675f83003256 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -2,15 +2,17 @@ lib, stdenv, fetchFromGitHub, + python, + buildPythonPackage, + cargo, rustPlatform, - python3, }: -rustPlatform.buildRustPackage rec { +buildPythonPackage rec { pname = "proton-vpn-local-agent"; version = "1.4.5"; - useFetchCargoVendor = true; - cargoHash = "sha256-RrMhkOZyG0JBEk+ikRpQtsNVR6Jt94u71+srQ6qMq5U="; + pyproject = false; + withDistOutput = false; src = fetchFromGitHub { owner = "ProtonVPN"; @@ -19,14 +21,38 @@ rustPlatform.buildRustPackage rec { hash = "sha256-njulvM8CNURy5Gy8thOT08y4cq9T68Ktl6wlfvg5I4w="; }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + sourceRoot + ; + hash = "sha256-RrMhkOZyG0JBEk+ikRpQtsNVR6Jt94u71+srQ6qMq5U="; + }; + sourceRoot = "${src.name}/python-proton-vpn-local-agent"; + cargoBuildType = "release"; + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.cargoBuildHook + ]; + + cargoCheckType = "release"; + nativeCheckInputs = [ + rustPlatform.cargoCheckHook + ]; + installPhase = '' # manually install the python binding - mkdir -p $out/${python3.sitePackages}/proton/vpn/ - cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python3.sitePackages}/proton/vpn/local_agent.so + 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 ''; + pythonImportsCheck = [ "proton.vpn.local_agent" ]; + meta = { description = "Proton VPN local agent written in Rust with Python bindings"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c177b1f2b255..4a2a44e2f426 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1493,6 +1493,9 @@ mapAliases { protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18 protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 + proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" ( + python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent + ); # Added 2025-04-23 proxmark3-rrg = proxmark3; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2fc8a1aaa565..84b29802e182 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11483,6 +11483,8 @@ self: super: with self; { callPackage ../development/python-modules/proton-vpn-network-manager { }; + proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { }; + protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { From 88d498febe47fe9ed95d5409aaf5f6ce47c3375b Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 24 Apr 2025 14:31:45 +0200 Subject: [PATCH 6/6] proton-vpn-local-agent: run pre/postInstall hooks --- .../python-modules/proton-vpn-local-agent/default.nix | 4 ++++ 1 file changed, 4 insertions(+) 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 675f83003256..513c958bb98c 100644 --- a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -46,9 +46,13 @@ buildPythonPackage rec { ]; 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 ''; pythonImportsCheck = [ "proton.vpn.local_agent" ];