From fb385d93845243654fc5133a66f66de372ecd1fd Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 16 Mar 2025 16:06:19 +0200 Subject: [PATCH] qastools: 0.23.0 -> 1.4.0 * Update to actual 1.4.0 version * Modernize * Switch to Qt6 * Move to pkgs/by-name * Add myself as maintainer Signed-off-by: Alexander V. Nikolaev --- .../qa/qastools/package.nix} | 37 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 22 insertions(+), 17 deletions(-) rename pkgs/{tools/audio/qastools/default.nix => by-name/qa/qastools/package.nix} (50%) diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/by-name/qa/qastools/package.nix similarity index 50% rename from pkgs/tools/audio/qastools/default.nix rename to pkgs/by-name/qa/qastools/package.nix index 37af3d9e7a61..b94318db64e2 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/by-name/qa/qastools/package.nix @@ -1,40 +1,47 @@ { - mkDerivation, + stdenv, lib, fetchFromGitLab, cmake, alsa-lib, udev, - qtbase, - qtsvg, - qttools, + qt6Packages, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qastools"; - version = "0.23.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; + hash = "sha256-mJjhM1y50f44kvxMidM7uqlkkXx1sbJC21vIMEDenoU="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - alsa-lib - udev - qtbase - qtsvg - qttools + nativeBuildInputs = [ + cmake + qt6Packages.wrapQtAppsHook ]; + buildInputs = + [ + alsa-lib + udev + ] + ++ (with qt6Packages; [ + qtbase + qtsvg + qttools + ]); meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; homepage = "https://gitlab.com/sebholt/qastools"; license = licenses.mit; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ + avnik + orivej + ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c13fd742be3..7a81833c89f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4745,8 +4745,6 @@ with pkgs; quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - qastools = libsForQt5.callPackage ../tools/audio/qastools { }; - qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };