mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-14 16:40:09 +03:00
Merge pull request #178807 from cbourjau/update-cli11-and-micromamba
Update cli11 and micromamba
This commit is contained in:
commit
62854b60cc
@ -1,35 +1,30 @@
|
||||
{
|
||||
lib, stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gtest,
|
||||
python3,
|
||||
boost
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, catch2
|
||||
, cmake
|
||||
, gtest
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cli11";
|
||||
version = "1.9.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CLIUtils";
|
||||
repo = "CLI11";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6";
|
||||
sha256 = "sha256-emTIaoUyTINbAAn9tw1r3zLTQt58N8A1zoP+0y41yKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
checkInputs = [ boost python3 ];
|
||||
checkInputs = [ boost python3 catch2 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preConfigure = ''
|
||||
rm -rfv extern/googletest
|
||||
ln -sfv ${gtest.src} extern/googletest
|
||||
sed -i '/TrueFalseTest/d' tests/CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line parser for C++11";
|
||||
homepage = "https://github.com/CLIUtils/CLI11";
|
||||
|
@ -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 = [
|
||||
|
Loading…
Reference in New Issue
Block a user