From c38873e2e4cf46664e0644e2deec3e5588469c41 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 1 Sep 2021 13:14:37 +0300 Subject: fix(3p/overlays): Use notmuch.el from nixpkgs ... instead of the one from the overlay, which can be out of sync. This requires the TVL overlay to be applied after the Emacs overlay. Change-Id: Idac403ea612e334c14b45759dc216699a506678f Reviewed-on: https://cl.tvl.fyi/c/depot/+/3484 Tested-by: BuildkiteCI Reviewed-by: sterni Reviewed-by: tazjin --- third_party/overlays/tvl.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'third_party/overlays') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index d33f4461687a..fab8c7c0ea3e 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -26,6 +26,10 @@ self: super: { emacsPackagesFor = emacs: ( (super.emacsPackagesFor emacs).overrideScope' (eself: esuper: { tvlPackages = depot.tools.emacs-pkgs // depot.third_party.emacs; + + # Use the notmuch from nixpkgs instead of from the Emacs + # overlay, to avoid versions being out of sync. + notmuch = super.notmuch.emacs; }) ); -- cgit 1.4.1