From 9bfd85bf3373b9481b03c6d9178bc0df2d8b2b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 21 Dec 2022 15:50:04 +0100
Subject: [PATCH 1/8] prepare v0.6.2

---
 maintainers/maintainer-list.nix               | 10 +++++++++
 .../mailreaders/himalaya/default.nix          | 22 +++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f0eb281950b..5499b77f7fce 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13124,6 +13124,16 @@
     githubId = 6277322;
     name = "Wei Tang";
   };
+  soywod = {
+    name = "Clément DOUIN";
+    email = "clement.douin@posteo.net";
+    matrix = "@soywod:matrix.org";
+    github = "soywod";
+    githubId = 10437171;
+    keys = [{
+      fingerprint = "75F0 AB7C FE01 D077 AEE6  CAFD 353E 4A18 EE0F AB72";
+    }];
+  };
   spacefrogg = {
     email = "spacefrogg-nixos@meterriblecrew.net";
     github = "spacefrogg";
diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index 52aac148df36..f9f4668069b0 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -2,8 +2,9 @@
 , rustPlatform
 , fetchFromGitHub
 , stdenv
-, enableCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
 , installShellFiles
+, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
+, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
 , pkg-config
 , Security
 , libiconv
@@ -12,7 +13,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "himalaya";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "soywod";
@@ -23,7 +24,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg=";
 
-  nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
+  nativeBuildInputs = [ ]
+    ++ lib.optionals (installManPages || installShellCompletions) [ installShellFiles ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
 
   buildInputs =
@@ -38,8 +40,14 @@ rustPlatform.buildRustPackage rec {
   # additional tooling and servers to test
   cargoTestFlags = [ "--lib" ];
 
-  postInstall = lib.optionalString enableCompletions ''
-    # Install shell function
+
+  postInstall = lib.optionalString installManPages ''
+    # Install man pages
+    mkdir -p $out/man
+    $out/bin/himalaya man $out/man
+    installManPage $out/man/*
+  '' ++ lib.optionalString installShellCompletions ''
+    # Install shell completions
     installShellCompletion --cmd himalaya \
       --bash <($out/bin/himalaya completion bash) \
       --fish <($out/bin/himalaya completion fish) \
@@ -50,7 +58,7 @@ rustPlatform.buildRustPackage rec {
     description = "Command-line interface for email management";
     homepage = "https://github.com/soywod/himalaya";
     changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ toastal yanganto ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ soywod toastal yanganto ];
   };
 }

From 42d3c2083fe985218c004f9bbb96382d995df0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 8 Feb 2023 11:03:41 +0100
Subject: [PATCH 2/8] bump v0.7.0

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

diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index f9f4668069b0..d75abfff5ff7 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "himalaya";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "soywod";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk=";
+    sha256 = "sha256-qwtG6pk/PCr5lAcxRt1D8XM3rUG1bEVrUFo+3tMPlRw=";
   };
 
-  cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg=";
+  cargoSha256 = "sha256-Jg/sVluw7UoBEYGk/A5Q5Qr8EojxEpr/E/F1caN7ZG8=";
 
   nativeBuildInputs = [ ]
     ++ lib.optionals (installManPages || installShellCompletions) [ installShellFiles ]
@@ -36,17 +36,16 @@ rustPlatform.buildRustPackage rec {
       openssl
     ];
 
-  # flag added because without end-to-end testing is ran which requires
-  # additional tooling and servers to test
+  # TODO: is there a way to spawn an IMAP server to run integration
+  # tests?
   cargoTestFlags = [ "--lib" ];
 
-
   postInstall = lib.optionalString installManPages ''
     # Install man pages
     mkdir -p $out/man
     $out/bin/himalaya man $out/man
     installManPage $out/man/*
-  '' ++ lib.optionalString installShellCompletions ''
+  '' + lib.optionalString installShellCompletions ''
     # Install shell completions
     installShellCompletion --cmd himalaya \
       --bash <($out/bin/himalaya completion bash) \

From 7d403873242bd14be9ebda1c4f821615fe5f372d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Thu, 9 Feb 2023 15:17:55 +0100
Subject: [PATCH 3/8] himalaya: adjust todo comment about cargo test flags

---
 pkgs/applications/networking/mailreaders/himalaya/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index d75abfff5ff7..c5d121cb8575 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -36,8 +36,8 @@ rustPlatform.buildRustPackage rec {
       openssl
     ];
 
-  # TODO: is there a way to spawn an IMAP server to run integration
-  # tests?
+  # TODO: remove this flag once this issue is fixed:
+  # https://todo.sr.ht/~soywod/pimalaya/36
   cargoTestFlags = [ "--lib" ];
 
   postInstall = lib.optionalString installManPages ''

From 4fe7937e96510ce0f2a7252ff73e3d3143f6c0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 15 Feb 2023 13:21:00 +0100
Subject: [PATCH 4/8] himalaya: bump v0.7.1

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names      | 2 +-
 .../networking/mailreaders/himalaya/default.nix             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 6552349d1e3a..3d0c29c518a7 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -308,7 +308,6 @@ https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
 https://github.com/rebelot/heirline.nvim/,,
 https://github.com/Yggdroot/hiPairs/,,
-https://git.sr.ht/~soywod/himalaya-vim,,
 https://github.com/mpickering/hlint-refactor-vim/,,
 https://github.com/edluffy/hologram.nvim/,,
 https://github.com/urbit/hoon.vim/,,
@@ -1175,3 +1174,4 @@ https://github.com/ziglang/zig.vim/,,
 https://github.com/mickael-menu/zk-nvim/,HEAD,
 https://github.com/troydm/zoomwintab.vim/,,
 https://github.com/nanotee/zoxide.vim/,,
+https://git.sr.ht/~soywod/himalaya-vim,,
diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index c5d121cb8575..cd82c8e1f961 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "himalaya";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "soywod";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qwtG6pk/PCr5lAcxRt1D8XM3rUG1bEVrUFo+3tMPlRw=";
+    sha256 = "sha256-yAfNH9LSXlS/Hzi5kAuur5BX2vITMucprDzxhlV8RiY=";
   };
 
-  cargoSha256 = "sha256-Jg/sVluw7UoBEYGk/A5Q5Qr8EojxEpr/E/F1caN7ZG8=";
+  cargoSha256 = "sha256-FXfh6T8dNsnD/V/wYSMDWs+ll0d1jg1Dc3cQT39b0ws=";
 
   nativeBuildInputs = [ ]
     ++ lib.optionals (installManPages || installShellCompletions) [ installShellFiles ]

From c4c6a6082b47203dba648ffc02e1aa1c4f2a7188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 15 Feb 2023 16:06:49 +0100
Subject: [PATCH 5/8] make himalaya-vim derivation use versions to reduce
 breaking changes

---
 .../editors/vim/plugins/overrides.nix         | 86 ++++++++++---------
 .../editors/vim/plugins/vim-plugin-names      |  2 +-
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 0b02b1d9d807..575e6cc356f9 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -5,6 +5,7 @@
 , buildGoModule
 , buildVimPluginFrom2Nix
 , fetchFromGitHub
+, fetchFromSourcehut
 , fetchpatch
 , fetchurl
 , substituteAll
@@ -488,12 +489,13 @@ self: super: {
   });
 
   himalaya-vim = super.himalaya-vim.overrideAttrs (old: {
-    postPatch = ''
-      substituteInPlace plugin/himalaya.vim \
-        --replace "if !executable('himalaya')" "if v:false"
-      substituteInPlace autoload/himalaya/request.vim \
-        --replace "'himalaya" "'${himalaya}/bin/himalaya"
-    '';
+    buildInputs = [ himalaya ];
+    src = fetchFromSourcehut {
+      owner = "~soywod";
+      repo = "himalaya-vim";
+      rev = "v${himalaya.version}";
+      sha256 = "W+91hnNeS6WkDiR9r1s7xPTK9JlCWiVkI/nXVYbepY0=";
+    };
   });
 
   jedi-vim = super.jedi-vim.overrideAttrs (old: {
@@ -578,28 +580,30 @@ self: super: {
     dependencies = with self; [ plenary-nvim ];
   });
 
-  markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let
-    # We only need its dependencies `node-modules`.
-    nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {
-      dontNpmInstall = true;
-    });
-  in {
-    patches = [
-      (substituteAll {
-        src = ./markdown-preview-nvim/fix-node-paths.patch;
-        node = "${nodejs}/bin/node";
-      })
-    ];
-    postInstall = ''
-      ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app
-    '';
+  markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old:
+    let
+      # We only need its dependencies `node-modules`.
+      nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {
+        dontNpmInstall = true;
+      });
+    in
+    {
+      patches = [
+        (substituteAll {
+          src = ./markdown-preview-nvim/fix-node-paths.patch;
+          node = "${nodejs}/bin/node";
+        })
+      ];
+      postInstall = ''
+        ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app
+      '';
 
-    nativeBuildInputs = [ nodejs ];
-    doInstallCheck = true;
-    installCheckPhase = ''
-      node $out/app/index.js --version
-    '';
-  });
+      nativeBuildInputs = [ nodejs ];
+      doInstallCheck = true;
+      installCheckPhase = ''
+        node $out/app/index.js --version
+      '';
+    });
 
   mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: {
     dependencies = with self; [ mason-nvim nvim-lspconfig ];
@@ -660,7 +664,7 @@ self: super: {
     dependencies = with self; [ plenary-nvim nui-nvim ];
   });
 
-  noice-nvim = super.noice-nvim.overrideAttrs(old: {
+  noice-nvim = super.noice-nvim.overrideAttrs (old: {
     dependencies = with self; [ nui-nvim nvim-notify ];
   });
 
@@ -823,12 +827,14 @@ self: super: {
     };
 
   sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
-    postPatch = let
-      libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
-    in ''
-      substituteInPlace lua/sqlite/defs.lua \
-        --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
-    '';
+    postPatch =
+      let
+        libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
+      in
+      ''
+        substituteInPlace lua/sqlite/defs.lua \
+          --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
+      '';
   });
 
   ssr = super.ssr-nvim.overrideAttrs (old: {
@@ -850,11 +856,11 @@ self: super: {
   };
 
   stylish-nvim = super.stylish-nvim.overrideAttrs (old: {
-      postPatch = ''
-        substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool
-        substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
-        substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
-      '';
+    postPatch = ''
+      substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool
+      substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
+      substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
+    '';
   });
 
   sved =
@@ -971,7 +977,7 @@ self: super: {
         cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
         cd vim-plugin
       '';
-      meta.maintainers = with lib.maintainers; [enderger];
+      meta.maintainers = with lib.maintainers; [ enderger ];
     };
 
   unicode-vim =
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 3d0c29c518a7..6552349d1e3a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -308,6 +308,7 @@ https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
 https://github.com/rebelot/heirline.nvim/,,
 https://github.com/Yggdroot/hiPairs/,,
+https://git.sr.ht/~soywod/himalaya-vim,,
 https://github.com/mpickering/hlint-refactor-vim/,,
 https://github.com/edluffy/hologram.nvim/,,
 https://github.com/urbit/hoon.vim/,,
@@ -1174,4 +1175,3 @@ https://github.com/ziglang/zig.vim/,,
 https://github.com/mickael-menu/zk-nvim/,HEAD,
 https://github.com/troydm/zoomwintab.vim/,,
 https://github.com/nanotee/zoxide.vim/,,
-https://git.sr.ht/~soywod/himalaya-vim,,

From f645f1ce98ac0ebdb63b1efd194dee21393f00a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Wed, 15 Feb 2023 16:56:39 +0100
Subject: [PATCH 6/8] himalaya: revert formatting

---
 .../editors/vim/plugins/overrides.nix         | 72 +++++++++----------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 575e6cc356f9..9cf5c01468a1 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -580,30 +580,28 @@ self: super: {
     dependencies = with self; [ plenary-nvim ];
   });
 
-  markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old:
-    let
-      # We only need its dependencies `node-modules`.
-      nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {
-        dontNpmInstall = true;
-      });
-    in
-    {
-      patches = [
-        (substituteAll {
-          src = ./markdown-preview-nvim/fix-node-paths.patch;
-          node = "${nodejs}/bin/node";
-        })
-      ];
-      postInstall = ''
-        ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app
-      '';
-
-      nativeBuildInputs = [ nodejs ];
-      doInstallCheck = true;
-      installCheckPhase = ''
-        node $out/app/index.js --version
-      '';
+  markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let
+    # We only need its dependencies `node-modules`.
+    nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {
+      dontNpmInstall = true;
     });
+  in {
+    patches = [
+      (substituteAll {
+        src = ./markdown-preview-nvim/fix-node-paths.patch;
+        node = "${nodejs}/bin/node";
+      })
+    ];
+    postInstall = ''
+      ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app
+    '';
+
+    nativeBuildInputs = [ nodejs ];
+    doInstallCheck = true;
+    installCheckPhase = ''
+      node $out/app/index.js --version
+    '';
+  });
 
   mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: {
     dependencies = with self; [ mason-nvim nvim-lspconfig ];
@@ -664,7 +662,7 @@ self: super: {
     dependencies = with self; [ plenary-nvim nui-nvim ];
   });
 
-  noice-nvim = super.noice-nvim.overrideAttrs (old: {
+  noice-nvim = super.noice-nvim.overrideAttrs(old: {
     dependencies = with self; [ nui-nvim nvim-notify ];
   });
 
@@ -827,14 +825,12 @@ self: super: {
     };
 
   sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
-    postPatch =
-      let
-        libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
-      in
-      ''
-        substituteInPlace lua/sqlite/defs.lua \
-          --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
-      '';
+    postPatch = let
+      libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
+    in ''
+      substituteInPlace lua/sqlite/defs.lua \
+        --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
+    '';
   });
 
   ssr = super.ssr-nvim.overrideAttrs (old: {
@@ -856,11 +852,11 @@ self: super: {
   };
 
   stylish-nvim = super.stylish-nvim.overrideAttrs (old: {
-    postPatch = ''
-      substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool
-      substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
-      substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
-    '';
+      postPatch = ''
+        substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool
+        substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
+        substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
+      '';
   });
 
   sved =
@@ -977,7 +973,7 @@ self: super: {
         cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
         cd vim-plugin
       '';
-      meta.maintainers = with lib.maintainers; [ enderger ];
+      meta.maintainers = with lib.maintainers; [enderger];
     };
 
   unicode-vim =

From 06d21e8659ddb58ee1bcde88610ad7f3a2a7e2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Thu, 16 Feb 2023 14:45:49 +0100
Subject: [PATCH 7/8] himalaya: add args to manage cargo features

---
 .../mailreaders/himalaya/default.nix          | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index cd82c8e1f961..fc31c5efd487 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -9,6 +9,10 @@
 , Security
 , libiconv
 , openssl
+, notmuch
+, withImapBackend ? true
+, withNotmuchBackend ? false
+, withSmtpSender ? true
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -25,28 +29,28 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "sha256-FXfh6T8dNsnD/V/wYSMDWs+ll0d1jg1Dc3cQT39b0ws=";
 
   nativeBuildInputs = [ ]
-    ++ lib.optionals (installManPages || installShellCompletions) [ installShellFiles ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
+    ++ lib.optional (installManPages || installShellCompletions) installShellFiles
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then [
-      Security
-      libiconv
-    ] else [
-      openssl
-    ];
+  buildInputs = [ ]
+    ++ (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
+    ++ lib.optional withNotmuchBackend notmuch;
 
-  # TODO: remove this flag once this issue is fixed:
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ ]
+    ++ lib.optional withImapBackend "imap-backend"
+    ++ lib.optional withNotmuchBackend "notmuch-backend"
+    ++ lib.optional withSmtpSender "smtp-sender";
+
+  # TODO: remove me once this issue is fixed:
   # https://todo.sr.ht/~soywod/pimalaya/36
   cargoTestFlags = [ "--lib" ];
 
   postInstall = lib.optionalString installManPages ''
-    # Install man pages
     mkdir -p $out/man
     $out/bin/himalaya man $out/man
     installManPage $out/man/*
   '' + lib.optionalString installShellCompletions ''
-    # Install shell completions
     installShellCompletion --cmd himalaya \
       --bash <($out/bin/himalaya completion bash) \
       --fish <($out/bin/himalaya completion fish) \

From 69978dcb2ac037329999747b9105b91031b30084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Fri, 17 Feb 2023 14:53:25 +0100
Subject: [PATCH 8/8] remove useless cargo test flags

---
 pkgs/applications/networking/mailreaders/himalaya/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix
index fc31c5efd487..96b5b9bbcac4 100644
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -42,10 +42,6 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optional withNotmuchBackend "notmuch-backend"
     ++ lib.optional withSmtpSender "smtp-sender";
 
-  # TODO: remove me once this issue is fixed:
-  # https://todo.sr.ht/~soywod/pimalaya/36
-  cargoTestFlags = [ "--lib" ];
-
   postInstall = lib.optionalString installManPages ''
     mkdir -p $out/man
     $out/bin/himalaya man $out/man