diff options
author | Alex Branham <jabranham@users.noreply.github.com> | 2019-04-08 14:13:10 -0500 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2019-04-08 21:13:10 +0200 |
commit | 67c5d04fee100d660c33f7ae8e931b597edb916e (patch) | |
tree | 2a9b0b87a3e47158ccc41588e407be41a02a0474 /pkgs/tools/networking/mu | |
parent | 9527de1cddceb80f53d5376e020dec403405cdc0 (diff) | |
download | nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.tar nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.tar.gz nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.tar.bz2 nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.tar.lz nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.tar.xz nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.tar.zst nixpkgs-67c5d04fee100d660c33f7ae8e931b597edb916e.zip |
mu: 1.0 -> 1.2 (#59130)
Diffstat (limited to 'pkgs/tools/networking/mu')
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/networking/mu/failing_tests.patch | 18 |
2 files changed, 6 insertions, 29 deletions
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index f8c3d754100..75462659699 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,31 +1,26 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe -, xapian, glib, gmime, texinfo , emacs, guile +, xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk24x-gtk3, libsoup, icu , withMug ? false }: stdenv.mkDerivation rec { name = "mu-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = "v${version}"; - sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; + rev = version; + 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 postPatch = '' sed -i -e '/test-utils/d' lib/parser/Makefile.am ''; 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 ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -54,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = http://www.djcbsoftware.nl/code/mu/; + homepage = https://www.djcbsoftware.nl/code/mu/; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; diff --git a/pkgs/tools/networking/mu/failing_tests.patch b/pkgs/tools/networking/mu/failing_tests.patch deleted file mode 100644 index c45834ff208..00000000000 --- a/pkgs/tools/networking/mu/failing_tests.patch +++ /dev/null @@ -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); |