diff options
Diffstat (limited to 'nixpkgs/pkgs/by-name/ed')
| -rw-r--r-- | nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix | 11 |
2 files changed, 3 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch b/nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch deleted file mode 100644 index 4d5fc53b0993..000000000000 --- a/nixpkgs/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch +++ /dev/null @@ -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)): diff --git a/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix b/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix index 8a4fd7db89e8..3211636b8440 100644 --- a/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix @@ -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 ]; |