diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/by-name/cp/cpeditor/package.nix
similarity index 70%
rename from pkgs/applications/editors/cpeditor/default.nix
rename to pkgs/by-name/cp/cpeditor/package.nix
index b869ec3b6d15..b2bccbd997fb 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/by-name/cp/cpeditor/package.nix
@@ -2,25 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  libsForQt5,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
-  syntax-highlighting,
   cmake,
   ninja,
   python3,
   runtimeShell,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cpeditor";
   version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "cpeditor";
     repo = "cpeditor";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-t7nn3sO45dOQq5OMWhaseO9XHicQ/1fjukXal5yPMgY";
     fetchSubmodules = true;
   };
@@ -29,13 +26,13 @@ stdenv.mkDerivation rec {
     cmake
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     python3
   ];
   buildInputs = [
-    qtbase
-    qttools
-    syntax-highlighting
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.syntax-highlighting
   ];
 
   postPatch = ''
@@ -43,12 +40,12 @@ stdenv.mkDerivation rec {
     substituteInPlace dist/linux/cpeditor.desktop --replace-fail 'Exec=/usr/bin/cpeditor' "Exec=cpeditor"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "IDE specially designed for competitive programming";
     homepage = "https://cpeditor.org";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ rewine ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.rewine ];
     mainProgram = "cpeditor";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 501f59f027be..ef4b544dfa94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11831,8 +11831,6 @@ with pkgs;
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { };
-
   csound = callPackage ../applications/audio/csound { };
 
   csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };