From 004676ce9c8275598182884c9e5a823a34eaa173 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Sep 2020 00:29:06 +0200 Subject: [PATCH] neomutt: apply two patches for regressions in the sidebar The following patches were pushed to `master` after the release and fix two regressions in the sidebar of NeoMutt: * 9675367 (sidebar: prevent the divider colour bleeding out): a small fix for ANSI colors to not break the layout. * 6078653 (Fix ): fixes invalid conditions in if-statements. Considering their release cycle I figured that it is reasonable to apply those on top of `20200925` for now. --- .../networking/mailreaders/neomutt/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 699d08536fb..96ca3db79f6 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,6 +2,7 @@ , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, elinks, mailcap, runtimeShell, sqlite, zlib , glibcLocales +, fetchpatch }: stdenv.mkDerivation rec { @@ -21,6 +22,18 @@ stdenv.mkDerivation rec { mailcap sqlite ]; + patches = [ + # To be removed on next release. Fixes two bugs in the sidebar behavior. + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/96753674e70edb695c1dc7af73e3317956c1b259.patch"; + sha256 = "0yjmgdfhn8ra7bc3d40c3c29imgpgbhzphjxp6575llh9kw5h53s"; + }) + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/6078653c9233644ca76c24bdb64e49bd443dd714.patch"; + sha256 = "1s1p86bqpc9xq9z5qfh0mxxh6syps8shq0dm7bbkg1bz7qya5phy"; + }) + ]; + nativeBuildInputs = [ docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib elinks ];