From 77d2292e5c7b9d9a87f696710b06b3a98025f8d2 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <kovirobi@gmail.com>
Date: Wed, 4 Dec 2024 19:16:59 +0000
Subject: [PATCH 1/2] Allow using `override` to add features

This way you can do
```nix
himalaya.override {
  buildFeatures = [ "notmuch" "oauth2" ];
}
```

Also this uses any unspecified arguments as if they were given from
`pkgs`, so no need to explicitly specify.
---
 default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index 7601f57a..f8add8b6 100644
--- a/default.nix
+++ b/default.nix
@@ -5,17 +5,11 @@
 pimalaya.mkDefault ({
   src = ./.;
   version = "1.0.0";
-  mkPackage = ({ lib, pkgs, rustPlatform, defaultFeatures, features }: import ./package.nix {
+  mkPackage = ({ lib, pkgs, rustPlatform, defaultFeatures, features }: pkgs.callPackage ./package.nix {
     inherit lib rustPlatform;
-    fetchFromGitHub = pkgs.fetchFromGitHub;
-    stdenv = pkgs.stdenv;
     apple-sdk = if pkgs.hostPlatform.isx86_64 then pkgs.apple-sdk_13 else pkgs.apple-sdk_14;
-    installShellFiles = pkgs.installShellFiles;
     installShellCompletions = false;
     installManPages = false;
-    notmuch = pkgs.notmuch;
-    gpgme = pkgs.gpgme;
-    pkg-config = pkgs.pkg-config;
     buildNoDefaultFeatures = !defaultFeatures;
     buildFeatures = lib.splitString "," features;
   });

From 0302a77f73bb0370d904e57f147b329af1917f6a Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <kovirobi@gmail.com>
Date: Wed, 4 Dec 2024 21:38:40 +0000
Subject: [PATCH 2/2] Fix Outlook SMTP server typo

From
https://support.microsoft.com/en-us/office/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 62836973..88a30b62 100644
--- a/README.md
+++ b/README.md
@@ -385,7 +385,7 @@ You can also manually edit your own configuration, from scratch:
   backend.auth.raw = "*****"
 
   message.send.backend.type = "smtp"
-  message.send.backend.host = "smtp.mail.outlook.com"
+  message.send.backend.host = "smtp-mail.outlook.com"
   message.send.backend.port = 587
   message.send.backend.encryption = "start-tls"
   message.send.backend.login = "example@outlook.com"