Merge pull request #34633 from magnetophon/mu

mu: 0.9.18 -> 1.0
This commit is contained in:
Peter Hoeg 2018-03-26 20:34:53 +08:00 committed by GitHub
commit 81e7c18e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,28 +5,32 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mu-${version}"; name = "mu-${version}";
version = "0.9.18"; version = "1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djcb"; owner = "djcb";
repo = "mu"; repo = "mu";
rev = version; rev = "v${version}";
sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y"; sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc";
}; };
# as of 0.9.18 2 tests are failing but previously we had no tests # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests
patches = [ patches = [
./failing_tests.patch ./failing_tests.patch
]; ];
# pmccabe should be a checkInput instead, but configure looks for it # test-utils coredumps so don't run those
postPatch = ''
sed -i -e '/test-utils/d' lib/parser/Makefile.am
'';
buildInputs = [ buildInputs = [
sqlite xapian glib gmime texinfo emacs guile libsoup icu sqlite xapian glib gmime texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
checkInputs = [ pmccabe ];
doCheck = true; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];
enableParallelBuilding = true;
preBuild = '' preBuild = ''
# Fix mu4e-builddir (set it to $out) # Fix mu4e-builddir (set it to $out)
@ -45,6 +49,8 @@ stdenv.mkDerivation rec {
done done
''; '';
doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A collection of utilties for indexing and searching Maildirs"; description = "A collection of utilties for indexing and searching Maildirs";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;