From 4696381f5f0939176c3ceaf9aabbff82b46a22ab Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 2 Aug 2025 10:47:03 -0700
Subject: [PATCH 1/4] ccpeditor: use callPackage

---
 pkgs/applications/editors/cpeditor/default.nix | 13 +++++--------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix
index b869ec3b6d15..78594f94c6a5 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/applications/editors/cpeditor/default.nix
@@ -2,11 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  libsForQt5,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
-  syntax-highlighting,
   cmake,
   ninja,
   python3,
@@ -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 = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..a2c77a911d2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11859,7 +11859,7 @@ with pkgs;
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { };
+  cpeditor = callPackage ../applications/editors/cpeditor { };
 
   csound = callPackage ../applications/audio/csound { };
 

From 88d59b1f28fde2098b231cdd8f88ad5c52d0219e Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 2 Aug 2025 10:49:02 -0700
Subject: [PATCH 2/4] cpeditor: remove with lib

---
 pkgs/applications/editors/cpeditor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix
index 78594f94c6a5..ec757d3202f0 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/applications/editors/cpeditor/default.nix
@@ -40,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";
   };
 }

From 24d206dd242744735fe96b77ffc83ebcc9ff0e06 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 2 Aug 2025 10:49:29 -0700
Subject: [PATCH 3/4] cpeditor: use finalAttrs

---
 pkgs/applications/editors/cpeditor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix
index ec757d3202f0..b2bccbd997fb 100644
--- a/pkgs/applications/editors/cpeditor/default.nix
+++ b/pkgs/applications/editors/cpeditor/default.nix
@@ -10,14 +10,14 @@
   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;
   };
@@ -48,4 +48,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.rewine ];
     mainProgram = "cpeditor";
   };
-}
+})

From c3ab7634ed3e1db54ea2e6cb564025d3ec77bf04 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 2 Aug 2025 10:50:12 -0700
Subject: [PATCH 4/4] cpeditor: move to by-name

---
 .../cpeditor/default.nix => by-name/cp/cpeditor/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/editors/cpeditor/default.nix => by-name/cp/cpeditor/package.nix} (100%)

diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/by-name/cp/cpeditor/package.nix
similarity index 100%
rename from pkgs/applications/editors/cpeditor/default.nix
rename to pkgs/by-name/cp/cpeditor/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2c77a911d2c..d114a1e01d5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11859,8 +11859,6 @@ with pkgs;
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  cpeditor = callPackage ../applications/editors/cpeditor { };
-
   csound = callPackage ../applications/audio/csound { };
 
   csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };