From 0591e43e63e7f7bc415486adf5f8489d50d495e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 01:42:02 +0000
Subject: [PATCH 1/2] pageedit: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix
index d090520684db..23d176be189b 100644
--- a/pkgs/applications/office/PageEdit/default.nix
+++ b/pkgs/applications/office/PageEdit/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pageedit";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "Sigil-Ebook";
     repo = "pageedit";
     tag = finalAttrs.version;
-    hash = "sha256-BsK+agn8O2WeftiEHfT5B1hzsP5Av4DkIZqVKoQxb70=";
+    hash = "sha256-Tkc8iOH+HG3ULrdUvVdeOzAl0i1R3QFaZ1U/vjCKGjo=";
   };
 
   nativeBuildInputs = [

From 3b3c59b9843585f13ea4a3ca47fae8c9436ef1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 25 May 2025 19:24:08 -0700
Subject: [PATCH 2/2] pageedit: move to pkgs/by-name

---
 .../default.nix => by-name/pa/pageedit/package.nix}      | 9 +++------
 pkgs/top-level/all-packages.nix                          | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{applications/office/PageEdit/default.nix => by-name/pa/pageedit/package.nix} (90%)

diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/by-name/pa/pageedit/package.nix
similarity index 90%
rename from pkgs/applications/office/PageEdit/default.nix
rename to pkgs/by-name/pa/pageedit/package.nix
index 23d176be189b..7ebc9c53ba6f 100644
--- a/pkgs/applications/office/PageEdit/default.nix
+++ b/pkgs/by-name/pa/pageedit/package.nix
@@ -3,10 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtsvg,
-  qtwebengine,
-  wrapQtAppsHook,
-  qttools,
+  qt6Packages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Tkc8iOH+HG3ULrdUvVdeOzAl0i1R3QFaZ1U/vjCKGjo=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with qt6Packages; [
     cmake
     wrapQtAppsHook
     qttools
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with qt6Packages; [
     qtsvg
     qtwebengine
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21affad468e6..7f068aabf77a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4085,8 +4085,6 @@ with pkgs;
 
   padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
 
-  pageedit = qt6Packages.callPackage ../applications/office/PageEdit { };
-
   pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
 
   pakcs = callPackage ../development/compilers/pakcs { };