Unverified Commit d3e4218b authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

protonvpn-gui: 4.3.0 -> 4.4.4 (#334674)

parents d413e712 301d342d

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

+38 −39
Original line number Diff line number Diff line 
{ lib

, buildPythonApplication

, fetchFromGitHub

, gobject-introspection

, setuptools

, wrapGAppsHook3

, dbus-python

, 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-network-manager

, proton-vpn-network-manager-openvpn

, proton-vpn-session

, pycairo

, pygobject3

, pytest-cov-stub

, pytestCheckHook

, withIndicator ? true

, libappindicator-gtk3

, libayatana-appindicator

{

  lib,

  buildPythonApplication,

  fetchFromGitHub,

  gobject-introspection,

  setuptools,

  wrapGAppsHook3,

  dbus-python,

  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-network-manager,

  proton-vpn-network-manager-openvpn,

  proton-vpn-network-manager-wireguard,

  proton-vpn-session,

  pycairo,

  pygobject3,

  withIndicator ? true,

  libappindicator-gtk3,

  libayatana-appindicator,

}:



buildPythonApplication rec {

  pname = "protonvpn-gui";

  version = "4.3.0";

  version = "4.4.4";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "proton-vpn-gtk-app";

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

    hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc=";

    hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM=";

  };



  nativeBuildInputs = [

    # Needed for the NM namespace

    gobject-introspection

    setuptools

    wrapGAppsHook3

  ];
@@ -52,7 +51,11 @@ buildPythonApplication rec { 
    libayatana-appindicator

  ];



  propagatedBuildInputs = [

  build-system = [

    setuptools

  ];



  dependencies = [

    dbus-python

    packaging

    proton-core
@@ -65,6 +68,7 @@ buildPythonApplication rec { 
    proton-vpn-logger

    proton-vpn-network-manager

    proton-vpn-network-manager-openvpn

    proton-vpn-network-manager-wireguard

    proton-vpn-session

    pycairo

    pygobject3
@@ -76,11 +80,6 @@ buildPythonApplication rec { 
    install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps

  '';



  nativeCheckInputs = [

    pytest-cov-stub

    pytestCheckHook

  ];



  preCheck = ''

    # Needed for Permission denied: '/homeless-shelter'

    export HOME=$(mktemp -d)
@@ -89,12 +88,12 @@ buildPythonApplication rec { 
  # Gets a segmentation fault after the widgets test

  doCheck = false;



  meta = with lib; {

  meta = {

    description = "Proton VPN GTK app for Linux";

    homepage = "https://github.com/ProtonVPN/proton-vpn-gtk-app";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.linux;

    mainProgram = "protonvpn-app";

    maintainers = [ ];

    maintainers = with lib.maintainers; [ sebtm ];

  };

}

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

+21 −19
Original line number Diff line number Diff line 
{ lib

, buildPythonApplication

, fetchFromGitHub

, setuptools

, wrapGAppsHook3

, gdk-pixbuf

, glib-networking

, gobject-introspection

, imagemagick

, librsvg

, pango

, python3

, webkitgtk

{

  lib,

  buildPythonApplication,

  fetchFromGitHub,

  setuptools,

  wrapGAppsHook3,

  gdk-pixbuf,

  glib-networking,

  gobject-introspection,

  imagemagick,

  librsvg,

  pango,

  python3,

  webkitgtk,

  # Python libs

, protonvpn-nm-lib

, psutil

  protonvpn-nm-lib,

  psutil,

  # Optionals

, withIndicator ? true

, libappindicator-gtk3 }:

  withIndicator ? true,

  libappindicator-gtk3,

}:



buildPythonApplication rec {

  pname = "protonvpn-gui";

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

+12 −11
Original line number Diff line number Diff line
@@ -9,23 +9,25 @@ 
  python-gnupg,

  requests,

  pytestCheckHook,

  pyotp,

  pytest-cov-stub,

}:



buildPythonPackage rec {

  pname = "proton-core";

  version = "0.1.16";

  version = "0.2.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "python-proton-core";

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

    hash = "sha256-072XuHvgWludlFwp/tqLpuAU89vzifFhwQ01FuiCoL8=";

    hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    bcrypt

    aiohttp

    pyopenssl
@@ -33,14 +35,13 @@ buildPythonPackage rec { 
    requests

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "--cov=proton --cov-report html --cov-report term" ""

  '';



  pythonImportsCheck = [ "proton" ];



  nativeCheckInputs = [ pytestCheckHook ];

  nativeCheckInputs = [

    pytestCheckHook

    pytest-cov-stub

    pyotp

  ];



  disabledTestPaths = [

    # Single test, requires internet connection
@@ -68,6 +69,6 @@ buildPythonPackage rec { 
    description = "Core logic used by the other Proton components";

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

    license = lib.licenses.gpl3Only;

    maintainers = [ ];

    maintainers = with lib.maintainers; [ sebtm ];

  };

}

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

+10 −11
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  setuptools,

  proton-keyring-linux,

  pytestCheckHook,

  pytest-cov-stub,

}:



buildPythonPackage rec {
@@ -19,23 +20,21 @@ buildPythonPackage rec { 
    hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [ proton-keyring-linux ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "--cov=proton.keyring_linux.secretservice --cov-report html --cov-report term" ""

  '';

  dependencies = [ proton-keyring-linux ];



  pythonImportsCheck = [ "proton.keyring_linux" ];



  nativeCheckInputs = [ pytestCheckHook ];

  nativeCheckInputs = [

    pytestCheckHook

    pytest-cov-stub

  ];



  meta = with lib; {

  meta = {

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

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

    license = licenses.gpl3Only;

    maintainers = [ ];

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ sebtm ];

  };

}

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

+10 −11
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  keyring,

  proton-core,

  pytestCheckHook,

  pytest-cov-stub,

}:



buildPythonPackage rec {
@@ -20,26 +21,24 @@ buildPythonPackage rec { 
    hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    keyring

    proton-core

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "--cov=proton.keyring_linux.core --cov-report html --cov-report term" ""

  '';



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



  nativeCheckInputs = [ pytestCheckHook ];

  nativeCheckInputs = [

    pytestCheckHook

    pytest-cov-stub

  ];



  meta = with lib; {

  meta = {

    description = "ProtonVPN core component to access Linux's keyring";

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

    license = licenses.gpl3Only;

    maintainers = [ ];

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ sebtm ];

  };

}