From 21708aaeff6c8b949eb2b51b29f588d1b4724b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Sep 2025 03:41:58 -0700 Subject: [PATCH] hal-hardware-analyzer: move to pkgs/by-name --- .../ha/hal-hardware-analyzer/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 12 deletions(-) rename pkgs/{applications/science/electronics/hal-hardware-analyzer/default.nix => by-name/ha/hal-hardware-analyzer/package.nix} (96%) diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix similarity index 96% rename from pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix rename to pkgs/by-name/ha/hal-hardware-analyzer/package.nix index 136834c6a294..418ad47d55ad 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix @@ -11,13 +11,10 @@ nlohmann_json, pkg-config, python3Packages, - qtbase, - qtsvg, - quazip, + libsForQt5, rapidjson, spdlog, verilator, - wrapQtAppsHook, z3, }: @@ -46,11 +43,11 @@ stdenv.mkDerivation rec { cmake ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg boost rapidjson igraph @@ -59,7 +56,7 @@ stdenv.mkDerivation rec { graphviz verilator z3 - quazip + libsForQt5.quazip ] ++ (with python3Packages; [ python diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43851adceefb..b4f7958530f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3086,10 +3086,6 @@ with pkgs; haste-client = callPackage ../tools/misc/haste-client { }; - hal-hardware-analyzer = - libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer - { }; - halide = callPackage ../development/compilers/halide { llvmPackages = llvmPackages_19; };