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 01/20] 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 59296fbbc36a51892dbe03f5663ee92de20dd494 Mon Sep 17 00:00:00 2001
From: Vladimir Pouzanov <farcaller@gmail.com>
Date: Thu, 19 Jan 2023 16:28:54 +0000
Subject: [PATCH 02/20] Assert that fish configuration is enabled if any user
 has fish as their shell.

Suggested-By: matthiasbeyer
---
 nixos/modules/config/users-groups.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 76092e738ebd..a727f8510f87 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -693,6 +693,16 @@ in {
               users.groups.${user.name} = {};
             '';
           }
+          {
+            assertion = (user.shell == pkgs.fish) -> (config.programs.fish.enable == true);
+            message = ''
+              users.users.${user.name}.shell is set to fish, but
+              programs.fish.enable is not true. This will cause the fish shell
+              to lack the basic nix directories in its PATH and might make
+              logging in as that user impossible. You can fix it with:
+              programs.fish.enable = true;
+            '';
+          }
         ]
     ));
 

From 631b7f6f882b05c2a5c35f088bfdd99ebbcbf1f3 Mon Sep 17 00:00:00 2001
From: Vladimir Pouzanov <farcaller@gmail.com>
Date: Thu, 19 Jan 2023 16:59:11 +0000
Subject: [PATCH 03/20] Add support for the other shells

---
 nixos/modules/config/users-groups.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index a727f8510f87..91d6c9026d8c 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -693,17 +693,20 @@ in {
               users.groups.${user.name} = {};
             '';
           }
-          {
-            assertion = (user.shell == pkgs.fish) -> (config.programs.fish.enable == true);
+        ] ++ (map (shell: {
+            assertion = (user.shell == pkgs.${shell}) -> (config.programs.${shell}.enable == true);
             message = ''
-              users.users.${user.name}.shell is set to fish, but
-              programs.fish.enable is not true. This will cause the fish shell
-              to lack the basic nix directories in its PATH and might make
+              users.users.${user.name}.shell is set to ${shell}, but
+              programs.${shell}.enable is not true. This will cause the ${shell}
+              shell to lack the basic nix directories in its PATH and might make
               logging in as that user impossible. You can fix it with:
-              programs.fish.enable = true;
+              programs.${shell}.enable = true;
             '';
-          }
-        ]
+          }) [
+          "fish"
+          "xonsh"
+          "zsh"
+        ])
     ));
 
     warnings =

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 04/20] 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 05/20] 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 06/20] 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 07/20] 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 08/20] 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 09/20] 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 10/20] 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

From 2a1b1ea1d6b5645f85b0fbef8294c52f79e45776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 19 Feb 2023 04:28:30 +0100
Subject: [PATCH 11/20] noisetorch: 0.12.0 -> 0.12.2, remove
 meta.{insecure,knownVulnerabilities}

those only affected the prebuild binaries which we are not using
---
 pkgs/applications/audio/noisetorch/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index c305b9917617..51b565bc3e74 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -2,21 +2,21 @@
 
 buildGoModule rec {
   pname = "NoiseTorch";
-  version = "0.12.0";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "noisetorch";
     repo = "NoiseTorch";
     rev = "v${version}";
-    sha256 = "sha256-A6cX1ck47/ZIn9cnV/Ow4CxVFfOX5J0K0Q+B70jCFdQ=";
     fetchSubmodules = true;
+    sha256 = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
   };
 
   vendorHash = null;
 
   doCheck = false;
 
-  ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nix" ];
+  ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.distribution=nixpkgs" ];
 
   subPackages = [ "." ];
 
@@ -32,9 +32,6 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    insecure = true;
-    knownVulnerabilities =
-      lib.optional (lib.versionOlder version "0.12") "https://github.com/noisetorch/NoiseTorch/releases/tag/v0.12.0";
     description = "Virtual microphone device with noise supression for PulseAudio";
     homepage = "https://github.com/noisetorch/NoiseTorch";
     license = licenses.gpl3Plus;

From e5a1b49f5f504ee6f2813a6e13586dfe7af8b4d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Mar 2023 10:05:37 +0100
Subject: [PATCH 12/20] python310Packages.bluetooth-adapters: 0.15.2 -> 0.15.3

Changelog: https://github.com/bluetooth-devices/bluetooth-adapters/blob/v0.15.3/CHANGELOG.md
---
 .../development/python-modules/bluetooth-adapters/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix
index bb3519eeab73..d5382b931261 100644
--- a/pkgs/development/python-modules/bluetooth-adapters/default.nix
+++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-adapters";
-  version = "0.15.2";
+  version = "0.15.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-vwcOMg10XRT6wNkQQF6qkbWSG2rsUXaDSEiIevii1eA=";
+    hash = "sha256-sh5wOx/4J1AEzR5zrd77v7Cbq6Mt9vOjCSREKHRN4aQ=";
   };
 
   postPatch = ''

From 34d5d6445eb42feec12cfd0a05de8dc65b2390d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 20 Mar 2023 15:43:16 +0100
Subject: [PATCH 13/20] python310Packages.zeroconf: 0.47.3 -> 0.47.4

Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.47.4
---
 pkgs/development/python-modules/zeroconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index c5521f0f0d6b..671dc47084ca 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.47.3";
+  version = "0.47.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "jstasiak";
     repo = "python-zeroconf";
     rev = "refs/tags/${version}";
-    hash = "sha256-hpbJ7kcyM8S2xAaVjuPzHXl/gcAYk3CX7NHxsbZXQ10=";
+    hash = "sha256-ig0AMGNshe0bm7ZOkqV62hEcLeYlHBayMLk2fJQ8Uyo=";
   };
 
   nativeBuildInputs = [

From dca17f84e97ee83ad53613a499d1e15b3420d542 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Mar 2023 18:49:15 +0100
Subject: [PATCH 14/20] python310Packages.reolink-aio: 0.5.5 -> 0.5.6

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.6
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 3aebea0e2e21..ce0492180414 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.5.5";
+  version = "0.5.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-Nu0U/I0dDwJ2wAk2Vj6nMt0/0galfTPurj8MqAUzSks=";
+    hash = "sha256-tkmaWD+OfJfI3QjvdQivmqi8kv5Yuk2UxLlYw8hVocY=";
   };
 
   postPatch = ''

From 9fd3ad259e094639068d13f20e1a68b2b8189356 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 23 Mar 2023 13:12:16 +0100
Subject: [PATCH 15/20] python3Packages.gpaw: unbreak build

---
 pkgs/development/python-modules/gpaw/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix
index 5f6bc3f71dc3..0af589decc48 100644
--- a/pkgs/development/python-modules/gpaw/default.nix
+++ b/pkgs/development/python-modules/gpaw/default.nix
@@ -13,6 +13,7 @@
 , ase
 , numpy
 , scipy
+, pyyaml
 }:
 
 assert lib.asserts.assertMsg (!blas.isILP64)
@@ -85,7 +86,7 @@ in buildPythonPackage rec {
 
   buildInputs = [ blas scalapack libxc libvdwxc ];
 
-  propagatedBuildInputs = [ ase scipy numpy mpi ];
+  propagatedBuildInputs = [ ase scipy numpy mpi pyyaml ];
 
   patches = [ ./SetupPath.patch ];
 

From ed418fdcf23e8195e3a9d3207f6c4817b746dcdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Mar 2023 23:10:44 +0000
Subject: [PATCH 16/20] kubedog: 0.9.9 -> 0.9.11

---
 pkgs/applications/networking/cluster/kubedog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix
index d3c60e7e6c7e..cf858efef97a 100644
--- a/pkgs/applications/networking/cluster/kubedog/default.nix
+++ b/pkgs/applications/networking/cluster/kubedog/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubedog";
-  version = "0.9.9";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "kubedog";
     rev = "v${version}";
-    hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0=";
+    hash = "sha256-yHyCmUjxvMzeHpG5OqC3nAjWaiHErTXrbmS+/0Y4A7E=";
   };
 
-  vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo=";
+  vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k=";
 
   subPackages = [ "cmd/kubedog" ];
 

From 56d1485452cf7b3eeab36fdb00ae15947b46322b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= <batuhan.apaydin@trendyol.com>
Date: Fri, 24 Mar 2023 11:10:23 +0300
Subject: [PATCH 17/20] buildkit: 0.11.4 -> 0.11.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>
---
 pkgs/development/tools/buildkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
index 1455dc38e66f..27d352811ec0 100644
--- a/pkgs/development/tools/buildkit/default.nix
+++ b/pkgs/development/tools/buildkit/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.11.4";
+  version = "0.11.5";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-/9gP8ciHeFKjO0VAKXDor19Wm6wULLVlFYbHUYWFpWY=";
+    hash = "sha256-bQqdHSmouZm89sV2GjBrEwYTdTYKttVBfXcm2fN09NI=";
   };
 
   vendorHash = null;

From 477de8d913e6e9b10ba1bb8c405002cada95e832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 24 Mar 2023 09:12:22 +0100
Subject: [PATCH 18/20] olive-editor: don't use the alias openimageio2

Otherwise evaluation won't work with allowAliases = false;
---
 pkgs/applications/video/olive-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index 5a24066bf4b8..6d5f4546ff50 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -9,7 +9,7 @@
 , CoreFoundation
 , cmake
 , wrapQtAppsHook
-, openimageio2
+, openimageio
 , openexr_3
 , portaudio
 , imath
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
     ffmpeg-full
     frei0r
     opencolorio
-    openimageio2
+    openimageio
     imath
     openexr_3
     portaudio

From 2c4c61b6cd789785842845ed8c0bfc6e35deedcc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 23 Mar 2023 15:00:22 +0100
Subject: [PATCH 19/20] python3Packages.pnglatex: init at 1.1

---
 .../python-modules/pnglatex/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/pnglatex/default.nix

diff --git a/pkgs/development/python-modules/pnglatex/default.nix b/pkgs/development/python-modules/pnglatex/default.nix
new file mode 100644
index 000000000000..579eb523d10c
--- /dev/null
+++ b/pkgs/development/python-modules/pnglatex/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, poppler_utils, netpbm }:
+
+buildPythonPackage rec {
+
+  pname = "pnglatex";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-CZUGDUkmttO0BzFYbGFSNMPkWzFC/BW4NmAeOwz4Y9M=";
+  };
+
+  propagatedBuildInputs = [
+    poppler_utils
+    netpbm
+  ];
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/MaT1g3R/pnglatex";
+    description = "a small program that converts LaTeX snippets to png";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f712b02172fa..9c2fa3be3147 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32167,6 +32167,8 @@ with pkgs;
 
   pluto = callPackage ../applications/networking/cluster/pluto { };
 
+  pnglatex = with python3Packages; toPythonApplication pnglatex;
+
   polybar = callPackage ../applications/misc/polybar { };
 
   polybarFull = callPackage ../applications/misc/polybar {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e7f2e055eed..7ed831a95adf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7552,6 +7552,8 @@ self: super: with self; {
 
   pmw = callPackage ../development/python-modules/pmw { };
 
+  pnglatex = callPackage ../development/python-modules/pnglatex { };
+
   pocket = callPackage ../development/python-modules/pocket { };
 
   podcastparser = callPackage ../development/python-modules/podcastparser { };

From 6cd5fdf84ed95e34301506c8daa7de28065e93b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Mar 2023 09:48:44 +0000
Subject: [PATCH 20/20] v2ray-geoip: 202303160048 -> 202303230043

---
 pkgs/data/misc/v2ray-geoip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index 37d936fc1861..7de6ba8aa25e 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "v2ray-geoip";
-  version = "202303160048";
+  version = "202303230043";
 
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "geoip";
-    rev = "ca1a04c113293b00434d9d60e24aee17e660f4a6";
-    sha256 = "sha256-YhFYrVN6ZQQeuM8ZCeFRmID/NTsI75oe4c51lOfb18s=";
+    rev = "163f6f7caad67d43b51a9c342a72e34feeccb4d0";
+    sha256 = "sha256-hwKRwCu/LHbjqzgpwG8YcTX4C+eEkonCDqVq36FIprQ=";
   };
 
   installPhase = ''