eduvpn-client: 4.2.1 -> 4.3.1

This commit is contained in:
Benedikt Tissot 2024-06-05 10:25:42 +02:00
parent 6ffc314bd9
commit a0840027a1
2 changed files with 3 additions and 21 deletions

View File

@ -1,13 +0,0 @@
diff --git a/eduvpn/utils.py b/eduvpn/utils.py
index db0bf0c..76fc52a 100644
--- a/eduvpn/utils.py
+++ b/eduvpn/utils.py
@@ -69,7 +69,7 @@ def get_prefix() -> str:
"""
target = "share/eduvpn/builder/mainwindow.ui"
local = path.dirname(path.dirname(path.abspath(__file__)))
- options = [local, path.expanduser("~/.local"), "/usr/local", prefix]
+ options = ["@out@"]
for option in options:
logger.debug(f"looking for '{target}' in '{option}'")
if path.isfile(path.join(option, target)):

View File

@ -12,11 +12,12 @@
python3Packages.buildPythonApplication rec {
pname = "eduvpn-client";
version = "4.2.1";
version = "4.3.1";
format = "pyproject";
src = fetchurl {
url = "https://github.com/eduvpn/python-${pname}/releases/download/${version}/python-${pname}-${version}.tar.xz";
hash = "sha256-57EKWOzGfA4ihVYTyfLF2yoe7hN/7OnEkG+zLz7QtxI=";
hash = "sha256-8k5ZbbN2OvoFFq0nn+fftQfQJbGhb2MEvZNokMXegr0=";
};
nativeBuildInputs = [
@ -38,12 +39,6 @@ python3Packages.buildPythonApplication rec {
setuptools
];
patches = [ ./nix-python-prefix.patch ];
postPatch = ''
substituteInPlace eduvpn/utils.py --subst-var-by out $out
'';
checkInputs = with python3Packages; [
pytestCheckHook
];