From 2bf0a9864c6c6ebad470af7d9fda5e024a4a8950 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Thu, 23 Dec 2021 22:36:41 +0000 Subject: [PATCH] micromamba: 0.15.0 -> 0.18.1 --- .../package-management/micromamba/default.nix | 56 +++++++------------ 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 9f5fbac787df..016f07a7d335 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc +, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc, spdlog, termcolor, ghc_filesystem }: let @@ -11,51 +11,26 @@ let patches = [ # Patch added by the mamba team (fetchpatch { - url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/add_strict_repo_prio_rule.patch"; + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/add_strict_repo_prio_rule.patch"; sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r"; }) # Patch added by the mamba team (fetchpatch { - url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/conda_variant_priorization.patch"; + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch"; sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd"; }) - # Patch added by the mamba team - (fetchpatch { - url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/memcpy_to_memmove.patch"; - sha256 = "1c9ir40l6crcxllj5zwhzbrbgibwqaizyykd0vip61gywlfzss64"; - }) - ]; - }); - - # fails linking with yaml-cpp 0.7.x - libyamlcpp' = libyamlcpp.overrideAttrs (oldAttrs: rec { - - version = "0.6.3"; - - src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) ]; }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.15.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = version; - sha256 = "1zksp4zqj4wn9p9jb1qx1acajaz20k9xnm80yi7bab2d37y18hcw"; + sha256 = "1gr9r257l300hafp8zm61bn58rysdk9i4wv1879q96b6n6v8hwa6"; }; nativeBuildInputs = [ cmake ]; @@ -65,23 +40,32 @@ stdenv.mkDerivation rec { nlohmann_json curl libarchive - libyamlcpp' + libyamlcpp libsolv' reproc - # python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess. + spdlog + termcolor + ghc_filesystem ]; + postPatch = '' + # See https://github.com/gabime/spdlog/issues/1897 + sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt + echo 'target_link_libraries(micromamba PRIVATE -lspdlog -lfmt)' >> micromamba/CMakeLists.txt + ''; + cmakeFlags = [ - "-DBUILD_BINDINGS=OFF" # Fails to build, I don't think it's necessary for now. - "-DBUILD_EXE=ON" + "-DBUILD_LIBMAMBA=ON" + "-DBUILD_SHARED=ON" + "-DBUILD_MICROMAMBA=ON" + # "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" ]; - CXXFLAGS = "-DMAMBA_USE_STD_FS"; - meta = with lib; { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; license = licenses.bsd3; + platforms = platforms.linux; maintainers = with maintainers; [ mausch ]; }; }