nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #290920 from Emantor/bump/kernelshark

Browse Source
This commit is contained in:
Sandro 2024-06-02 17:05:39 +02:00 committed by GitHub
commit 0e8ee5ed1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/trace-cmd/kernelshark.nix
View File

@ -1,22 +1,22 @@
{ lib, mkDerivation, fetchzip, qtbase, cmake, asciidoc
{ lib, stdenv, fetchzip, qtbase, qtscxml, cmake, asciidoc
, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config
, libtraceevent, libtracefs, freefont_ttf
, libtraceevent, libtracefs, freefont_ttf, wrapQtAppsHook, qtwayland
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "kernelshark";
version = "2.2.1";
version = "2.3.1";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernelshark-v${version}.tar.gz";
hash = "sha256-V25IzPDOt6V03wgIa/AJ0T8mRaGmXYuMCcvbSOKleY0=";
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernelshark-v${finalAttrs.version}.tar.gz";
hash = "sha256-KV8ahV2koX7OL1C42H5If14e7m54jv0DlZ1dNsVRUWE=";
};
outputs = [ "out" ];
nativeBuildInputs = [ pkg-config cmake ];
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
buildInputs = [ qtbase json_c mesa_glu freeglut libtraceevent libtracefs trace-cmd ];
buildInputs = [ qtbase qtscxml qtwayland json_c mesa_glu freeglut libtraceevent libtracefs trace-cmd ];
cmakeFlags = [
"-D_INSTALL_PREFIX=${placeholder "out"}"
@ -32,4 +32,4 @@ mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ basvandijk ];
};
}
})

2
pkgs/top-level/all-packages.nix
View File

@ -13721,7 +13721,7 @@ with pkgs;
trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
traceroute = callPackage ../tools/networking/traceroute { };