diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 1f95e41e6103..70443695e0ff 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc, spdlog, termcolor, ghc_filesystem +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cli11 +, cmake +, curl +, ghc_filesystem +, libarchive +, libsolv +, libyamlcpp +, nlohmann_json +, python3 +, reproc +, spdlog +, termcolor +, tl-expected }: let @@ -9,7 +24,8 @@ let ]; patches = [ - # Patch added by the mamba team + # Apply the same patch as in the "official" boa-forge build: + # https://github.com/mamba-org/boa-forge/tree/master/libsolv (fetchpatch { url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch"; sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd"; @@ -28,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-9/vkn8wks2nyzIn5hnK+zvX18Du2B8YZ3/ugrmEGVH8="; + sha256 = "sha256-CszDmt3SElHo1D2sNy2tPhZ43YD3pDjT8+fp2PVk+7Y="; }; nativeBuildInputs = [ cmake ]; @@ -50,6 +66,8 @@ stdenv.mkDerivation rec { spdlog' termcolor ghc_filesystem + python3 + tl-expected ]; cmakeFlags = [