From bf8dff745685abad8bcc93c5463456e9d1297c79 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 2 Nov 2024 21:10:50 +0100
Subject: [PATCH 1/2] abracadabra: 2.6.0 -> 2.7.0

---
 pkgs/applications/radio/abracadabra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix
index faede7f8d7f6..6089c1ba78ce 100644
--- a/pkgs/applications/radio/abracadabra/default.nix
+++ b/pkgs/applications/radio/abracadabra/default.nix
@@ -20,13 +20,13 @@
 
 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 = [

From c06fa3b4a97717e29a9d1274aea958dadfe27be0 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 2 Nov 2024 21:13:21 +0100
Subject: [PATCH 2/2] abracadabra: move to by-name

---
 .../ab/abracadabra/package.nix}               | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename pkgs/{applications/radio/abracadabra/default.nix => by-name/ab/abracadabra/package.nix} (83%)

diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/by-name/ab/abracadabra/package.nix
similarity index 83%
rename from pkgs/applications/radio/abracadabra/default.nix
rename to pkgs/by-name/ab/abracadabra/package.nix
index 6089c1ba78ce..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,
@@ -31,15 +26,15 @@ stdenv.mkDerivation rec {
 
   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 d66ad450ec82..880035f7362a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2928,8 +2928,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 { };