From a732d1503a93d655758d033cd6c893e3bfb9bde9 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Sun, 7 Dec 2025 16:21:16 +0100
Subject: [PATCH 1/3] xournalpp: move to by-name/

---
 .../default.nix => by-name/xo/xournalpp/package.nix}          | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/graphics/xournalpp/default.nix => by-name/xo/xournalpp/package.nix} (97%)

diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/by-name/xo/xournalpp/package.nix
similarity index 97%
rename from pkgs/applications/graphics/xournalpp/default.nix
rename to pkgs/by-name/xo/xournalpp/package.nix
index b622623ac59a..1dcae1afe32e 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -25,7 +25,7 @@
   zlib,
   # plugins
   withLua ? true,
-  lua,
+  lua5_3,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
       portaudio
       zlib
     ]
-    ++ lib.optional withLua lua;
+    ++ lib.optional withLua lua5_3;
 
   buildFlags = [ "translations" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6b7e589cf8f..a06ddbcd78be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12596,10 +12596,6 @@ with pkgs;
           ;
       };
 
-  xournalpp = callPackage ../applications/graphics/xournalpp {
-    lua = lua5_3;
-  };
-
   xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
 
   xmobar = haskellPackages.xmobar.bin;

From ca40c960a8fd9cb3e689f51b8defc5bb7bc7573a Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Sun, 7 Dec 2025 16:25:44 +0100
Subject: [PATCH 2/3] xournalpp: add update script

---
 pkgs/by-name/xo/xournalpp/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix
index 1dcae1afe32e..325a6280db26 100644
--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -26,6 +26,7 @@
   # plugins
   withLua ? true,
   lua5_3,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -79,6 +80,8 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
     homepage = "https://xournalpp.github.io/";

From 4a52646221a27cb574ff6049a2b317655908da52 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Sun, 7 Dec 2025 16:28:58 +0100
Subject: [PATCH 3/3] xournalpp: 1.2.9 -> 1.2.10

---
 pkgs/by-name/xo/xournalpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix
index 325a6280db26..11f21e9c1004 100644
--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.2.9";
+  version = "1.2.10";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     rev = "v${version}";
-    hash = "sha256-YrLGa/BeZX3UeHY+n8LDStRJhEZfPe4Xjx20KtYBPow=";
+    hash = "sha256-3M7ycbwKSmu8WUqC3anAi6GLPOex7gEndw/tDv0Ri7Q=";
   };
 
   postPatch = ''