From cf340b8524c27f0758cbde1ab2b4ee0045f18f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Mon, 1 May 2023 17:45:24 +0200
Subject: [PATCH 1/2] himalaya: 0.7.1 -> 0.7.3

https://github.com/soywod/himalaya/blob/master/CHANGELOG.md
---
 .../mailreaders/himalaya/default.nix          | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index 96b5b9bbcac4..fce31144da31 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -10,6 +10,10 @@
 , libiconv
 , openssl
 , notmuch
+, withRusttlsTls ? true
+, withRusttlsNativeCerts ? withRusttlsTls
+, withNativeTls ? false
+, withNativeTlsVendored ? withNativeTls
 , withImapBackend ? true
 , withNotmuchBackend ? false
 , withSmtpSender ? true
@@ -17,30 +21,34 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "himalaya";
-  version = "0.7.1";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "soywod";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-yAfNH9LSXlS/Hzi5kAuur5BX2vITMucprDzxhlV8RiY=";
+    sha256 = "sha256-HmH4qL70ii8rS8OeUnUxsy9/wMx+f2SBd1AyRqlfKfc=";
   };
 
-  cargoSha256 = "sha256-FXfh6T8dNsnD/V/wYSMDWs+ll0d1jg1Dc3cQT39b0ws=";
+  cargoSha256 = "sha256-NJFOtWlfKZRLr9vvDvPQjpT4LGMeytk0JFJb0r77bwE=";
 
   nativeBuildInputs = [ ]
     ++ lib.optional (installManPages || installShellCompletions) installShellFiles
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
+    ++ lib.optional (withNativeTls && !stdenv.hostPlatform.isDarwin) pkg-config;
 
   buildInputs = [ ]
-    ++ (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
+    ++ lib.optional withNativeTls (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
     ++ lib.optional withNotmuchBackend notmuch;
 
   buildNoDefaultFeatures = true;
   buildFeatures = [ ]
+    ++ lib.optional withRusttlsTls "rustls-tls"
+    ++ lib.optional withRusttlsNativeCerts "rustls-native-certs"
+    ++ lib.optional withNativeTls "native-tls"
+    ++ lib.optional withNativeTlsVendored "native-tls-vendored"
     ++ lib.optional withImapBackend "imap-backend"
     ++ lib.optional withNotmuchBackend "notmuch-backend"
-    ++ lib.optional withSmtpSender "smtp-sender";
+'    ++ lib.optional withSmtpSender "smtp-sender";
 
   postInstall = lib.optionalString installManPages ''
     mkdir -p $out/man
@@ -54,8 +62,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "Command-line interface for email management";
-    homepage = "https://github.com/soywod/himalaya";
+    description = "CLI to manage your emails.";
+    homepage = "https://pimalaya.org/himalaya/";
     changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ soywod toastal yanganto ];

From 29ab2ff6bbfdaaaf36a7e26aed88d88f03a3975c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Mon, 1 May 2023 20:33:58 +0200
Subject: [PATCH 2/2] himalaya: remove sha256 prefixes

---
 .../networking/mailreaders/himalaya/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index fce31144da31..72fb01957b50 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec {
     owner = "soywod";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-HmH4qL70ii8rS8OeUnUxsy9/wMx+f2SBd1AyRqlfKfc=";
+    sha256 = "HmH4qL70ii8rS8OeUnUxsy9/wMx+f2SBd1AyRqlfKfc=";
   };
 
-  cargoSha256 = "sha256-NJFOtWlfKZRLr9vvDvPQjpT4LGMeytk0JFJb0r77bwE=";
+  cargoSha256 = "NJFOtWlfKZRLr9vvDvPQjpT4LGMeytk0JFJb0r77bwE=";
 
   nativeBuildInputs = [ ]
     ++ lib.optional (installManPages || installShellCompletions) installShellFiles
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optional withNativeTlsVendored "native-tls-vendored"
     ++ lib.optional withImapBackend "imap-backend"
     ++ lib.optional withNotmuchBackend "notmuch-backend"
-'    ++ lib.optional withSmtpSender "smtp-sender";
+    ++ lib.optional withSmtpSender "smtp-sender";
 
   postInstall = lib.optionalString installManPages ''
     mkdir -p $out/man