diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fca8333325bf..938339bf8f4b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14702,6 +14702,13 @@ githubId = 2422454; name = "Kai Wohlfahrt"; }; + kxxt = { + name = "kxxt"; + email = "rsworktech@outlook.com"; + matrix = "@kxxt:matrix.org"; + github = "kxxt"; + githubId = 18085551; + }; kyehn = { name = "kyehn"; github = "kyehn"; diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index 34b0e5e414d7..4f7291320cd6 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tracexec"; - version = "0.13.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "kxxt"; repo = "tracexec"; - rev = "dbb9b733370f5200df2a0de7f007312c23431480"; - hash = "sha256-M2ZIfWupnFxQZvr5cl8V0xtLgh+xBcaHHVsHIoio7nI="; + rev = "ecbda651a4006789debf565376cd6f37241dec3e"; + hash = "sha256-wP7jAGoWgvm3/4XBHr27MD8M9qwyVpuDVR96S8+I3eo="; }; - cargoHash = "sha256-cyzSxibLw6sb0V3ueNcp55OhFQ5jUNJWcSF8uYnzG2M="; + cargoHash = "sha256-kJrWAyRcU5eEfTwaAxcN6oE5KHgBdjznWeI21/3c/UE="; hardeningDisable = [ "zerocallusedregs" ]; @@ -44,20 +44,18 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--no-default-features" "--features=recommended" - ] - # Remove RiscV64 specialisation when this is fixed: - # * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158 - # * https://github.com/rust-vmm/seccompiler/pull/72 - ++ lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features"; + ]; preBuild = '' sed -i '1ino-clearly-defined = true' about.toml # disable network requests cargo about generate --config about.toml -o THIRD_PARTY_LICENSES.HTML about.hbs ''; - checkFlags = [ - "--skip=cli::test::log_mode_without_args_works" # `Permission denied` (needs `CAP_SYS_PTRACE`) - ]; + # tracexec uses $XDG_DATA_HOME/tracexec for storing temporary files and logs. + # Set this directory to $TMPDIR because integration tests needs to access it. + preCheck = '' + export TRACEXEC_DATA="$TMPDIR" + ''; postInstall = '' # Remove test binaries (e.g. `empty-argv`, `corrupted-envp`) and only retain `tracexec` @@ -77,6 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "tracexec"; maintainers = with lib.maintainers; [ fpletz + kxxt nh2 ]; platforms = lib.platforms.linux;