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] 9e7537cadd
This commit is contained in:
parent
42f2d370a5
commit
192485f8fa
@ -1,19 +1,29 @@
|
|||||||
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
|
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
|
||||||
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
|
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
|
||||||
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
|
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "20200320";
|
version = "20200417";
|
||||||
pname = "neomutt";
|
pname = "neomutt";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neomutt";
|
owner = "neomutt";
|
||||||
repo = "neomutt";
|
repo = "neomutt";
|
||||||
rev = version;
|
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 = [
|
buildInputs = [
|
||||||
cyrus_sasl gss gpgme kerberos libidn ncurses
|
cyrus_sasl gss gpgme kerberos libidn ncurses
|
||||||
notmuch openssl perl lmdb
|
notmuch openssl perl lmdb
|
||||||
@ -75,7 +85,20 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
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";
|
checkTarget = "test";
|
||||||
|
postCheck = "unset NEOMUTT_TEST_DIR";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A small but very powerful text-based mail client";
|
description = "A small but very powerful text-based mail client";
|
||||||
|
Loading…
Reference in New Issue
Block a user