diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-17 18:02:46 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-17 19:35:20 +0200 |
commit | 192485f8fab8bd7dce972ff46aa5d8012d5adc09 (patch) | |
tree | 8e30180ce1ecda8544c28a586886e48ee96ae237 | |
parent | 42f2d370a53de7e4e72e1f8bb1e77300f4547be1 (diff) | |
download | nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.tar nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.tar.gz nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.tar.bz2 nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.tar.lz nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.tar.xz nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.tar.zst nixlib-192485f8fab8bd7dce972ff46aa5d8012d5adc09.zip |
neomutt: 20200320 -> 20200417
https://github.com/neomutt/neomutt/releases/tag/20200417 To fix the tests, I had to copy the recently created `neomutt-test-files`[1] repository into the build-environment. Also applied a patch from master[2] which ensures that the `change-folder` macro actually switches to the specified folder. [1] https://github.com/neomutt/neomutt-test-files [2] https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025
-rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e554e91a39bd..612af14b87f4 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,19 +1,29 @@ { 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 }: stdenv.mkDerivation rec { - version = "20200320"; + version = "20200417"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "06xcl9pr8dna4kqjaqm7ss50gdy185425bwl31i0xs3l11cyjap4"; + sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5"; }; + 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 @@ -75,7 +85,20 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + cp -r ${fetchFromGitHub { + owner = "neomutt"; + repo = "neomutt-test-files"; + rev = "1ee274e9ae1330fb901eb7b8275b3079d7869222"; + sha256 = "0dhilz4rr7616jh8jcvh50a3rr09in43nsv72mm6f3vfklcqincp"; + }} $(pwd)/test-files + (cd test-files && ./setup.sh) + + export NEOMUTT_TEST_DIR=$(pwd)/test-files + ''; + checkTarget = "test"; + postCheck = "unset NEOMUTT_TEST_DIR"; meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; |