about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-01T10·14+0300
committertazjin <mail@tazj.in>2021-09-01T12·27+0000
commitc38873e2e4cf46664e0644e2deec3e5588469c41 (patch)
treefeb12a3d23c6a3431d8ad39454dfc714b9669a76 /third_party
parent885b6d9bb82539a66b3cc12ef3f04dd699d71294 (diff)
fix(3p/overlays): Use notmuch.el from nixpkgs r/2807
...  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 <sternenseemann@systemli.org>
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/nixpkgs/default.nix2
-rw-r--r--third_party/overlays/tvl.nix4
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 5d2b0fae66e2..44d1bb114028 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -63,9 +63,9 @@ in import nixpkgsSrc {
   overlays = [
     commitsOverlay
     stableOverlay
-    depot.third_party.overlays.tvl
     depot.third_party.overlays.haskell
     depot.third_party.overlays.emacs
+    depot.third_party.overlays.tvl
     depot.third_party.overlays.ecl-static
   ];
 }
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;
     })
   );