From fef5d0f72d1ee1f044e127bc8918787ead94c0b8 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 21 May 2026 20:46:52 +0200 Subject: [PATCH 1/5] libmamba: 2.4.0 -> 2.6.2 changelog: https://github.com/mamba-org/mamba/blob/2.6.2/CHANGELOG.md diff: https://github.com/mamba-org/mamba/compare/2.4.0...2.6.2 --- pkgs/by-name/li/libmamba/package.nix | 7 +++++-- pkgs/by-name/ma/mamba-cpp/package.nix | 2 ++ pkgs/development/python-modules/libmambapy/default.nix | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index bd063f6cee84..ad6052e1061a 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -12,6 +12,7 @@ reproc, libsolv, curl, + msgpack-c, libarchive, zstd, nix-update-script, @@ -21,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; - version = "2.4.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; tag = finalAttrs.version; - hash = "sha256-ojcAS5NYAhklACrBkmSHRPNiVLjUR/umll0vhoFnFBs="; + hash = "sha256-qvUo2OD+vh5oXF/ckz9vJyiQ9wpEbTrC+C4oYXOGFAU="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { reproc libsolv curl + msgpack-c libarchive zstd bzip2 @@ -52,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_LIBMAMBA" true) + (lib.cmakeBool "BUILD_LIBMAMBA_SPDLOG" true) (lib.cmakeBool "BUILD_SHARED" true) ]; diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix index 344a9e9d3eef..56a781e6bdae 100644 --- a/pkgs/by-name/ma/mamba-cpp/package.nix +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -4,6 +4,7 @@ bzip2, cmake, cli11, + msgpack-c, yaml-cpp, nlohmann_json, zstd, @@ -29,6 +30,7 @@ stdenv.mkDerivation { zstd bzip2 cli11 + msgpack-c yaml-cpp libmamba ]; diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 84eada8537bb..80602a461941 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -3,6 +3,7 @@ python, buildPythonPackage, cmake, + msgpack-c, ninja, libmamba, pybind11, @@ -43,6 +44,7 @@ buildPythonPackage rec { bzip2 spdlog fmt + msgpack-c tl-expected nlohmann_json yaml-cpp From 7063c12f4f2565049d065c2348a188510a27467a Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 21 May 2026 21:44:18 +0200 Subject: [PATCH 2/5] python3Packages.conda: 26.1.0 -> 26.5.0 changelog: https://github.com/conda/conda/blob/main/CHANGELOG.md diff: https://github.com/conda/conda/compare/26.1.1...26.5.0 --- pkgs/development/python-modules/conda/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index dce5a4cf2458..0173ce5552e5 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 = "26.1.0"; + version = "26.5.0"; pyproject = true; src = fetchFromGitHub { @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; tag = version; - hash = "sha256-u3xxaSNfPocAjzvzEhKNijsa2lR4xiMSpWHP4MTnBzQ="; + hash = "sha256-x6p9CaityAO8NYiKLGUbu3Lk5C/mVmMmdqP4OpfSkNs="; }; build-system = [ @@ -44,6 +44,8 @@ buildPythonPackage rec { hatch-vcs ]; + pythonRelaxDeps = [ "ruamel-yaml" ]; + dependencies = [ archspec conda-libmamba-solver From 7c21402d9ac902ab4eb9738cf41396de333d0ae6 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 21 May 2026 21:16:47 +0200 Subject: [PATCH 3/5] python3Packages.conda-libmamba-solver: 25.11.0 -> 26.4.2 changelog: https://github.com/conda/conda-libmamba-solver/blob/26.4.2/CHANGELOG.md diff: https://github.com/conda/conda-libmamba-solver/compare/25.11.0...26.4.2 --- .../python-modules/conda-libmamba-solver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index 7220bb94f1aa..7c58c473dded 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "25.11.0"; + version = "26.4.2"; pyproject = true; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; tag = version; - hash = "sha256-t4mwQ9nsduicT1sL1TQLbuCoS4r7K/GaXyBFOO+3/m8="; + hash = "sha256-8+BIUQp2tg50P0UDjzBvywg8/mDelDYMtp/ejEcMH20="; }; build-system = [ From 39c7f28bb277aab07b30acc95a9e152ee2431b7a Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 21 May 2026 20:50:09 +0200 Subject: [PATCH 4/5] libmamba: minor cleanup --- pkgs/by-name/li/libmamba/package.nix | 53 ++++++++++--------- pkgs/by-name/ma/mamba-cpp/package.nix | 29 +++++----- .../conda-libmamba-solver/default.nix | 11 ++-- .../python-modules/libmambapy/default.nix | 36 ++++++------- 4 files changed, 67 insertions(+), 62 deletions(-) diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index ad6052e1061a..3b7e461d60b4 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -1,23 +1,23 @@ { - fetchFromGitHub, - lib, - stdenv, - cmake, - fmt, - spdlog, - tl-expected, - nlohmann_json, - yaml-cpp, - simdjson, - reproc, - libsolv, - curl, - msgpack-c, - libarchive, - zstd, - nix-update-script, bzip2, + cmake, + curl, + fetchFromGitHub, + fmt, + lib, + libarchive, + libsolv, + msgpack-c, + nix-update-script, + nlohmann_json, python3, + reproc, + simdjson, + spdlog, + stdenv, + tl-expected, + yaml-cpp, + zstd, }: stdenv.mkDerivation (finalAttrs: { @@ -37,19 +37,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bzip2 + curl fmt + libarchive + libsolv + msgpack-c + nlohmann_json + reproc + simdjson spdlog tl-expected - nlohmann_json yaml-cpp - simdjson - reproc - libsolv - curl - msgpack-c - libarchive zstd - bzip2 ]; cmakeFlags = [ @@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED" true) ]; + __structuredAttrs = true; + strictDeps = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix index 56a781e6bdae..539580657d4d 100644 --- a/pkgs/by-name/ma/mamba-cpp/package.nix +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -1,19 +1,19 @@ { - lib, - stdenv, bzip2, - cmake, cli11, + cmake, + lib, + libmamba, msgpack-c, - yaml-cpp, nlohmann_json, - zstd, + python3, reproc, spdlog, + stdenv, tl-expected, - libmamba, - python3, versionCheckHook, + yaml-cpp, + zstd, }: stdenv.mkDerivation { pname = "mamba-cpp"; @@ -22,17 +22,17 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ + bzip2 + cli11 + libmamba + msgpack-c + nlohmann_json python3 reproc spdlog - nlohmann_json tl-expected - zstd - bzip2 - cli11 - msgpack-c yaml-cpp - libmamba + zstd ]; cmakeFlags = [ @@ -43,6 +43,9 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; + __structuredAttrs = true; + strictDeps = true; + meta = { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index 7c58c473dded..8e73b16b3c35 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -1,25 +1,24 @@ { - lib, + boltons, buildPythonPackage, fetchFromGitHub, hatchling, hatch-vcs, - boltons, + lib, libmambapy, msgpack, requests, zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "conda-libmamba-solver"; version = "26.4.2"; pyproject = true; src = fetchFromGitHub { - inherit pname version; owner = "conda"; repo = "conda-libmamba-solver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8+BIUQp2tg50P0UDjzBvywg8/mDelDYMtp/ejEcMH20="; }; @@ -47,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.ericthemagician ]; }; -} +}) diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 80602a461941..907fb0ae5116 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -1,23 +1,23 @@ { - lib, - python, - buildPythonPackage, + bzip2, cmake, + curl, + buildPythonPackage, + fmt, + lib, + libmamba, + libsolv, msgpack-c, ninja, - libmamba, + nlohmann_json, pybind11, + python, + reproc, scikit-build-core, - fmt, spdlog, tl-expected, - nlohmann_json, yaml-cpp, - reproc, - libsolv, - curl, zstd, - bzip2, }: buildPythonPackage rec { @@ -39,17 +39,17 @@ buildPythonPackage rec { buildInputs = [ (libmamba.override { python3 = python; }) - curl - zstd bzip2 - spdlog + curl fmt - msgpack-c - tl-expected - nlohmann_json - yaml-cpp - reproc libsolv + msgpack-c + nlohmann_json + reproc + spdlog + tl-expected + yaml-cpp + zstd ]; pythonImportsCheck = [ From d12a8c71aa590db3fbb4f87c0a2c470944c8e058 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 22 May 2026 11:09:29 +0200 Subject: [PATCH 5/5] mamba-cpp: fix default paths --- pkgs/by-name/ma/mamba-cpp/package.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix index 539580657d4d..d362aa0941da 100644 --- a/pkgs/by-name/ma/mamba-cpp/package.nix +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -4,6 +4,7 @@ cmake, lib, libmamba, + makeWrapper, msgpack-c, nlohmann_json, python3, @@ -14,12 +15,19 @@ versionCheckHook, yaml-cpp, zstd, + # runtime options + defaultEnvPath ? "~/.mamba/envs", + defaultPkgPath ? "~/.mamba/pkgs", + defaultRootPath ? "~/.mamba", }: stdenv.mkDerivation { pname = "mamba-cpp"; inherit (libmamba) version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + makeWrapper + ]; buildInputs = [ bzip2 @@ -43,6 +51,13 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; + postInstall = '' + wrapProgram $out/bin/mamba \ + --set-default CONDA_ENVS_PATH '${defaultEnvPath}' \ + --set-default CONDA_PKGS_DIRS '${defaultPkgPath}' \ + --set-default MAMBA_ROOT_PREFIX '${defaultRootPath}' + ''; + __structuredAttrs = true; strictDeps = true;