Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/conda/base/context.py b/conda/base/context.py 2index 34a5e6495..ac017f48b 100644 3--- a/conda/base/context.py 4+++ b/conda/base/context.py 5@@ -826,7 +826,7 @@ class Context(Configuration): 6 7 @property 8 def conda_prefix(self) -> PathType: 9- return abspath(sys.prefix) 10+ return expand("~/.conda") 11 12 @property 13 @deprecated( 14@@ -858,25 +858,17 @@ class Context(Configuration): 15 The vars can refer to each other if necessary since the dict is ordered. 16 None means unset it. 17 """ 18- if context.dev: 19- return { 20- "CONDA_EXE": sys.executable, 21- # do not confuse with os.path.join, we are joining paths with ; or : delimiters 22- "PYTHONPATH": os.pathsep.join( 23- (CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")) 24- ), 25- "_CE_M": "-m", 26- "_CE_CONDA": "conda", 27- "CONDA_PYTHON_EXE": sys.executable, 28- } 29- else: 30- exe = "conda.exe" if on_win else "conda" 31- return { 32- "CONDA_EXE": os.path.join(sys.prefix, BIN_DIRECTORY, exe), 33- "_CE_M": None, 34- "_CE_CONDA": None, 35- "CONDA_PYTHON_EXE": sys.executable, 36- } 37+ import sys 38+ return { 39+ "CONDA_EXE": sys.executable, 40+ # do not confuse with os.path.join, we are joining paths with ; or : delimiters 41+ "PYTHONPATH": os.pathsep.join( 42+ [CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")] + [path for path in sys.path if "site-packages" in path] 43+ ), 44+ "_CE_M": "-m", 45+ "_CE_CONDA": "conda", 46+ "CONDA_PYTHON_EXE": sys.executable, 47+ } 48 49 @memoizedproperty 50 def channel_alias(self) -> Channel: