From f69428fca9a04bea546950543e6094969b305492 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 24 Feb 2026 13:08:35 +0000 Subject: [PATCH 1/2] lager: 0.1.0 -> 0.1.2 https://github.com/arximboldi/lager/compare/refs/tags/v0.1.0...refs/tags/v0.1.2 fixes #493431 --- pkgs/by-name/la/lager/package.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 3d5ed2498317..93fe2eb9131d 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -4,38 +4,49 @@ fetchFromGitHub, cmake, boost, + cereal, immer, zug, }: stdenv.mkDerivation (finalAttrs: { pname = "lager"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "arximboldi"; repo = "lager"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ssGBQu8ba798MSTtJeCBE3WQ7AFfvSGLhZ7WBYHEgfw="; }; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost + cereal immer zug ]; - nativeBuildInputs = [ - cmake - ]; + cmakeFlags = [ - "-Dlager_BUILD_EXAMPLES=OFF" + (lib.cmakeBool "lager_BUILD_DEBUGGER_EXAMPLES" false) + (lib.cmakeBool "lager_BUILD_DOCS" false) + (lib.cmakeBool "lager_BUILD_EXAMPLES" false) + (lib.cmakeBool "lager_BUILD_TESTS" false) ]; + + # remove BUILD file to avoid conflicts with the build directory preConfigure = '' rm BUILD ''; + meta = { - homepage = "https://github.com/arximboldi/lager"; + changelog = "https://github.com/arximboldi/lager/releases/tag/${finalAttrs.src.tag}"; description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; + homepage = "https://sinusoid.es/lager/"; license = lib.licenses.mit; maintainers = [ ]; }; From 070b8d095f3404ab1bd283451dcf38f078a4d912 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 24 Feb 2026 13:08:35 +0000 Subject: [PATCH 2/2] lager: enable checks --- pkgs/by-name/la/lager/package.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 93fe2eb9131d..d4444c1c0448 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -2,11 +2,14 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, boost, cereal, immer, zug, + catch2, + qt5, }: stdenv.mkDerivation (finalAttrs: { @@ -20,6 +23,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ssGBQu8ba798MSTtJeCBE3WQ7AFfvSGLhZ7WBYHEgfw="; }; + patches = lib.optionals finalAttrs.finalPackage.doCheck [ + # https://github.com/arximboldi/lager/pull/233 + (fetchpatch { + name = "Stop-using-Boost-system.patch"; + url = "https://github.com/arximboldi/lager/commit/0eb1d3d3a6057723c5b57b3e0ee3e41924ff419a.patch"; + hash = "sha256-peGpuyuCznCDqYo+9zk1FytLV+a6Um8fvjLmrm7Y2CI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; @@ -31,11 +43,16 @@ stdenv.mkDerivation (finalAttrs: { zug ]; + checkInputs = [ + catch2 + qt5.qtdeclarative + ]; + cmakeFlags = [ (lib.cmakeBool "lager_BUILD_DEBUGGER_EXAMPLES" false) (lib.cmakeBool "lager_BUILD_DOCS" false) (lib.cmakeBool "lager_BUILD_EXAMPLES" false) - (lib.cmakeBool "lager_BUILD_TESTS" false) + (lib.cmakeBool "lager_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # remove BUILD file to avoid conflicts with the build directory @@ -43,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { rm BUILD ''; + doCheck = true; + + dontWrapQtApps = true; + meta = { changelog = "https://github.com/arximboldi/lager/releases/tag/${finalAttrs.src.tag}"; description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++";