From 248d620e3640fafc6d3d7a3cb7f28bc4cfabbac8 Mon Sep 17 00:00:00 2001
From: Ariel Ebersberger <ariel@ebersberger.io>
Date: Thu, 13 Mar 2025 19:26:43 +0100
Subject: [PATCH 1/3] morgen: move package to pkgs/by-name

---
 .../morgen/default.nix => by-name/mo/morgen/package.nix}      | 2 +-
 pkgs/{applications/office => by-name/mo}/morgen/update.sh     | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)
 rename pkgs/{applications/office/morgen/default.nix => by-name/mo/morgen/package.nix} (97%)
 rename pkgs/{applications/office => by-name/mo}/morgen/update.sh (100%)

diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/by-name/mo/morgen/package.nix
similarity index 97%
rename from pkgs/applications/office/morgen/default.nix
rename to pkgs/by-name/mo/morgen/package.nix
index df939e531e47..5c59d7a2ec64 100644
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "All-in-one Calendars, Tasks and Scheduler";
-    homepage = "https://morgen.so/download";
+    homepage = "https://morgen.so/";
     mainProgram = "morgen";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
diff --git a/pkgs/applications/office/morgen/update.sh b/pkgs/by-name/mo/morgen/update.sh
similarity index 100%
rename from pkgs/applications/office/morgen/update.sh
rename to pkgs/by-name/mo/morgen/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04b2f59bb27c..27271bd668b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4222,10 +4222,6 @@ with pkgs;
     docbook-xsl = docbook_xsl;
   };
 
-  morgen = callPackage ../applications/office/morgen {
-    electron = electron_32;
-  };
-
   metasploit = callPackage ../tools/security/metasploit { };
 
   mhost = callPackage ../applications/networking/mhost {

From 7630ef89a83aab34f953f4846467a8b2d2a07b5f Mon Sep 17 00:00:00 2001
From: Ariel Ebersberger <ariel@ebersberger.io>
Date: Thu, 13 Mar 2025 19:26:57 +0100
Subject: [PATCH 2/3] morgen: fix update script

---
 pkgs/by-name/mo/morgen/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/morgen/update.sh b/pkgs/by-name/mo/morgen/update.sh
index e12f86a04bbc..6eda4e9d8c38 100755
--- a/pkgs/by-name/mo/morgen/update.sh
+++ b/pkgs/by-name/mo/morgen/update.sh
@@ -23,4 +23,4 @@ echo "Latest version of Morgen is $latestVersion"
 update-source-version morgen "$latestVersion"
 
 # Fetch and update the hash
-nix-prefetch-url --unpack "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb"
+nix-prefetch-url "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb"

From 6ecd6c11e8b9a48df352004d6557329ba2b66988 Mon Sep 17 00:00:00 2001
From: Ariel Ebersberger <ariel@ebersberger.io>
Date: Thu, 13 Mar 2025 19:28:14 +0100
Subject: [PATCH 3/3] morgen: 3.6.6 -> 3.6.9

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

diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix
index 5c59d7a2ec64..c7c35cdae86b 100644
--- a/pkgs/by-name/mo/morgen/package.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "3.6.6";
+  version = "3.6.9";
 
   src = fetchurl {
     name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-QisOXMj6uUMluPruUjtOEK93l+aZe7qsJUAZ589RzvU=";
+    hash = "sha256-An3CfJQ89aqpxMOf20YG+cuEVDrhgMGAm/Scn4hMV8E=";
   };
 
   nativeBuildInputs = [