gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protonvpn-gui/proton-*: refactor to use build-system and dependencies

Browse Source
This commit is contained in:
Sebastian Sellmeier
2024-09-13 21:51:29 +02:00
parent 96c8a4f149
commit 301d342dca
14 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/protonvpn-gui/default.nix
+6 -1
View File
@@ -55,7 +55,7 @@ buildPythonApplication rec {
setuptools
];
propagatedBuildInputs = [
dependencies = [
dbus-python
packaging
proton-core
@@ -80,6 +80,11 @@ buildPythonApplication rec {
install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps
'';
preCheck = ''
# Needed for Permission denied: '/homeless-shelter'
export HOME=$(mktemp -d)
'';
# Gets a segmentation fault after the widgets test
doCheck = false;
pkgs/development/python-modules/proton-core/default.nix
+2 -2
View File
@@ -25,9 +25,9 @@ buildPythonPackage rec {
hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
bcrypt
aiohttp
pyopenssl
pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix
+2 -2
View File
@@ -20,9 +20,9 @@ buildPythonPackage rec {
hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [ proton-keyring-linux ];
dependencies = [ proton-keyring-linux ];
pythonImportsCheck = [ "proton.keyring_linux" ];
pkgs/development/python-modules/proton-keyring-linux/default.nix
+2 -2
View File
@@ -21,9 +21,9 @@ buildPythonPackage rec {
hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
keyring
proton-core
];
pkgs/development/python-modules/proton-vpn-api-core/default.nix
+2 -2
View File
@@ -26,9 +26,9 @@ buildPythonPackage rec {
hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
distro
proton-core
proton-vpn-connection
pkgs/development/python-modules/proton-vpn-connection/default.nix
+2 -2
View File
@@ -23,9 +23,9 @@ buildPythonPackage rec {
hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
jinja2
proton-core
proton-vpn-killswitch
pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix
+4 -1
View File
@@ -30,10 +30,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
# Solves ImportError: cannot import name NM, introspection typelib not found
gobject-introspection
];
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
# Needed here for the NM namespace
networkmanager
proton-vpn-api-core
pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix
+4 -1
View File
@@ -29,10 +29,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
# Solves ImportError: cannot import name NM, introspection typelib not found
gobject-introspection
];
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
# Needed here for the NM namespace
networkmanager
proton-vpn-api-core
pkgs/development/python-modules/proton-vpn-killswitch/default.nix
+2 -2
View File
@@ -20,9 +20,9 @@ buildPythonPackage rec {
hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [ proton-core ];
dependencies = [ proton-core ];
pythonImportsCheck = [ "proton.vpn.killswitch.interface" ];
pkgs/development/python-modules/proton-vpn-logger/default.nix
+4 -2
View File
@@ -20,9 +20,11 @@ buildPythonPackage rec {
hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I=";
};
nativeBuildInputs = [ setuptools ];
build-system = [
setuptools
];
propagatedBuildInputs = [ proton-core ];
dependencies = [ proton-core ];
pythonImportsCheck = [ "proton.vpn.logging" ];
pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix
+4 -1
View File
@@ -25,10 +25,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
# Solves Namespace NM not available
gobject-introspection
];
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
proton-core
proton-vpn-network-manager
];
pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix
+4 -1
View File
@@ -26,10 +26,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
# Solves Namespace NM not available
gobject-introspection
];
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
proton-core
proton-vpn-killswitch-network-manager-wireguard
proton-vpn-network-manager
pkgs/development/python-modules/proton-vpn-network-manager/default.nix
+4 -1
View File
@@ -30,10 +30,13 @@ buildPythonPackage rec {
nativeBuildInputs = [
# Needed to recognize the NM namespace
gobject-introspection
];
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
# Needed here for the NM namespace
networkmanager
proton-core
pkgs/development/python-modules/proton-vpn-session/default.nix
+4 -2
View File
@@ -28,9 +28,11 @@ buildPythonPackage rec {
hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ=";
};
nativeBuildInputs = [ setuptools ];
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
cryptography
distro
proton-core