From 019bb41bdce273a06de38cf81420dc3fcd775ec9 Mon Sep 17 00:00:00 2001 From: Christian Bourjau Date: Thu, 23 Jun 2022 23:45:43 +0200 Subject: [PATCH] cli11: 1.9.1 -> 2.2.0 Major release needed for the latest `micromamba` release. Breaking changes are few, though: https://github.com/CLIUtils/CLI11/blob/main/CHANGELOG.md Also add catch2 which is required for compiling and running the tests --- pkgs/development/tools/misc/cli11/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index dbab7c880efb..67cdfb2c68ef 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -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";