yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

deduplicate CLAN_CORE/CLAN_CORE_PATH environment variables

Browse Source
This commit is contained in:
Jörg Thalheim
2025-03-19 11:01:07 +01:00
committed by Mic92
parent 63a0e5f35d
commit b84230ff90
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-app/tests/root.py
View File

@@ -5,7 +5,7 @@ import pytest
TEST_ROOT = Path(__file__).parent.resolve() TEST_ROOT = Path(__file__).parent.resolve()
PROJECT_ROOT = TEST_ROOT.parent 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_) CLAN_CORE = Path(CLAN_CORE_)
else: else:
CLAN_CORE = PROJECT_ROOT.parent.parent CLAN_CORE = PROJECT_ROOT.parent.parent

1
pkgs/clan-cli/default.nix
View File

@@ -185,7 +185,6 @@ pythonRuntime.pkgs.buildPythonApplication {
chmod +w -R ./src chmod +w -R ./src
cd ./src cd ./src
export CLAN_CORE=${clan-core-path}
export CLAN_CORE_PATH=${clan-core-path} export CLAN_CORE_PATH=${clan-core-path}
export NIX_STATE_DIR=$TMPDIR/nix export NIX_STATE_DIR=$TMPDIR/nix
export IN_NIX_SANDBOX=1 export IN_NIX_SANDBOX=1

2
pkgs/clan-cli/tests/root.py
View File

@@ -5,7 +5,7 @@ import pytest
TEST_ROOT = Path(__file__).parent.resolve() TEST_ROOT = Path(__file__).parent.resolve()
PROJECT_ROOT = TEST_ROOT.parent 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_) CLAN_CORE = Path(CLAN_CORE_)
else: else:
CLAN_CORE = PROJECT_ROOT.parent.parent CLAN_CORE = PROJECT_ROOT.parent.parent

2
pkgs/clan-vm-manager/tests/root.py
View File

@@ -5,7 +5,7 @@ import pytest
TEST_ROOT = Path(__file__).parent.resolve() TEST_ROOT = Path(__file__).parent.resolve()
PROJECT_ROOT = TEST_ROOT.parent 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_) CLAN_CORE = Path(CLAN_CORE_)
else: else:
CLAN_CORE = PROJECT_ROOT.parent.parent CLAN_CORE = PROJECT_ROOT.parent.parent