From 6c09f62df7f32dc00c5954649d092052a51c31b5 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sun, 8 Sep 2024 18:00:36 +0100
Subject: [PATCH] albert: move to by-name

---
 .../al/albert/package.nix}                    | 25 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 18 deletions(-)
 rename pkgs/{applications/misc/albert/default.nix => by-name/al/albert/package.nix} (89%)

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/by-name/al/albert/package.nix
similarity index 89%
rename from pkgs/applications/misc/albert/default.nix
rename to pkgs/by-name/al/albert/package.nix
index 1e8f6c06e7c0..cde9f01547c0 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -2,19 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  qt6,
   cmake,
   libqalculate,
   muparser,
   libarchive,
   python3Packages,
-  qtbase,
-  qtscxml,
-  qtsvg,
-  qtdeclarative,
-  qtwayland,
-  qt5compat,
-  qttools,
-  wrapQtAppsHook,
   nix-update-script,
   pkg-config,
 }:
@@ -34,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -42,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
       libqalculate
       libarchive
       muparser
-      qtbase
-      qtscxml
-      qtsvg
-      qtdeclarative
-      qtwayland
-      qt5compat
-      qttools
+      qt6.qtbase
+      qt6.qtscxml
+      qt6.qtsvg
+      qt6.qtdeclarative
+      qt6.qtwayland
+      qt6.qt5compat
+      qt6.qttools
     ]
     ++ (with python3Packages; [
       python
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2cab3581603..c82d2aba8a22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1623,8 +1623,6 @@ with pkgs;
   inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
     akku akkuPackages;
 
-  albert = qt6Packages.callPackage ../applications/misc/albert { };
-
   alice-lg = callPackage ../servers/alice-lg{ };
 
   alice-tools = callPackage ../tools/games/alice-tools {