From 31a9c74e88c7ba924730dbc2c086e21ee16f5959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Mar 2025 11:01:07 +0100 Subject: [PATCH] deduplicate CLAN_CORE/CLAN_CORE_PATH environment variables --- pkgs/clan-app/tests/root.py | 2 +- pkgs/clan-cli/default.nix | 1 - pkgs/clan-cli/tests/root.py | 2 +- pkgs/clan-vm-manager/tests/root.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-app/tests/root.py b/pkgs/clan-app/tests/root.py index 0cac067be..8593bd5e6 100644 --- a/pkgs/clan-app/tests/root.py +++ b/pkgs/clan-app/tests/root.py @@ -5,7 +5,7 @@ import pytest TEST_ROOT = Path(__file__).parent.resolve() PROJECT_ROOT = TEST_ROOT.parent -if CLAN_CORE_ := os.environ.get("CLAN_CORE"): +if CLAN_CORE_ := os.environ.get("CLAN_CORE_PATH"): CLAN_CORE = Path(CLAN_CORE_) else: CLAN_CORE = PROJECT_ROOT.parent.parent diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index c4f75a47f..4d16ca556 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -185,7 +185,6 @@ pythonRuntime.pkgs.buildPythonApplication { chmod +w -R ./src cd ./src - export CLAN_CORE=${clan-core-path} export CLAN_CORE_PATH=${clan-core-path} export NIX_STATE_DIR=$TMPDIR/nix export IN_NIX_SANDBOX=1 diff --git a/pkgs/clan-cli/tests/root.py b/pkgs/clan-cli/tests/root.py index 0cac067be..8593bd5e6 100644 --- a/pkgs/clan-cli/tests/root.py +++ b/pkgs/clan-cli/tests/root.py @@ -5,7 +5,7 @@ import pytest TEST_ROOT = Path(__file__).parent.resolve() PROJECT_ROOT = TEST_ROOT.parent -if CLAN_CORE_ := os.environ.get("CLAN_CORE"): +if CLAN_CORE_ := os.environ.get("CLAN_CORE_PATH"): CLAN_CORE = Path(CLAN_CORE_) else: CLAN_CORE = PROJECT_ROOT.parent.parent diff --git a/pkgs/clan-vm-manager/tests/root.py b/pkgs/clan-vm-manager/tests/root.py index 0cac067be..8593bd5e6 100644 --- a/pkgs/clan-vm-manager/tests/root.py +++ b/pkgs/clan-vm-manager/tests/root.py @@ -5,7 +5,7 @@ import pytest TEST_ROOT = Path(__file__).parent.resolve() PROJECT_ROOT = TEST_ROOT.parent -if CLAN_CORE_ := os.environ.get("CLAN_CORE"): +if CLAN_CORE_ := os.environ.get("CLAN_CORE_PATH"): CLAN_CORE = Path(CLAN_CORE_) else: CLAN_CORE = PROJECT_ROOT.parent.parent