about summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-04-24 22:03:30 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2020-04-24 22:03:30 +0200
commitea59fe7aa6d966d9c9d47da39823642f9e7b7074 (patch)
treeef0c7d50f598ac21f66ba697caa222d3d439fa85 /pkgs/applications/networking
parenta3467dfa824de34d56c6305c7b15911fb9fd4f32 (diff)
downloadnixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.tar
nixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.tar.gz
nixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.tar.bz2
nixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.tar.lz
nixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.tar.xz
nixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.tar.zst
nixlib-ea59fe7aa6d966d9c9d47da39823642f9e7b7074.zip
neomutt: 20200417 -> 20200424
https://github.com/neomutt/neomutt/releases/tag/20200424
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/mailreaders/neomutt/default.nix17
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";