From 033c5ebaf65147c8bd9511f30153ad725b3e8bdc Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 16 Oct 2025 10:55:50 +0200 Subject: [PATCH] python3Packages.protonvpn-nm-lib: remove Project has been removed from upstream: https://github.com/ProtonVPN/protonvpn-nm-lib is now 404 --- .../0001-Patching-GIRepository.patch | 22 ----- .../protonvpn-nm-lib/default.nix | 81 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 - 4 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch delete mode 100644 pkgs/development/python-modules/protonvpn-nm-lib/default.nix diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch deleted file mode 100644 index bb34dff0b5a6..000000000000 --- a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2867f022aad754fe54d95222b3ae52f6e7f14c2f Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" -Date: Wed, 27 Apr 2022 21:49:12 -0600 -Subject: [PATCH] Patching GIRepository - ---- - protonvpn_nm_lib/__init__.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/protonvpn_nm_lib/__init__.py b/protonvpn_nm_lib/__init__.py -index e69de29..00b95f4 100644 ---- a/protonvpn_nm_lib/__init__.py -+++ b/protonvpn_nm_lib/__init__.py -@@ -0,0 +1,5 @@ -+import gi -+gi.require_version('GIRepository', '2.0') -+from gi.repository import GIRepository -+repo = GIRepository.Repository.get_default() -+repo.prepend_search_path('@networkmanager_path@') --- -2.35.1 - diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix deleted file mode 100644 index 43784048fdd3..000000000000 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - replaceVars, - dbus-python, - distro, - jinja2, - keyring, - proton-client, - pygobject3, - pyxdg, - systemd, - ncurses, - networkmanager, - pkgs-systemd, - python, - xdg-utils, -}: - -buildPythonPackage rec { - pname = "protonvpn-nm-lib"; - version = "3.16.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "protonvpn-nm-lib"; - tag = version; - hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA="; - }; - - propagatedBuildInputs = [ - dbus-python - distro - jinja2 - keyring - proton-client - pygobject3 - pyxdg - systemd - ncurses - networkmanager - pkgs-systemd - xdg-utils - ]; - - patches = [ - (replaceVars ./0001-Patching-GIRepository.patch { - networkmanager_path = "${networkmanager}/lib/girepository-1.0"; - }) - ]; - - postPatch = '' - substituteInPlace protonvpn_nm_lib/core/dbus/dbus_reconnect.py \ - --replace "exec_start = python_interpreter_path + \" \" + python_service_path" "exec_start = \"$out/bin/protonvpn_reconnector.py\"" - ''; - - postInstall = '' - makeWrapper ${python.interpreter} $out/bin/protonvpn_reconnector.py \ - --add-flags $out/${python.sitePackages}/protonvpn_nm_lib/daemon/dbus_daemon_reconnector.py \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - # Checks cannot be run in the sandbox - # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" - doCheck = false; - - pythonImportsCheck = [ "protonvpn_nm_lib" ]; - - meta = with lib; { - description = "ProtonVPN NetworkManager Library intended for every ProtonVPN service user"; - mainProgram = "protonvpn_reconnector.py"; - homepage = "https://github.com/ProtonVPN/protonvpn-nm-lib"; - license = licenses.gpl3Only; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b0802068b303..96dd8384c176 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -545,6 +545,7 @@ mapAliases { prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 + protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16 proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16 proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59c777b281b3..9c5631d559ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12287,10 +12287,6 @@ self: super: with self; { protonup-ng = callPackage ../development/python-modules/protonup-ng { }; - protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { - pkgs-systemd = pkgs.systemd; - }; - prov = callPackage ../development/python-modules/prov { }; prox-tv = callPackage ../development/python-modules/prox-tv { };