Merge pull request #213379 from cbourjau/micromamba-1.2.0
micromamba: 1.0.0 -> 1.2.0
This commit is contained in:
commit
aff821e3a5
1 changed files with 17 additions and 8 deletions
|
@ -2,6 +2,7 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
, bzip2
|
||||||
, cli11
|
, cli11
|
||||||
, cmake
|
, cmake
|
||||||
, curl
|
, curl
|
||||||
|
@ -15,6 +16,7 @@
|
||||||
, spdlog
|
, spdlog
|
||||||
, termcolor
|
, termcolor
|
||||||
, tl-expected
|
, tl-expected
|
||||||
|
, fmt_9
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -34,28 +36,34 @@ let
|
||||||
});
|
});
|
||||||
|
|
||||||
spdlog' = spdlog.overrideAttrs (oldAttrs: {
|
spdlog' = spdlog.overrideAttrs (oldAttrs: {
|
||||||
# Required for header files. See alse:
|
# Use as header-only library.
|
||||||
# https://github.com/gabime/spdlog/pull/1241 (current solution)
|
#
|
||||||
# https://github.com/gabime/spdlog/issues/1897 (previous solution)
|
# Spdlog 1.11 requires fmt version 8 while micromamba requires
|
||||||
cmakeFlags = oldAttrs.cmakeFlags ++ [
|
# version 9. spdlog may use its bundled version of fmt,
|
||||||
"-DSPDLOG_FMT_EXTERNAL=OFF"
|
# though. Micromamba is not calling spdlog functions with
|
||||||
];
|
# fmt-types in their signature. I.e. we get away with removing
|
||||||
|
# fmt_8 from spdlog's propagated dependencies and using fmt_9 for
|
||||||
|
# micromamba itself.
|
||||||
|
dontBuild = true;
|
||||||
|
cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DSPDLOG_FMT_EXTERNAL=OFF" ];
|
||||||
|
propagatedBuildInputs = [];
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "micromamba";
|
pname = "micromamba";
|
||||||
version = "1.0.0";
|
version = "1.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mamba-org";
|
owner = "mamba-org";
|
||||||
repo = "mamba";
|
repo = "mamba";
|
||||||
rev = "micromamba-" + version;
|
rev = "micromamba-" + version;
|
||||||
sha256 = "sha256-t1DfLwBGW6MfazuFludn6/fdYWFaMnkhXva6bvus694=";
|
sha256 = "sha256-KGlH5i/lI6c1Jj1ttAOrip8BKECaea5D202TJMcFDmM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
bzip2
|
||||||
cli11
|
cli11
|
||||||
nlohmann_json
|
nlohmann_json
|
||||||
curl
|
curl
|
||||||
|
@ -68,6 +76,7 @@ stdenv.mkDerivation rec {
|
||||||
ghc_filesystem
|
ghc_filesystem
|
||||||
python3
|
python3
|
||||||
tl-expected
|
tl-expected
|
||||||
|
fmt_9
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
Loading…
Reference in a new issue