From f44657240cfd912f6b0890cd89a9ed13e3f37441 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 11 Nov 2025 01:58:23 +0100
Subject: [PATCH 1/2] fastmail-desktop: fix update script

---
 pkgs/by-name/fa/fastmail-desktop/darwin.nix  | 4 ++++
 pkgs/by-name/fa/fastmail-desktop/sources.nix | 3 +--
 pkgs/by-name/fa/fastmail-desktop/update.sh   | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/darwin.nix b/pkgs/by-name/fa/fastmail-desktop/darwin.nix
index 6e815849081c..3e0d58bda7c4 100644
--- a/pkgs/by-name/fa/fastmail-desktop/darwin.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/darwin.nix
@@ -5,6 +5,7 @@
   passthru,
   meta,
   stdenvNoCC,
+  unzip,
 }:
 stdenvNoCC.mkDerivation {
   inherit
@@ -15,6 +16,9 @@ stdenvNoCC.mkDerivation {
     meta
     ;
 
+  sourceRoot = ".";
+  nativeBuildInputs = [ unzip ];
+
   installPhase = ''
     mkdir -p $out/Applications
     cp -R Fastmail.app $out/Applications/
diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
index da373f653e94..e8e4d0cddc8d 100644
--- a/pkgs/by-name/fa/fastmail-desktop/sources.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -4,10 +4,9 @@
 {
   aarch64-darwin = {
     version = "1.0.3";
-    src = fetchzip {
+    src = fetchurl {
       url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.3-arm64-mac.zip";
       hash = "sha512-lqJj0tTwOJx1jzzXtlKOOduUEtSgVHpQCM5WkbXjmOh2OejLRcdJ1Y9CxvZJGSPBGWrErKzytMOB8QmJ1BkIdw==";
-      stripRoot = false;
     };
   };
   x86_64-linux = {
diff --git a/pkgs/by-name/fa/fastmail-desktop/update.sh b/pkgs/by-name/fa/fastmail-desktop/update.sh
index 52c07e300a96..c21c13c3fe7a 100755
--- a/pkgs/by-name/fa/fastmail-desktop/update.sh
+++ b/pkgs/by-name/fa/fastmail-desktop/update.sh
@@ -24,10 +24,9 @@ cat >sources.nix <<EOF
 {
   aarch64-darwin = {
     version = "$aarch64_darwin_version";
-    src = fetchzip {
+    src = fetchurl {
       url = "$aarch64_darwin_url";
       hash = "$aarch64_darwin_hash";
-      stripRoot = false;
     };
   };
   x86_64-linux = {

From b20f1c12200a87fe29f704171c6dd529f3283925 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 11 Nov 2025 02:00:15 +0100
Subject: [PATCH 2/2] fastmail-desktop: 1.0.3 -> 1.0.4

---
 pkgs/by-name/fa/fastmail-desktop/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
index e8e4d0cddc8d..d5d7f802508b 100644
--- a/pkgs/by-name/fa/fastmail-desktop/sources.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-10-30
+# Last updated: 2025-11-11
 { fetchurl, fetchzip }:
 {
   aarch64-darwin = {
-    version = "1.0.3";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.3-arm64-mac.zip";
-      hash = "sha512-lqJj0tTwOJx1jzzXtlKOOduUEtSgVHpQCM5WkbXjmOh2OejLRcdJ1Y9CxvZJGSPBGWrErKzytMOB8QmJ1BkIdw==";
+      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.4-arm64-mac.zip";
+      hash = "sha512-DoBG2pY8a1BjNby0/PFAmRnEdMzX3n/JNlGW1/uHvi8lmzDMfEK5F0RAE4bNW08TPnaomjQOMRnqcas/9SecuA==";
     };
   };
   x86_64-linux = {
-    version = "1.0.3";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.3.AppImage";
-      hash = "sha512-L+h0GHAAlZndB4Q5Z7GiHuZqv1kTF5yCAJYYb9tPXnHfdcrwHvfBRnixEnVPPia46rp2IJ56z4ZS8RSut3ATFQ==";
+      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.4.AppImage";
+      hash = "sha512-lavGgtrIRiYL4NQEecpppvcTLZCgp54sTDFyVgySzBZmB6bcwCk9Kpjgepjma6iCUtUQYkN5ydtEYLZqTcSw4Q==";
     };
   };
 }