From 19098cc97024022558170c23469e979e3c18d0e4 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 3 Dec 2025 12:35:06 -0800 Subject: [PATCH 1/3] elf-dissector: unstable-2023-12-24 -> 0.0.1-unstable-2025-11-05 --- .../applications/misc/elf-dissector/default.nix | 13 ++++++------- ...d_for_src_lib_disassembler_disassembler.diff | 17 ----------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix index d703d4d08ff2..1ad9d4a61612 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -10,24 +10,21 @@ libdwarf, libopcodes, wrapQtAppsHook, + qt6, }: stdenv.mkDerivation { pname = "elf-dissector"; - version = "unstable-2023-12-24"; + version = "0.0.1-unstable-2025-11-05"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "sdk"; repo = "elf-dissector"; - rev = "613538bd1d87ce72d5115646551a49cf7ff2ee34"; - hash = "sha256-fQFGFw8nZHMs8J1W2CcHAJCdcvaY2l2/CySyBSsKpyE="; + rev = "37aa18d16e0f1a4fca5a276473ae37b2b93f623d"; + hash = "sha256-O9b6lgJt5SwTwIEohkYpwWxnN0R0w7oEZGrDgj3aGOs="; }; - patches = [ - ./fix_build_for_src_lib_disassembler_disassembler.diff - ]; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -35,6 +32,8 @@ stdenv.mkDerivation { ]; buildInputs = [ + qt6.qtbase + qt6.qttools kitemmodels libiberty elfutils diff --git a/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff b/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff deleted file mode 100644 index ccc31c45ccde..000000000000 --- a/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/lib/disassmbler/disassembler.cpp b/src/lib/disassmbler/disassembler.cpp -index 8ff058e..dbd4bbe 100644 ---- a/src/lib/disassmbler/disassembler.cpp -+++ b/src/lib/disassmbler/disassembler.cpp -@@ -144,11 +144,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si - QString result; - disassembler_ftype disassemble_fn; - disassemble_info info; --#if BINUTILS_VERSION >= BINUTILS_VERSION_CHECK(2, 39) -- INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, fprintf_styled); --#else -- INIT_DISASSEMBLE_INFO(info, &result, qstring_printf); --#endif -+ INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf); - - info.application_data = this; - info.flavour = bfd_target_elf_flavour; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c7e682c3436..cf01a17bf465 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10585,7 +10585,7 @@ with pkgs; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; - elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; + elf-dissector = kdePackages.callPackage ../applications/misc/elf-dissector { }; inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs30 From d317179f4a8313b9ed6e2d40c7890da845bf3238 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 3 Dec 2025 12:41:09 -0800 Subject: [PATCH 2/3] elf-dissector: move to by-name --- .../el/elf-dissector/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{applications/misc/elf-dissector/default.nix => by-name/el/elf-dissector/package.nix} (87%) diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/by-name/el/elf-dissector/package.nix similarity index 87% rename from pkgs/applications/misc/elf-dissector/default.nix rename to pkgs/by-name/el/elf-dissector/package.nix index 1ad9d4a61612..47344f04e180 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/by-name/el/elf-dissector/package.nix @@ -4,13 +4,12 @@ fetchFromGitLab, cmake, elfutils, - extra-cmake-modules, - kitemmodels, + kdePackages, libiberty, libdwarf, libopcodes, - wrapQtAppsHook, qt6, + qt6Packages, }: stdenv.mkDerivation { @@ -27,14 +26,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - extra-cmake-modules - wrapQtAppsHook + kdePackages.extra-cmake-modules + qt6Packages.wrapQtAppsHook ]; buildInputs = [ qt6.qtbase qt6.qttools - kitemmodels libiberty elfutils libopcodes diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf01a17bf465..f5516ab3cc09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10585,8 +10585,6 @@ with pkgs; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; - elf-dissector = kdePackages.callPackage ../applications/misc/elf-dissector { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs30 emacs30-gtk3 From 0840556358a3bcd540b188fbf76b8f222f1524fa Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 3 Dec 2025 12:41:55 -0800 Subject: [PATCH 3/3] elf-dissector: remove `with lib;` in meta --- pkgs/by-name/el/elf-dissector/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/el/elf-dissector/package.nix b/pkgs/by-name/el/elf-dissector/package.nix index 47344f04e180..6b01758f715d 100644 --- a/pkgs/by-name/el/elf-dissector/package.nix +++ b/pkgs/by-name/el/elf-dissector/package.nix @@ -43,8 +43,6 @@ stdenv.mkDerivation { homepage = "https://invent.kde.org/sdk/elf-dissector"; description = "Tools for inspecting, analyzing and optimizing ELF files"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ - philiptaron - ]; + maintainers = [ lib.maintainers.philiptaron ]; }; }