Merge pull request #170726 from WolfangAukang/protonvpn-cli-legacy
commit
4c4133e86d
@ -0,0 +1,51 @@ |
||||
{ lib |
||||
, buildPythonApplication |
||||
, fetchFromGitHub |
||||
, pythonOlder |
||||
, requests |
||||
, docopt |
||||
, pythondialog |
||||
, jinja2 |
||||
, distro |
||||
, dialog |
||||
, iptables |
||||
, openvpn }: |
||||
|
||||
buildPythonApplication rec { |
||||
pname = "protonvpn-cli_2"; |
||||
version = "2.2.11"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.5"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "Rafficer"; |
||||
repo = "linux-cli-community"; |
||||
# There is a tag and branch with the same name |
||||
rev = "refs/tags/v${version}"; |
||||
sha256 = "sha256-CWQpisJPBXbf+d5tCGuxfSQQZBeF36WFF4b6OSUn3GY="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
requests |
||||
docopt |
||||
pythondialog |
||||
jinja2 |
||||
distro |
||||
dialog |
||||
openvpn |
||||
iptables |
||||
]; |
||||
|
||||
# No tests |
||||
doCheck = false; |
||||
|
||||
meta = with lib; { |
||||
description = "Linux command-line client for ProtonVPN using Openvpn"; |
||||
homepage = "https://github.com/Rafficer/linux-cli-community"; |
||||
maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; |
||||
license = licenses.gpl3Plus; |
||||
platforms = platforms.linux; |
||||
mainProgram = "protonvpn"; |
||||
}; |
||||
} |
@ -1,37 +1,41 @@ |
||||
{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: |
||||
{ lib |
||||
, buildPythonApplication |
||||
, pythonOlder |
||||
, fetchFromGitHub |
||||
, protonvpn-nm-lib |
||||
, pythondialog |
||||
, dialog |
||||
}: |
||||
|
||||
python3Packages.buildPythonApplication rec { |
||||
pname = "protonvpn-linux-cli"; |
||||
version = "2.2.6"; |
||||
buildPythonApplication rec { |
||||
pname = "protonvpn-cli"; |
||||
version = "3.11.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.5"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "protonvpn"; |
||||
repo = "linux-cli"; |
||||
rev = "v${version}"; |
||||
sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; |
||||
rev = version; |
||||
sha256 = "sha256-u+POtUz7NoGS23aOmvDCZPUp2HW1xXGtfbZR88cWCBc="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = (with python3Packages; [ |
||||
requests |
||||
docopt |
||||
setuptools |
||||
jinja2 |
||||
pythondialog |
||||
]) ++ [ |
||||
dialog |
||||
openvpn |
||||
iptables |
||||
]; |
||||
propagatedBuildInputs = [ |
||||
protonvpn-nm-lib |
||||
pythondialog |
||||
dialog |
||||
]; |
||||
|
||||
# No tests |
||||
# Project has a dummy test |
||||
doCheck = false; |
||||
|
||||
meta = with lib; { |
||||
description = "Linux command-line client for ProtonVPN"; |
||||
homepage = "https://github.com/protonvpn/linux-cli"; |
||||
maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; |
||||
maintainers = with maintainers; [ wolfangaukang ]; |
||||
license = licenses.gpl3Plus; |
||||
platforms = platforms.linux; |
||||
mainProgram = "protonvpn"; |
||||
mainProgram = "protonvpn-cli"; |
||||
}; |
||||
} |
||||
|
@ -0,0 +1,22 @@ |
||||
From 2867f022aad754fe54d95222b3ae52f6e7f14c2f Mon Sep 17 00:00:00 2001
|
||||
From: "P. R. d. O" <d.ol.rod@tutanota.com>
|
||||
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
|
||||
|
Loading…
Reference in new issue