mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/notmuch): Simplify setup

Browse source 
The backported fix is no longer required and we can just apply the
patch in the overlay, this makes everything a little easier.

Change-Id: I654a1bb002eef5c578b8e576e133a159bde3f850
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3483
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-09-01 13:07:11 +03:00 • committed by tazjin
parent 0dbad73ff1
commit 885b6d9bb8
4 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
third_party/notmuch/default.nix vendored
View file

@ -1,7 +0,0 @@
# Notmuch, but with support for https://dotti.me/
{ pkgs, ... }:
pkgs.notmuch.overrideAttrs(old: {
doCheck = false;
patches = [ ./dottime.patch ] ++ (if old ? patches then old.patches else []);
})

0
third_party/notmuch/dottime.patch → third_party/overlays/patches/notmuch-dottime.patch vendored
View file

5
third_party/overlays/tvl.nix vendored
View file

@ -29,11 +29,10 @@ self: super: {
}) })
); );
# Temporary fix for python3Packages.notmuch # dottime support for notmuch
# See https://github.com/NixOS/nixpkgs/pull/132592/
notmuch = super.notmuch.overrideAttrs(old: { notmuch = super.notmuch.overrideAttrs(old: {
passthru = old.passthru // { passthru = old.passthru // {
pythonSourceRoot = "notmuch-${old.version}/bindings/python"; patches = old.patches ++ [ ./patches/notmuch-dottime.patch ];
}; };
}); });
} }

2
users/tazjin/emacs/default.nix
View file

@ -57,7 +57,7 @@ let
multiple-cursors multiple-cursors
nginx-mode nginx-mode
nix-mode nix-mode
notmuch # this comes from pkgs.third_party notmuch
paredit paredit
password-store password-store
pinentry pinentry