diff options
author | Florian Klink <flokli@flokli.de> | 2021-11-01 10:30:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 10:30:56 +0100 |
commit | dd451b02181b3bd6ce357c20eaec997e93696dbf (patch) | |
tree | 5f120f37521ca6780a0cbad007f3a83201755a04 /pkgs/applications/networking | |
parent | faebe1d4edce36096487b8fa050f8e6c8fd4a8db (diff) | |
parent | 5e1c94effd0ea9696376dd5c9ab325a2d76514d5 (diff) |
Merge pull request #143641 from Ma27/bump-neomutt
neomutt: 20211022 -> 20211029
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 5eeec874deeb6..6d5ab96b4edc8 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib +, fetchpatch }: stdenv.mkDerivation rec { - version = "20211022"; + version = "20211029"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-gPMbl+g9tU7YmT3uJoJozCdDBb/4eFyVyvHdREK1Ss0="; + sha256 = "sha256-haPDZorAfKuIEMiBCXJRMALAYnurQyjmCSOnj9IsoKk="; }; buildInputs = [ @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m ]; + patches = [ + # Remove on next update, see + # https://github.com/NixOS/nixpkgs/pull/143641#issuecomment-954991746 for context. + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/4242a31313e0b600693215c01047bbda8a6dd25a.patch"; + sha256 = "sha256-fcuNeBkPjqln5QA9VFcfXCQD/VrUoSEMSxQ//Xj+yxY="; + }) + ]; + enableParallelBuilding = true; postPatch = '' |