From 00a0b29d983df98bed781ae4f531ea6fc41d4d86 Mon Sep 17 00:00:00 2001
From: zi3m5f <113244000+zi3m5f@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:39:30 +0100
Subject: [PATCH 1/5] lunatask: nixfmt

---
 pkgs/applications/misc/lunatask/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix
index 82b30866f842..712105afc579 100644
--- a/pkgs/applications/misc/lunatask/default.nix
+++ b/pkgs/applications/misc/lunatask/default.nix
@@ -1,4 +1,8 @@
-{ lib, appimageTools, fetchurl }:
+{
+  lib,
+  appimageTools,
+  fetchurl,
+}:
 
 let
   version = "2.0.11";

From 9de71c61f5e87e35c0017a0dcc90a47977ecf452 Mon Sep 17 00:00:00 2001
From: zi3m5f <113244000+zi3m5f@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:41:09 +0100
Subject: [PATCH 2/5] lunatask: move to pkgs/by-name

---
 .../lunatask/default.nix => by-name/lu/lunatask/package.nix}    | 0
 pkgs/{applications/misc => by-name/lu}/lunatask/update.py       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/lunatask/default.nix => by-name/lu/lunatask/package.nix} (100%)
 rename pkgs/{applications/misc => by-name/lu}/lunatask/update.py (100%)

diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/by-name/lu/lunatask/package.nix
similarity index 100%
rename from pkgs/applications/misc/lunatask/default.nix
rename to pkgs/by-name/lu/lunatask/package.nix
diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/by-name/lu/lunatask/update.py
similarity index 100%
rename from pkgs/applications/misc/lunatask/update.py
rename to pkgs/by-name/lu/lunatask/update.py
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55968eed1355..237746d16f25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9113,8 +9113,6 @@ with pkgs;
 
   ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
 
-  lunatask = callPackage ../applications/misc/lunatask { };
-
   lvmsync = callPackage ../tools/backup/lvmsync { };
 
   kapp = callPackage ../tools/networking/kapp { };

From 95e929663d5121d52ca2a631e11e3b385117bca9 Mon Sep 17 00:00:00 2001
From: zi3m5f <113244000+zi3m5f@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:46:15 +0100
Subject: [PATCH 3/5] lunatask: 2.0.11 -> 2.0.12

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

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 712105afc579..75640de9452b 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "2.0.11";
+  version = "2.0.12";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
-    sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o=";
+    sha256 = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 674769e6790a3a8234e13454896baea27a82695b Mon Sep 17 00:00:00 2001
From: zi3m5f <113244000+zi3m5f@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:10:29 +0100
Subject: [PATCH 4/5] lunatask: small improvements

---
 pkgs/by-name/lu/lunatask/package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 75640de9452b..6955e3b33633 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -10,27 +10,27 @@ let
 
   src = fetchurl {
     url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
-    sha256 = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
+    hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
   };
 
-  appimageContents = appimageTools.extractType2 {
+  appimageContents = appimageTools.extract {
     inherit pname version src;
   };
 
 in
-appimageTools.wrapType2 rec {
+appimageTools.wrapType2 {
   inherit pname version src;
 
   extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-    install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
+    install -m 444 -D -t $out/share/applications ${appimageContents}/lunatask.desktop
+    install -m 444 -D -t $out/share/icons/hicolor/512x512/apps ${appimageContents}/lunatask.png
+    substituteInPlace $out/share/applications/lunatask.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=lunatask'
   '';
 
   passthru.updateScript = ./update.py;
 
-  meta = with lib; {
+  meta = {
     description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app";
     longDescription = ''
       Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health.
@@ -38,9 +38,9 @@ appimageTools.wrapType2 rec {
     homepage = "https://lunatask.app";
     downloadPage = "https://lunatask.app/download";
     changelog = "https://lunatask.app/releases/${version}";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ henkery ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ henkery ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "lunatask";
   };

From 82cfe011c4aff66538c60aac5648ff05ab7bdd31 Mon Sep 17 00:00:00 2001
From: zi3m5f <113244000+zi3m5f@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:04:05 +0100
Subject: [PATCH 5/5] lunatask: adopt

https://github.com/NixOS/nixpkgs/pull/353792#issuecomment-2456863125
---
 pkgs/by-name/lu/lunatask/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 6955e3b33633..92277537961a 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -40,7 +40,7 @@ appimageTools.wrapType2 {
     changelog = "https://lunatask.app/releases/${version}";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ henkery ];
+    maintainers = with lib.maintainers; [ zi3m5f ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "lunatask";
   };