diff options
| -rw-r--r-- | third_party/nixpkgs/default.nix | 2 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 4 |
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; }) ); |