From 5e1a7105f53fe14eeeb983ec85928691b164cf2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 02:16:14 +0000 Subject: [PATCH 1/2] laurel: 0.6.2 -> 0.6.3 --- pkgs/servers/monitoring/laurel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index c96de249f5e5..56bbfc09cb52 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-1V5VonSH631bS5sIYkHC3lk4yumDCJ+LZHE00Kbx+J8="; + hash = "sha256-vasu4ffSdiyeXGV8JUZYL3I/04UvZ/mOImdE45la9y8="; }; - cargoHash = "sha256-GhgGMETOOPjG6ANwwavI5lhMmByq73KDHvcO5pnADHE="; + cargoHash = "sha256-uQs+BUBWdbSoE3UqrSjqImVm5uwYf7XiTFtGG1BcFZI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; From 5d0bff94ca75188ad609506db5bd5ba599b2ba4a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 3 Aug 2024 16:38:03 +0200 Subject: [PATCH 2/2] laurel: fix compiling on aarch64-linux This solves the following build error: ~~~ error: linker `aarch64-linux-gnu-gcc` not found | = note: No such file or directory (os error 2) ~~~ Which happens on aarch64-linux and armv7-linux because upstream redirects the linker for that platform in https://github.com/threathunters-io/laurel/blob/v0.6.3/.cargo/config.toml Since there is nothing else besides linker redirects in there, we simply delete the whole file. --- pkgs/servers/monitoring/laurel/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 56bbfc09cb52..54d38a52c616 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -17,6 +17,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uQs+BUBWdbSoE3UqrSjqImVm5uwYf7XiTFtGG1BcFZI="; + postPatch = '' + # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc + # for their CI which breaks compiling on aarch64 in nixpkgs: + # error: linker `aarch64-linux-gnu-gcc` not found + rm .cargo/config.toml + ''; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ];