Commit 3e2bf57c authored by Viorel-Cătălin Răpițeanu's avatar Viorel-Cătălin Răpițeanu
Browse files

python3Packages.proton-vpn-network-manager: deprecates...

python3Packages.proton-vpn-network-manager: deprecates proton-vpn-network-manager-openvpn and proton-vpn-network-manager-wireguard

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.

This commit removes the 2 deprecated modules and creates a throw message for
them to the recommanded package to be used.
parent edd749df
Loading
Loading
Loading
Loading
+0 −52
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  gobject-introspection,
  setuptools,
  proton-core,
  proton-vpn-network-manager,
  pytestCheckHook,
  pytest-cov-stub,
}:

buildPythonPackage rec {
  pname = "proton-vpn-network-manager-openvpn";
  version = "0.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ProtonVPN";
    repo = "python-proton-vpn-network-manager-openvpn";
    rev = "refs/tags/v${version}";
    hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo=";
  };

  nativeBuildInputs = [
    # Solves Namespace NM not available
    gobject-introspection
  ];

  build-system = [
    setuptools
  ];

  dependencies = [
    proton-core
    proton-vpn-network-manager
  ];

  pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ];

  nativeCheckInputs = [
    pytestCheckHook
    pytest-cov-stub
  ];

  meta = {
    description = "Adds support for the OpenVPN protocol using NetworkManager";
    homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ sebtm ];
  };
}
+0 −57
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  gobject-introspection,
  setuptools,
  proton-core,
  proton-vpn-killswitch-network-manager-wireguard,
  proton-vpn-network-manager,
  pytestCheckHook,
  pytest-cov-stub,
}:

buildPythonPackage rec {
  pname = "proton-vpn-network-manager-wireguard";
  version = "0.4.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ProtonVPN";
    repo = "python-proton-vpn-network-manager-wireguard";
    rev = "v${version}";
    hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw=";
  };

  nativeBuildInputs = [
    # Solves Namespace NM not available
    gobject-introspection
  ];

  build-system = [
    setuptools
  ];

  dependencies = [
    proton-core
    proton-vpn-killswitch-network-manager-wireguard
    proton-vpn-network-manager
  ];

  preCheck = ''
    # Needed for Permission denied: '/homeless-shelter'
    export HOME=$(mktemp -d)
  '';

  nativeCheckInputs = [
    pytestCheckHook
    pytest-cov-stub
  ];

  meta = {
    description = "Adds support for the Wireguard protocol using NetworkManager";
    homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ sebtm ];
  };
}
+2 −0
Original line number Diff line number Diff line
@@ -395,6 +395,8 @@ mapAliases ({
  prometheus_client = prometheus-client; # added 2021-06-10
  prompt_toolkit = prompt-toolkit; # added 2021-07-22
  protonup = protonup-ng; # Added 2022-11-06
  proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-09-20
  proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-09-20
  proxy_tools = proxy-tools; # added 2023-11-05
  pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
  pushbullet = pushbullet-py;  # Added 2022-10-15
+0 −4
Original line number Diff line number Diff line
@@ -10636,10 +10636,6 @@ self: super: with self; {
  proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { };
  proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { };
  proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { };
  proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { };
  protonup-ng = callPackage ../development/python-modules/protonup-ng { };