From 9537bd50fb933cdc6118859a9d2e2e85e8efa4db Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 31 Mar 2025 22:30:35 +0300 Subject: [PATCH] python312Packages.{proton-vpn-api-core,proton-vpn-network-manager}: Fix import tests When pyxdg is available the dirs will use xdg vars https://www.github.com/ProtonVPN/python-proton-core/blob/e87d1e3b5fc70883adc02ef2e2d9b0eb360b83ba/proton/utils/environment.py#L56-L102 --- .../python-modules/proton-vpn-api-core/default.nix | 4 ++++ .../python-modules/proton-vpn-network-manager/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 0142603b9e50..0361703a9df8 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -12,6 +12,7 @@ pytest-asyncio, requests, sentry-sdk, + pyxdg, distro, pytestCheckHook, pytest-cov-stub, @@ -40,6 +41,7 @@ buildPythonPackage rec { pynacl proton-core sentry-sdk + pyxdg ]; pythonImportsCheck = [ @@ -59,9 +61,11 @@ buildPythonPackage rec { pytest-cov-stub ]; + # Needed for `pythonImportsCheck`, `preCheck` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`. postInstall = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) + export XDG_RUNTIME_DIR=$(mktemp -d) ''; disabledTests = [ diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 61abc0ab426f..937c54b5c103 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -12,6 +12,7 @@ proton-vpn-local-agent, pycairo, pygobject3, + pyxdg, pytest-asyncio, pytestCheckHook, pytest-cov-stub, @@ -46,6 +47,7 @@ buildPythonPackage rec { proton-vpn-local-agent pycairo pygobject3 + pyxdg ]; postPatch = '' @@ -67,9 +69,11 @@ buildPythonPackage rec { pytest-asyncio ]; + # Needed for `pythonImportsCheck`, `preCheck` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`. preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) + export XDG_RUNTIME_DIR=$(mktemp -d) ''; meta = {