From b2e1a996ffd48e7a6067f4c9ad33e5459659ce7c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 3 Jan 2026 02:55:02 +0200 Subject: [PATCH] kernelshark: move to by-name --- .../ke/kernelshark/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{os-specific/linux/trace-cmd/kernelshark.nix => by-name/ke/kernelshark/package.nix} (93%) diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/by-name/ke/kernelshark/package.nix similarity index 93% rename from pkgs/os-specific/linux/trace-cmd/kernelshark.nix rename to pkgs/by-name/ke/kernelshark/package.nix index d7136f4a5d71..a6a43e7fd72d 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/by-name/ke/kernelshark/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchzip, - qtbase, - qtscxml, + qt6, cmake, json_c, mesa_glu, @@ -13,8 +12,6 @@ libtraceevent, libtracefs, freefont_ttf, - wrapQtAppsHook, - qtwayland, fetchpatch, }: @@ -40,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtscxml - qtwayland + qt6.qtbase + qt6.qtscxml + qt6.qtwayland json_c mesa_glu libglut diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 554dc5d71d46..2502e8d9dffb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3686,8 +3686,6 @@ with pkgs; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; - kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; - translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { }); translatepy = with python3.pkgs; toPythonApplication translatepy;