From 2dc0ec1cd338bcb21ae4a9f847bc3ade5c154581 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 03:22:28 +0200
Subject: [PATCH] qtcreator: move to by-name

---
 .../qt/qtcreator/package.nix}                 | 54 +++++++------------
 .../qt}/qtcreator/with-plugins.nix            |  0
 pkgs/top-level/all-packages.nix               |  5 --
 3 files changed, 20 insertions(+), 39 deletions(-)
 rename pkgs/{development/tools/qtcreator/default.nix => by-name/qt/qtcreator/package.nix} (84%)
 rename pkgs/{development/tools => by-name/qt}/qtcreator/with-plugins.nix (100%)

diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/by-name/qt/qtcreator/package.nix
similarity index 84%
rename from pkgs/development/tools/qtcreator/default.nix
rename to pkgs/by-name/qt/qtcreator/package.nix
index ca44d1d9e78b..674e9e6a076e 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/by-name/qt/qtcreator/package.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   fetchurl,
   cmake,
@@ -7,24 +6,13 @@
   ninja,
   go,
   python3,
-  qtbase,
-  qt5compat,
-  qtdeclarative,
-  qtdoc,
-  qtquick3d,
-  qtquicktimeline,
-  qtserialport,
-  qtsvg,
-  qttools,
-  qtwebengine,
-  qtwayland,
-  qtshadertools,
-  wrapQtAppsHook,
+  qt6,
   yaml-cpp,
   litehtml,
   libsecret,
   gumbo,
-  llvmPackages,
+  llvmPackages_21,
+  stdenv' ? llvmPackages_21.stdenv,
   rustc-demangle,
   elfutils,
   perf,
@@ -49,39 +37,37 @@ let
       '';
     }).goModules;
 in
-stdenv.mkDerivation {
-  inherit pname;
-  inherit version;
-  inherit src;
+stdenv'.mkDerivation {
+  inherit pname version src;
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    (qttools.override { withClang = true; })
-    wrapQtAppsHook
+    (qt6.qttools.override { withClang = true; })
+    qt6.wrapQtAppsHook
     python3
     ninja
     go
   ];
 
   buildInputs = [
-    qtbase
-    qtdoc
-    qtsvg
-    qtquick3d
-    qtwebengine
-    qtwayland
-    qtserialport
-    qtshadertools
-    qt5compat
-    qtdeclarative
-    qtquicktimeline
+    qt6.qtbase
+    qt6.qtdoc
+    qt6.qtsvg
+    qt6.qtquick3d
+    qt6.qtwebengine
+    qt6.qtwayland
+    qt6.qtserialport
+    qt6.qtshadertools
+    qt6.qt5compat
+    qt6.qtdeclarative
+    qt6.qtquicktimeline
     yaml-cpp
     litehtml
     libsecret
     gumbo
-    llvmPackages.libclang
-    llvmPackages.llvm
+    llvmPackages_21.libclang
+    llvmPackages_21.llvm
     rustc-demangle
     elfutils
   ];
diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/by-name/qt/qtcreator/with-plugins.nix
similarity index 100%
rename from pkgs/development/tools/qtcreator/with-plugins.nix
rename to pkgs/by-name/qt/qtcreator/with-plugins.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97bd1be46156..2e17f9171466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6207,11 +6207,6 @@ with pkgs;
 
   pycritty = with python3Packages; toPythonApplication pycritty;
 
-  qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
-    llvmPackages = llvmPackages_21;
-    stdenv = llvmPackages_21.stdenv;
-  };
-
   qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit { };
 
   radare2 = callPackage ../development/tools/analysis/radare2 (