From 4ba83903acc56f09409ca50ebe1ab6170713f094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Thu, 6 Jun 2024 21:46:38 +1000 Subject: [PATCH] auditbeat7,filebeat7,heartbeat7,metricbeat7,packetbeat7: fix meta merging With a set merge, most of the meta was lost, including the license and platform information. Change to deep merge to preserve the attributes. --- pkgs/misc/logging/beats/7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 5d0629d1fb69..70c1e26a49d6 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd, config }: -let beat = package: extraArgs: buildGoModule (rec { +let beat = package: extraArgs: buildGoModule (lib.attrsets.recursiveUpdate (rec { pname = package; version = elk7Version; @@ -21,7 +21,7 @@ let beat = package: extraArgs: buildGoModule (rec { maintainers = with maintainers; [ fadenb basvandijk dfithian ]; platforms = platforms.linux; }; -} // extraArgs); +}) extraArgs); in rec { auditbeat7 = beat "auditbeat" { meta.description = "Lightweight shipper for audit data"; };