talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

python3Packages.conda: 25.1.0 -> 25.5.1

Browse Source
This commit is contained in:
Amadej Kastelic 2025-07-09 22:14:27 +02:00
parent 93b02556ec
commit ad675104af
No known key found for this signature in database
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/conda/0001-conda_exe.patch
View File

@ -1,15 +1,17 @@
diff --git a/conda/base/context.py b/conda/base/context.py
index 34a5e6495..ac017f48b 100644
--- a/conda/base/context.py --- a/conda/base/context.py
+++ b/conda/base/context.py +++ b/conda/base/context.py
@@ -754,7 +754,7 @@ @@ -826,7 +826,7 @@ class Context(Configuration):
@property @property
def conda_prefix(self): def conda_prefix(self) -> PathType:
- return abspath(sys.prefix) - return abspath(sys.prefix)
+ return expand("~/.conda") + return expand("~/.conda")
@property @property
@deprecated( @deprecated(
@@ -787,27 +787,17 @@ @@ -858,25 +858,17 @@ class Context(Configuration):
The vars can refer to each other if necessary since the dict is ordered. The vars can refer to each other if necessary since the dict is ordered.
None means unset it. None means unset it.
""" """
@ -26,12 +28,10 @@
- } - }
- else: - else:
- exe = "conda.exe" if on_win else "conda" - exe = "conda.exe" if on_win else "conda"
- # I was going to use None to indicate a variable to unset, but that gets tricky with
- # error-on-undefined.
- return { - return {
- "CONDA_EXE": os.path.join(sys.prefix, BIN_DIRECTORY, exe), - "CONDA_EXE": os.path.join(sys.prefix, BIN_DIRECTORY, exe),
- "_CE_M": "", - "_CE_M": None,
- "_CE_CONDA": "", - "_CE_CONDA": None,
- "CONDA_PYTHON_EXE": sys.executable, - "CONDA_PYTHON_EXE": sys.executable,
- } - }
+ import sys + import sys
@ -45,6 +45,6 @@
+ "_CE_CONDA": "conda", + "_CE_CONDA": "conda",
+ "CONDA_PYTHON_EXE": sys.executable, + "CONDA_PYTHON_EXE": sys.executable,
+ } + }
@memoizedproperty @memoizedproperty
def channel_alias(self): def channel_alias(self) -> Channel:

4
pkgs/development/python-modules/conda/default.nix
View File

@ -28,7 +28,7 @@
buildPythonPackage rec { buildPythonPackage rec {
__structuredAttrs = true; __structuredAttrs = true;
pname = "conda"; pname = "conda";
version = "25.1.0"; version = "25.5.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "conda"; owner = "conda";
repo = "conda"; repo = "conda";
tag = version; tag = version;
hash = "sha256-dFj9ob9RRmeaaVDJeDOVLe06fBkCGEWhavLFKytJ8Mo="; hash = "sha256-BHy0t+5jz1WdSElCQBgFh5VJC3iIYelS01iQeQByr+0=";
}; };
build-system = [ build-system = [