diff options
author | Charlotte Van Petegem <charlotte@vanpetegem.be> | 2024-02-24 15:56:45 +0100 |
---|---|---|
committer | Charlotte Van Petegem <charlotte@vanpetegem.be> | 2024-02-27 10:31:36 +0100 |
commit | 202dd43c67a840fcf460567fcd748341e7ba71bf (patch) | |
tree | e8900ff8d0e729fa1171a847b6fe6e8a364a8e18 /pkgs/tools/networking | |
parent | cde7a8acb2ea022912ab1e0bfed931591e1655bc (diff) | |
download | nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.tar nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.tar.gz nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.tar.bz2 nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.tar.lz nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.tar.xz nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.tar.zst nixlib-202dd43c67a840fcf460567fcd748341e7ba71bf.zip |
mu: 1.10.8 -> 1.12.0
https://github.com/djcb/mu/blob/v1.12.0/NEWS.org
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 6f3f556e2592..46519c730446 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,21 +1,23 @@ { lib , stdenv , fetchFromGitHub +, glibcLocales , meson , ninja , pkg-config +, python3 +, cld2 , coreutils , emacs , glib , gmime3 , texinfo , xapian -, fetchpatch }: stdenv.mkDerivation rec { pname = "mu"; - version = "1.10.8"; + version = "1.12.0"; outputs = [ "out" "mu4e" ]; @@ -23,23 +25,17 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-cDfW0yXA+0fZY5lv4XCHWu+5B0svpMeVMf8ttX/z4Og="; + hash = "sha256-z0sHDZlhsSeIf+ZRCni3j/DbfYrmn6bvYmKpt4PA2i8="; }; - patches = [ - (fetchpatch { - name = "add-mu4e-pkg.el"; - url = "https://github.com/djcb/mu/commit/00f7053d51105eea0c72151f1a8cf0b6d8478e4e.patch"; - hash = "sha256-21c7djmYTcqyyygqByo9vu/GsH8WMYcq8NOAvJsS5AQ="; - }) - ]; - postPatch = '' - # Fix mu4e-builddir (set it to $out) - substituteInPlace mu4e/mu4e-config.el.in \ - --replace "@abs_top_builddir@" "$out" - substituteInPlace lib/utils/mu-test-utils.cc \ - --replace "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace lib/utils/mu-utils-file.cc \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace lib/tests/bench-indexer.cc \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace lib/mu-maildir.cc \ + --replace-fail "/bin/mv" "${coreutils}/bin/mv" + patchShebangs build-aux/date.py ''; postInstall = '' @@ -61,7 +57,7 @@ stdenv.mkDerivation rec { fi ''; - buildInputs = [ emacs glib gmime3 texinfo xapian ]; + buildInputs = [ cld2 emacs glib gmime3 texinfo xapian ]; mesonFlags = [ "-Dguile=disabled" @@ -69,10 +65,13 @@ stdenv.mkDerivation rec { "-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp" ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja python3 glibcLocales ]; doCheck = true; + # Tests need a UTF-8 aware locale configured + env.LANG = "C.UTF-8"; + meta = with lib; { description = "A collection of utilities for indexing and searching Maildirs"; license = licenses.gpl3Plus; |