diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/by-name/ab/abracadabra/package.nix similarity index 75% rename from pkgs/applications/radio/abracadabra/default.nix rename to pkgs/by-name/ab/abracadabra/package.nix index faede7f8d7f6..498a10e24807 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -3,12 +3,7 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, - qtbase, - qtmultimedia, - qttools, - qtpositioning, - qtlocation, + qt6, faad2, mpg123, portaudio, @@ -20,26 +15,26 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8="; + hash = "sha256-iHa41VmCrNGsj+6LeYIigwiBahQuTVr+bAo0kFmQ6dw="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook - qttools + qt6.wrapQtAppsHook + qt6.qttools ]; buildInputs = [ - qtbase - qtmultimedia - qtlocation - qtpositioning + qt6.qtbase + qt6.qtmultimedia + qt6.qtlocation + qt6.qtpositioning faad2 mpg123 portaudio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f17b22d3023..097233e66afa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2926,8 +2926,6 @@ with pkgs; twine = with python3Packages; toPythonApplication twine; - abracadabra = qt6Packages.callPackage ../applications/radio/abracadabra { }; - accelergy = callPackage ../applications/science/computer-architecture/accelergy { }; aldo = callPackage ../applications/radio/aldo { };