diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-27 14:34:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 14:34:59 +0200 |
| commit | 98dbff9a65c4d0f67834787398021a636896f204 (patch) | |
| tree | 59d94208f8572a11345c3c8aa8fca979a3099471 /pkgs | |
| parent | bf801d4ce659768a6580b94fdeb18924c65af628 (diff) | |
| parent | ea59fe7aa6d966d9c9d47da39823642f9e7b7074 (diff) | |
Merge pull request #85959 from Ma27/bump-neomutt
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 612af14b87f4..73aef9d17c77 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,29 +1,20 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib -, fetchpatch +, glibcLocales }: stdenv.mkDerivation rec { - version = "20200417"; + version = "20200424"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5"; + sha256 = "055hxlfrpn5a50vnh31faskcdkcjyzzr02gj5x2dizpf7vd67162"; }; - patches = [ - # Remove on next release. Fixes the `change-folder` - # macro (https://github.com/neomutt/neomutt/issues/2268) - (fetchpatch { - url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch"; - sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb @@ -95,8 +86,10 @@ stdenv.mkDerivation rec { (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files + export LC_ALL="en_US.UTF-8" ''; + checkInputs = [ glibcLocales ]; checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; |