From df561e715b787e3448d8d99732c16c078dc06d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 19:15:22 -0800
Subject: [PATCH] libmamba: 2.3.2 -> 2.3.3

Diff: https://github.com/mamba-org/mamba/compare/2.3.2...2.3.3

Changelog: https://github.com/mamba-org/mamba/blob/2.3.3/CHANGELOG.md
---
 pkgs/by-name/li/libmamba/package.nix          |  5 +-
 .../python-modules/libmambapy/default.nix     | 49 ++++---------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index 55645cd648db..416e18fb5d63 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     tag = finalAttrs.version;
-    hash = "sha256-344CRyIIrIFrDFbdxdGH7iOidoDhfovd3EySXlOF+4M=";
+    hash = "sha256-a1lumBYNEvKVu92JmnhvUvZFsRXy+n1bu6jKOg4pDM0=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/mamba-org/mamba/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Library for the fast Cross-Platform Package Manager";
     homepage = "https://github.com/mamba-org/mamba";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix
index 624002f4cc33..84eada8537bb 100644
--- a/pkgs/development/python-modules/libmambapy/default.nix
+++ b/pkgs/development/python-modules/libmambapy/default.nix
@@ -6,8 +6,7 @@
   ninja,
   libmamba,
   pybind11,
-  setuptools,
-  scikit-build,
+  scikit-build-core,
   fmt,
   spdlog,
   tl-expected,
@@ -18,25 +17,24 @@
   curl,
   zstd,
   bzip2,
-  wheel,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "libmambapy";
   pyproject = true;
 
   inherit (libmamba) version src;
 
-  nativeBuildInputs = [
+  sourceRoot = "${src.name}/libmambapy";
+
+  build-system = [
     cmake
     ninja
+    pybind11
+    scikit-build-core
   ];
 
-  env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=deprecated-declarations"
-    ];
-  };
+  dontUseCmakeConfigure = true;
 
   buildInputs = [
     (libmamba.override { python3 = python; })
@@ -52,42 +50,13 @@ buildPythonPackage {
     libsolv
   ];
 
-  dependencies = [
-    scikit-build
-    pybind11
-  ];
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  # patch needed to fix setuptools errors
-  # see these for reference
-  # https://stackoverflow.com/questions/72294299/multiple-top-level-packages-discovered-in-a-flat-layout
-  # https://github.com/pypa/setuptools/issues/3197#issuecomment-1078770109
-  postPatch = ''
-    substituteInPlace libmambapy/setup.py --replace-warn  "setuptools.setup()" "setuptools.setup(py_modules=[])"
-  '';
-
-  cmakeFlags = [
-    "-GNinja"
-    (lib.cmakeBool "BUILD_LIBMAMBAPY" true)
-  ];
-
-  buildPhase = ''
-    ninjaBuildPhase
-    cp -r libmambapy ../libmambapy
-    cd ../libmambapy
-    pypaBuildPhase
-  '';
-
   pythonImportsCheck = [
     "libmambapy"
     "libmambapy.bindings"
   ];
 
   meta = {
+    changelog = "https://github.com/mamba-org/mamba/blob/${src.tag}/libmambapy/CHANGELOG.md";
     description = "Python library for the fast Cross-Platform Package Manager";
     homepage = "https://github.com/mamba-org/mamba";
     license = lib.licenses.bsd3;