From 93b02556ec6c4f01e82c3c534e57354a2ee3a927 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 9 Jul 2025 22:14:18 +0200
Subject: [PATCH 1/2] python3Packages.conda-libmamba-solver: add missing
 dependency

---
 .../python-modules/conda-libmamba-solver/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index 26b6e17c0f44..ea4c9e0f4d03 100644
--- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
@@ -5,6 +5,7 @@
   hatchling,
   hatch-vcs,
   boltons,
+  libmambapy,
 }:
 buildPythonPackage rec {
   pname = "conda-libmamba-solver";
@@ -26,6 +27,7 @@ buildPythonPackage rec {
 
   dependencies = [
     boltons
+    libmambapy
   ];
 
   # this package depends on conda for the import to run successfully, but conda depends on this package to execute.

From ad675104af1bb161da642f50d5891fc2a83aefdd Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 9 Jul 2025 22:14:27 +0200
Subject: [PATCH 2/2] python3Packages.conda: 25.1.0 -> 25.5.1

---
 .../python-modules/conda/0001-conda_exe.patch | 22 +++++++++----------
 .../python-modules/conda/default.nix          |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/conda/0001-conda_exe.patch b/pkgs/development/python-modules/conda/0001-conda_exe.patch
index 4333da45e0a2..c13dadf4d200 100644
--- a/pkgs/development/python-modules/conda/0001-conda_exe.patch
+++ b/pkgs/development/python-modules/conda/0001-conda_exe.patch
@@ -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
 +++ b/conda/base/context.py
-@@ -754,7 +754,7 @@
-
+@@ -826,7 +826,7 @@ class Context(Configuration):
+ 
      @property
-     def conda_prefix(self):
+     def conda_prefix(self) -> PathType:
 -        return abspath(sys.prefix)
 +        return expand("~/.conda")
-
+ 
      @property
      @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.
          None means unset it.
          """
@@ -26,12 +28,10 @@
 -            }
 -        else:
 -            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 {
 -                "CONDA_EXE": os.path.join(sys.prefix, BIN_DIRECTORY, exe),
--                "_CE_M": "",
--                "_CE_CONDA": "",
+-                "_CE_M": None,
+-                "_CE_CONDA": None,
 -                "CONDA_PYTHON_EXE": sys.executable,
 -            }
 +        import sys
@@ -45,6 +45,6 @@
 +            "_CE_CONDA": "conda",
 +            "CONDA_PYTHON_EXE": sys.executable,
 +        }
-
+ 
      @memoizedproperty
-     def channel_alias(self):
+     def channel_alias(self) -> Channel:
diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
index aa191d571fe1..06e04c0b04ed 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -28,7 +28,7 @@
 buildPythonPackage rec {
   __structuredAttrs = true;
   pname = "conda";
-  version = "25.1.0";
+  version = "25.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "conda";
     repo = "conda";
     tag = version;
-    hash = "sha256-dFj9ob9RRmeaaVDJeDOVLe06fBkCGEWhavLFKytJ8Mo=";
+    hash = "sha256-BHy0t+5jz1WdSElCQBgFh5VJC3iIYelS01iQeQByr+0=";
   };
 
   build-system = [