diff --git a/common/mu.patch b/common/mu.patch deleted file mode 100644 index 6201669..0000000 --- a/common/mu.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/mu-store.cc b/lib/mu-store.cc -index c67b551c..59eb183c 100644 ---- a/lib/mu-store.cc -+++ b/lib/mu-store.cc -@@ -582,7 +582,7 @@ Store::move_message(Store::Id id, - const auto dup_flags{filter_dup_flags(dup_msg->flags(), *new_flags)}; - /* use the updated new_flags and MoveOptions without DupFlags (so we don't - * recurse) */ -- opts = opts & ~MoveOptions::DupFlags; -+ opts = opts & ~MoveOptions::DupFlags & ~MoveOptions::ChangeName; - if (auto dup_res = priv_->move_message_unlocked( - std::move(*dup_msg), Nothing, dup_flags, opts); !dup_res) - mu_warning("failed to move dup: {}", dup_res.error().what()); --- -2.51.2 diff --git a/common/overlays.nix b/common/overlays.nix index aa711cd..5707a7e 100644 --- a/common/overlays.nix +++ b/common/overlays.nix @@ -13,23 +13,13 @@ inputs: system: }); }) - (final: prev: { - mu = prev.mu.overrideAttrs (old: { - patches = (old.patches or []) ++ [ - ./mu.patch - ]; - }); - }) - (final: prev: { # final.emacs-git, final.emacs-unstable, or final.emacs-igc myEmacs = ((prev.emacsPackagesFor final.emacs-unstable) .emacsWithPackages (epkgs: with epkgs; [ treesit-grammars.with-all-grammars - (mu4e.override { - mu = final.mu; - }) + mu4e ])); })