about summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-02-02 06:01:42 +0000
committerGitHub <noreply@github.com>2024-02-02 06:01:42 +0000
commit3a8e4cc2aacae6a02766368b22981e55aa04cf33 (patch)
tree77de065b01601782ffff229c9acbaecff31bbb2d /pkgs/development/tools/misc
parent55c7945b8e40db48dfd5e6b889d39ea85f96b920 (diff)
parent20f8a0a4e7c769d4ca5e2e35b4851c6e72674ea1 (diff)
downloadnixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar
nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.gz
nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.bz2
nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.lz
nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.xz
nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.zst
nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/strace/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 591eaeaa1ae2..d851aa217b5f 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater }:
+{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater, elfutils }:
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "6.6";
+  version = "6.7";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-QhtBhsBrcFFj5k3IXycevc9nZgr4ZnKDFH1ehZ/IqWw=";
+    sha256 = "sha256-IJAgHho/8yhG9P5CHBFjsV9EC7OOMTVdCfgtOUmSKvc=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
   # The build will silently fall back and -k will not work on RISC-V.
-  buildInputs = [ libunwind ]; # support -k
+  buildInputs = [ libunwind elfutils ]; # support -k and -kk
 
   configureFlags = [ "--enable-mpers=check" ];