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

protonvpn-gui: 4.4.4 -> 4.6.0, deprecate obsolete dependencies 

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
parent e26315c7

pkgs/applications/networking/protonvpn-gui/default.nix

+4 −14
Original line number Diff line number Diff line
@@ -9,14 +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-logger,

  proton-vpn-local-agent,

  proton-vpn-network-manager,

  proton-vpn-session,

  pycairo,

  pygobject3,

  withIndicator ? true,
@@ -26,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 = [
@@ -58,14 +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-logger

    proton-vpn-local-agent

    proton-vpn-network-manager

    proton-vpn-session

    pycairo

    pygobject3

  ];

pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  setuptools,

  proton-keyring-linux,

  pytestCheckHook,

  pytest-cov-stub,

}:



buildPythonPackage rec {

  pname = "proton-keyring-linux-secretservice";

  version = "0.0.2";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "python-proton-keyring-linux-secretservice";

    rev = "refs/tags/v${version}";

    hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo=";

  };



  build-system = [ setuptools ];



  dependencies = [ proton-keyring-linux ];



  pythonImportsCheck = [ "proton.keyring_linux" ];



  nativeCheckInputs = [

    pytestCheckHook

    pytest-cov-stub

  ];



  meta = {

    description = "ProtonVPN component to access Linux's keyring secret service API";

    homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice";

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ sebtm ];

  };

}

pkgs/development/python-modules/proton-keyring-linux/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ buildPythonPackage rec { 
    proton-core

  ];



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

  pythonImportsCheck = [

    "proton.keyring_linux.core"

    "proton.keyring_linux"

  ];



  nativeCheckInputs = [

    pytestCheckHook

pkgs/development/python-modules/proton-vpn-api-core/default.nix

+25 −11
Original line number Diff line number Diff line
@@ -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,
@@ -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)

  '';

pkgs/development/python-modules/proton-vpn-connection/default.nix

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  setuptools,

  proton-core,

  proton-vpn-killswitch,

  proton-vpn-logger,

  jinja2,

  pytestCheckHook,

  pytest-cov-stub,

}:



buildPythonPackage rec {

  pname = "proton-vpn-connection";

  version = "0.14.4";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "python-proton-vpn-connection";

    rev = "refs/tags/v${version}";

    hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8=";

  };



  build-system = [ setuptools ];



  dependencies = [

    jinja2

    proton-core

    proton-vpn-killswitch

    proton-vpn-logger

  ];



  pythonImportsCheck = [ "proton.vpn.connection" ];



  nativeCheckInputs = [

    pytestCheckHook

    pytest-cov-stub

  ];



  disabledTests = [

    # Permission denied: '/run'

    "test_ensure_configuration_file_is_deleted"

    "test_ensure_generate_is_returning_expected_content"

    "test_ensure_same_configuration_file_in_case_of_duplicate"

    "test_ensure_configuration_file_is_created"

    "test_wireguard_config_content_generation"

    "test_wireguard_with_malformed_credentials"

    "test_wireguard_with_non_certificate"

    "test_wireguard_without_settings"

    # Neiter udp or tcp are working

    "test_ovpnconfig_with_settings"

    "test_ovpnconfig_with_missing_settings_applies_expected_defaults"

    "test_ovpnconfig_with_malformed_params"

    "test_ovpnconfig_with_certificate_and_malformed_credentials"

    "test_ovpnconfig_with_malformed_server"

    "test_ovpnconfig_with_malformed_server_and_credentials"

  ];



  meta = {

    description = "Defines the interface that VPN connection backends should implement";

    homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection";

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ sebtm ];

  };

}