diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 00:10:21 +0000 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 00:10:21 +0000 |
commit | 63c4c4dda49dc69e5812faa7ef8406180998f3ae (patch) | |
tree | 949e3fc6904dd681ed1a7c0cbb1886be1abb7142 /overlays | |
parent | 07898a16e29bf664770efc5423d48f76bd6dbfd7 (diff) |
overlays: removing custom mutt. Updating README
Diffstat (limited to 'overlays')
-rw-r--r-- | overlays/default.nix | 2 | ||||
-rw-r--r-- | overlays/patches/neomutt/1388.patch | 29 | ||||
-rw-r--r-- | overlays/patches/neomutt/default.nix | 13 |
3 files changed, 0 insertions, 44 deletions
diff --git a/overlays/default.nix b/overlays/default.nix index 7681eddb432..da474e91cdf 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,7 +14,5 @@ self: super: { nodemcu-uploader = self.callPackage ./staging/nodemcu-uploader { }; pleroma = self.callPackage ./staging/pleroma { }; - emacs-ergoemacs-mode = self.callPackage ./patches/emacs-ergoemacs-mode { }; htop = self.callPackage ./patches/htop { inherit (super) htop; }; - neomutt = self.callPackages ./patches/neomutt { inherit (super) neomutt; }; } diff --git a/overlays/patches/neomutt/1388.patch b/overlays/patches/neomutt/1388.patch deleted file mode 100644 index 581c4e2b4af..00000000000 --- a/overlays/patches/neomutt/1388.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aaee4ae3272416ad0d66a4984f3398552df13cef Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Sun, 4 Nov 2018 17:01:05 +0000 -Subject: [PATCH] Work around mutt_expando_format buffer overflow - -This doesn't actually fix the overflow, but at least makes it less -likely to be encountered. - -See https://github.com/neomutt/neomutt/issues/1388. ---- - muttlib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/muttlib.c b/muttlib.c -index 431d759b9..1498c5a45 100644 ---- a/muttlib.c -+++ b/muttlib.c -@@ -773,7 +773,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c - FILE *filter = NULL; - char *recycler = NULL; - -- char src2[STRING]; -+ char src2[LONG_STRING]; - mutt_str_strfcpy(src2, src, mutt_str_strlen(src) + 1); - src = src2; - --- -2.19.1 - diff --git a/overlays/patches/neomutt/default.nix b/overlays/patches/neomutt/default.nix deleted file mode 100644 index 3f295a5a574..00000000000 --- a/overlays/patches/neomutt/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -/* LONGER NEOMUTT PARAMETER LISTS PATCH - * - * Because of how my neomutt config handles GPG - * encryption, neomutt needs to be patched to - * allow for a longer argument buffer. - * Luckily someone had already written a patch - * for this, so I didn't have to :) - */ -{ neomutt }: - -neomutt.overrideAttrs ({ patches ? [], ... }: { - patches = patches ++ [ ./1388.patch ]; -}) |