From 15ec500da1b32fc5083d36b4e39602b807bdbd45 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 1 Feb 2025 19:04:31 +0100
Subject: [PATCH] laurel: 0.6.4 -> 0.6.5

https://github.com/threathunters-io/laurel/releases/tag/v0.6.5

diff: https://github.com/threathunters-io/laurel/compare/v0.6.4...v0.6.5
---
 pkgs/servers/monitoring/laurel/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix
index 30791e412af1..6a327d7ebdc2 100644
--- a/pkgs/servers/monitoring/laurel/default.nix
+++ b/pkgs/servers/monitoring/laurel/default.nix
@@ -3,20 +3,30 @@
   fetchFromGitHub,
   lib,
   rustPlatform,
+  fetchpatch2,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "laurel";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "threathunters-io";
     repo = "laurel";
     tag = "v${version}";
-    hash = "sha256-mp1XTFD6mvH3RzvzvnJ58iJ6/EjENKYSzOavC2rVixs=";
+    hash = "sha256-1UjIye+btsNtf9Klti/3frgO7M+D05WkC1iP+TPQkZk=";
   };
 
-  cargoHash = "sha256-F5yMNm1JaE9q0NQJ3PDmPlW4WdjfyJj/J9er18acsKw=";
+  cargoHash = "sha256-dQkT4AAbzvT8J8RocWOrdOaPCe8/Sn/5ZelRDPMGLIU=";
+
+  patches = [
+    # https://github.com/threathunters-io/laurel/commit/d2fc51c83e78aecd5c4ce922582df649c2600e1e
+    # Unbreaks the userdb::test::userdb test. Will be part of the next release (likely v0.6.6).
+    (fetchpatch2 {
+      url = "https://github.com/threathunters-io/laurel/commit/d2fc51c83e78aecd5c4ce922582df649c2600e1e.patch?full_index=1";
+      hash = "sha256-OId5ZCF71ikoCSggyy3u4USR71onFJpirp53k4M17Vo=";
+    })
+  ];
 
   postPatch = ''
     # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc
@@ -31,7 +41,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Transform Linux Audit logs for SIEM usage";
     homepage = "https://github.com/threathunters-io/laurel";
-    changelog = "https://github.com/threathunters-io/laurel/releases/tag/v${version}";
+    changelog = "https://github.com/threathunters-io/laurel/releases/tag/${src.tag}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ emilylange ];
     platforms = platforms.linux;