From b9e332a6b484400999134f75bab72896dc6f0cd3 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Sat, 29 Mar 2025 12:45:03 +0000 Subject: [PATCH] tetragon: 1.2.0 -> 1.4.0 --- pkgs/by-name/te/tetragon/package.nix | 42 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/te/tetragon/package.nix b/pkgs/by-name/te/tetragon/package.nix index b59f3310ad10..fb8fb7c8e86e 100644 --- a/pkgs/by-name/te/tetragon/package.nix +++ b/pkgs/by-name/te/tetragon/package.nix @@ -7,19 +7,26 @@ llvm_16, clang_16, bash, + writableTmpDirAsHomeHook, + gitMinimal, }: stdenv.mkDerivation (finalAttrs: { pname = "tetragon"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "cilium"; repo = "tetragon"; tag = "v${finalAttrs.version}"; - hash = "sha256-KOR5MMRnhrlcMPqRjzjSJXvitiZQ8/tlxEnBiQG2x/Q="; + hash = "sha256-HOVQdKUIBLq9/2hTokZKvLZOgRQu5/lAwYy1yQa1bus="; }; + nativeBuildInputs = [ + writableTmpDirAsHomeHook + gitMinimal + ]; + buildInputs = [ clang_16 go @@ -27,48 +34,51 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - env.NIX_CFLAGS_COMPILE = "-fno-stack-protector -Qunused-arguments"; + env = { + LOCAL_CLANG = 1; + LOCAL_CLANG_FORMAT = 1; + NIX_CFLAGS_COMPILE = "-fno-stack-protector -Qunused-arguments"; + }; buildPhase = '' runHook preBuild - export HOME=$TMP - export LOCAL_CLANG=1 - export LOCAL_CLANG_FORMAT=1 + make tetragon make tetragon-operator make tetra make tetragon-bpf + runHook postBuild ''; # For BPF compilation - hardeningDisable = [ - "zerocallusedregs" - ]; + hardeningDisable = [ "zerocallusedregs" ]; postPatch = '' - substituteInPlace bpf/Makefile --replace '/bin/bash' '${lib.getExe bash}' - substituteInPlace pkg/defaults/defaults.go --replace '/var/lib/tetragon/' $out/lib/tetragon/bpf/ + substituteInPlace bpf/Makefile.defs --replace-fail '/bin/bash' '${lib.getExe bash}' + substituteInPlace pkg/defaults/defaults.go --replace-fail '/var/lib/tetragon/' $out/lib/tetragon/bpf/ ''; installPhase = '' runHook preInstall + mkdir -p $out/lib/tetragon $out/lib/tetragon/tetragon.tp.d/ sed -i "s+/usr/local/+$out/+g" install/linux-tarball/usr/local/lib/tetragon/tetragon.conf.d/bpf-lib cp -n -r install/linux-tarball/usr/local/lib/tetragon/tetragon.conf.d/ $out/lib/tetragon/ cp -n -r ./bpf/objs $out/lib/tetragon/bpf install -m755 -D ./tetra $out/bin/tetra install -m755 -D ./tetragon $out/bin/tetragon + runHook postInstall ''; - meta = with lib; { + meta = { description = "Real-time, eBPF-based Security Observability and Runtime Enforcement tool"; homepage = "https://github.com/cilium/tetragon"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "tetragon"; - maintainers = with maintainers; [ gangaram ]; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ fromSource ]; + maintainers = with lib.maintainers; [ gangaram ]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; }; })