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

Merge pull request #267259 from WolfangAukang/protonvpn-gui-v4 

protonvpn-gui: 1.12.0 -> 4.1.0-unstable-2023-10-25, protonvpn-gui_legacy: init at 1.12.0
parents 8b9ae0bd 9aa6e8c5

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

+70 −41
Original line number Diff line number Diff line 
{ lib

, buildPythonApplication

, fetchFromGitHub

, wrapGAppsHook

, gdk-pixbuf

, glib-networking

, gobject-introspection

, imagemagick

, librsvg

, pango

, webkitgtk

# Python libs

, protonvpn-nm-lib

, psutil

# Optionals

, setuptools

, wrapGAppsHook

, 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

, pytestCheckHook

, withIndicator ? true

, libappindicator-gtk3 }:

, libappindicator-gtk3

, libayatana-appindicator

}:



buildPythonApplication rec {

  pname = "protonvpn-gui";

  version = "1.12.0";

  version = "4.1.0-unstable-2023-10-25";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "linux-app";

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

    sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY=";

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

    rev = "713324e9e4ee9f030c8115072cae379eb3340c42";

    hash = "sha256-DfuM4b2cSIA8j9Ux3TzInRCvzQGb9LvJDSwRhfadBPY=";

  };



  nativeBuildInputs = [

    gdk-pixbuf

    # Needed for the NM namespace

    gobject-introspection

    imagemagick

    setuptools

    wrapGAppsHook

  ];



  buildInputs = lib.optionals withIndicator [

    # Adds AppIndicator3 namespace

    libappindicator-gtk3

    # Adds AyatanaAppIndicator3 namespace

    libayatana-appindicator

  ];



  propagatedBuildInputs = [

    glib-networking # needed for the login captcha

    protonvpn-nm-lib

    psutil

    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

  ];



  buildInputs = [

    librsvg

    pango

    webkitgtk

  ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ];

  postPatch = ''

    substituteInPlace setup.cfg \

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

  '';



  postInstall = ''

    # Setting icons

    for size in 16 32 48 64 72 96 128 192 512 1024; do

      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps

      convert -resize $size'x'$size \

        protonvpn_gui/assets/icons/protonvpn-logo.png \

        $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png

    done

    mkdir -p $out/share/{applications,pixmaps}

    install -Dm 644 ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications

    install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps

  '';



  nativeCheckInputs = [

    pytestCheckHook

  ];



    install -Dm644 protonvpn.desktop -t $out/share/applications/

    substituteInPlace $out/share/applications/protonvpn.desktop \

      --replace 'protonvpn-logo' protonvpn

  preCheck = ''

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

    export HOME=$(mktemp -d)

  '';



  # Project has a dummy test

  # Gets a segmentation fault after the widgets test

  doCheck = false;



  meta = with lib; {

    description = "Official ProtonVPN Linux app";

    homepage = "https://github.com/ProtonVPN/linux-app";

    maintainers = with maintainers; [ wolfangaukang ];

    description = "Proton VPN GTK app for Linux";

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

    license = licenses.gpl3Plus;

    mainProgram = "protonvpn";

    platforms = platforms.linux;

    mainProgram = "protonvpn-app";

    maintainers = with maintainers; [ wolfangaukang ];

  };

}

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

0 → 100644
+79 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonApplication

, fetchFromGitHub

, setuptools

, wrapGAppsHook

, gdk-pixbuf

, glib-networking

, gobject-introspection

, imagemagick

, librsvg

, pango

, python3

, webkitgtk

# Python libs

, protonvpn-nm-lib

, psutil

# Optionals

, withIndicator ? true

, libappindicator-gtk3 }:



buildPythonApplication rec {

  pname = "protonvpn-gui";

  version = "1.12.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "linux-app";

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

    sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY=";

  };



  nativeBuildInputs = [

    gdk-pixbuf

    gobject-introspection

    imagemagick

    setuptools

    wrapGAppsHook

  ];



  propagatedBuildInputs = [

    glib-networking # needed for the login captcha

    protonvpn-nm-lib

    psutil

  ];



  buildInputs = [

    librsvg

    pango

    webkitgtk

  ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ];



  postInstall = ''

    # Setting icons

    for size in 16 32 48 64 72 96 128 192 512 1024; do

      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps

      convert -resize $size'x'$size \

        protonvpn_gui/assets/icons/protonvpn-logo.png \

        $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png

    done



    install -Dm644 protonvpn.desktop -t $out/share/applications/

    chmod 644 $out/${python3.sitePackages}/protonvpn_gui/assets/icons/plus-server.png

    substituteInPlace $out/share/applications/protonvpn.desktop \

      --replace 'protonvpn-logo' protonvpn

  '';



  # Project has a dummy test

  doCheck = false;



  meta = with lib; {

    description = "Official ProtonVPN Linux app";

    homepage = "https://github.com/ProtonVPN/linux-app";

    maintainers = with maintainers; [ wolfangaukang ];

    license = licenses.gpl3Plus;

    mainProgram = "protonvpn";

    platforms = platforms.linux;

  };

}

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

0 → 100644
+76 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, setuptools

, aiohttp

, bcrypt

, pyopenssl

, python-gnupg

, requests

, pytestCheckHook

}:



buildPythonPackage {

  pname = "proton-core";

  version = "0.1.15-unstable-2023-10-24";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

    repo = "python-proton-core";

    rev = "5e795e04094dff67c03c56f2f3de03ff43514cc4";

    hash = "sha256-hchwrolc65tVmSe2IzxwH2zDU2JZzXrCMzWaETWcMDI=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    bcrypt

    aiohttp

    pyopenssl

    python-gnupg

    requests

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

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

  '';



  pythonImportsCheck = [ "proton" ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  disabledTestPaths = [

    # Single test, requires internet connection

    "tests/test_alternativerouting.py"

  ];



  disabledTests = [

    # Invalid modulus

    "test_modulus_verification"

    # Permission denied: '/run'

    "test_broken_data"

    "test_broken_index"

    "test_sessions"

    # No working transports found

    "test_auto_works_on_prod"

    "test_ping"

    "test_successful"

    "test_without_pinning"

    # Failed assertions

    "test_bad_pinning_fingerprint_changed"

    "test_bad_pinning_url_changed"

  ];



  meta = {

    description = "Core logic used by the other Proton components";

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

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ wolfangaukang ];

  };

}

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

0 → 100644
+46 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, setuptools

, proton-keyring-linux

, pytestCheckHook

}:



buildPythonPackage {

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

  version = "0.0.1-unstable-2023-04-14";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

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

    rev = "973d2646ec4d04bc270df53058df892950244e70";

    hash = "sha256-JlhvJBpbewT2c8k31CPMUlvvo/orWW1qfylFZLnDxeY=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    proton-keyring-linux

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

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

  '';



  pythonImportsCheck = [ "proton.keyring_linux" ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  meta = with lib; {

    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 = with maintainers; [ wolfangaukang ];

  };

}

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

0 → 100644
+48 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, setuptools

, keyring

, proton-core

, pytestCheckHook

}:



buildPythonPackage {

  pname = "proton-keyring-linux";

  version = "0.0.1-unstable-2023-04-14";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ProtonVPN";

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

    rev = "5ff3c7f9a1a162836649502dd23c2fbe1f487d73";

    hash = "sha256-4d8ZePG8imURhdNtLbraMRisrTLoRvJ+L2UuuOo3MPM=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    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

  ];



  meta = with lib; {

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

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

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ wolfangaukang ];

  };

}