public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mu: 1.0 -> 1.2 (#59130)

Browse Source
This commit is contained in:
Alex Branham 2019-04-08 14:13:10 -05:00 committed by xeji
parent 9527de1cdd
commit 67c5d04fee
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/networking/mu/default.nix
View File

@ -1,31 +1,26 @@
{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
, xapian, glib, gmime, texinfo , emacs, guile , xapian, glib, gmime3, texinfo , emacs, guile
, gtk3, webkitgtk24x-gtk3, libsoup, icu , gtk3, webkitgtk24x-gtk3, libsoup, icu
, withMug ? false }: , withMug ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mu-${version}"; name = "mu-${version}";
version = "1.0"; version = "1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djcb"; owner = "djcb";
repo = "mu"; repo = "mu";
rev = "v${version}"; rev = version;
sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz";
}; };
# 0.9.18 and 1.0 have 2 failing tests but previously we had no tests
patches = [
./failing_tests.patch
];
# test-utils coredumps so don't run those # test-utils coredumps so don't run those
postPatch = '' postPatch = ''
sed -i -e '/test-utils/d' lib/parser/Makefile.am sed -i -e '/test-utils/d' lib/parser/Makefile.am
''; '';
buildInputs = [ buildInputs = [
sqlite xapian glib gmime texinfo emacs guile libsoup icu sqlite xapian glib gmime3 texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];
@ -54,7 +49,7 @@ stdenv.mkDerivation rec {
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;
homepage = http://www.djcbsoftware.nl/code/mu/; homepage = https://www.djcbsoftware.nl/code/mu/;
platforms = platforms.mesaPlatforms; platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ antono the-kenny peterhoeg ]; maintainers = with maintainers; [ antono the-kenny peterhoeg ];
}; };

18
pkgs/tools/networking/mu/failing_tests.patch
View File

@ -1,18 +0,0 @@
diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c
index 73cbd3f4..46a0b131 100644
--- a/mu/tests/test-mu-query.c
+++ b/mu/tests/test-mu-query.c
@@ -753,10 +753,10 @@ main (int argc, char *argv[])
g_test_add_func ("/mu-query/test-mu-query-sizes",
test_mu_query_sizes);
- g_test_add_func ("/mu-query/test-mu-query-dates-helsinki",
- test_mu_query_dates_helsinki);
- g_test_add_func ("/mu-query/test-mu-query-dates-sydney",
- test_mu_query_dates_sydney);
+ /* g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", */
+ /* test_mu_query_dates_helsinki); */
+ /* g_test_add_func ("/mu-query/test-mu-query-dates-sydney", */
+ /* test_mu_query_dates_sydney); */
g_test_add_func ("/mu-query/test-mu-query-dates-la",
test_mu_query_dates_la);