diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-09-01T10·07+0300 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-09-01T12·27+0000 |
| commit | 885b6d9bb82539a66b3cc12ef3f04dd699d71294 (patch) | |
| tree | 77a77184340b4a0bdbb9adc972cd5559a7604fed | |
| parent | 0dbad73ff1e10343340da6386f953c446b80dbba (diff) | |
refactor(3p/notmuch): Simplify setup r/2806
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>
| -rw-r--r-- | third_party/notmuch/default.nix | 7 | ||||
| -rw-r--r-- | third_party/overlays/patches/notmuch-dottime.patch (renamed from third_party/notmuch/dottime.patch) | 0 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 5 | ||||
| -rw-r--r-- | users/tazjin/emacs/default.nix | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/third_party/notmuch/default.nix b/third_party/notmuch/default.nix deleted file mode 100644 index 90660837266d..000000000000 --- a/third_party/notmuch/default.nix +++ /dev/null @@ -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 []); -}) diff --git a/third_party/notmuch/dottime.patch b/third_party/overlays/patches/notmuch-dottime.patch index 7a9cfc6cc2a9..7a9cfc6cc2a9 100644 --- a/third_party/notmuch/dottime.patch +++ b/third_party/overlays/patches/notmuch-dottime.patch diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 7c7c8ea06a43..d33f4461687a 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -29,11 +29,10 @@ self: super: { }) ); - # Temporary fix for python3Packages.notmuch - # See https://github.com/NixOS/nixpkgs/pull/132592/ + # dottime support for notmuch notmuch = super.notmuch.overrideAttrs(old: { passthru = old.passthru // { - pythonSourceRoot = "notmuch-${old.version}/bindings/python"; + patches = old.patches ++ [ ./patches/notmuch-dottime.patch ]; }; }); } diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 92451d139a75..79a13ba41933 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -57,7 +57,7 @@ let multiple-cursors nginx-mode nix-mode - notmuch # this comes from pkgs.third_party + notmuch paredit password-store pinentry |