feat(third_party/notmuch): Display dottime in relative time views

This commit is contained in:
Vincent Ambo 2019-12-27 18:12:32 +01:00
parent 100f451b0a
commit 12973b8a8b
3 changed files with 46 additions and 1 deletions

View file

@ -63,7 +63,6 @@ let
nano
nginx
nix
notmuch
openssh
openssl
parallel
@ -97,7 +96,13 @@ let
in exposed // {
callPackage = nixpkgs.lib.callPackageWith exposed;
# Provide the source code of nixpkgs, but do not provide an imported
# version of it.
nixpkgsSrc = stableSrc;
# Packages to be overridden
originals = {
inherit (nixpkgs) notmuch;
};
}

5
third_party/notmuch/default.nix vendored Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, ... }:
pkgs.third_party.originals.notmuch.overrideAttrs(old: {
patches = [ ./dottime.patch ] ++ (if old ? patches then old.patches else []);
})

35
third_party/notmuch/dottime.patch vendored Normal file
View file

@ -0,0 +1,35 @@
diff --git a/notmuch-time.c b/notmuch-time.c
index 2734b36a..b1ec4bdc 100644
--- a/notmuch-time.c
+++ b/notmuch-time.c
@@ -50,8 +50,8 @@ notmuch_time_relative_date (const void *ctx, time_t then)
time_t delta;
char *result;
- localtime_r (&now, &tm_now);
- localtime_r (&then, &tm_then);
+ gmtime_r (&now, &tm_now);
+ gmtime_r (&then, &tm_then);
result = talloc_zero_size (ctx, RELATIVE_DATE_MAX);
if (result == NULL)
@@ -79,16 +79,16 @@ notmuch_time_relative_date (const void *ctx, time_t then)
delta < DAY)
{
strftime (result, RELATIVE_DATE_MAX,
- "Today %R", &tm_then); /* Today 12:30 */
+ "Today %k·%M", &tm_then); /* Today 12·30 */
return result;
} else if ((tm_now.tm_wday + 7 - tm_then.tm_wday) % 7 == 1) {
strftime (result, RELATIVE_DATE_MAX,
- "Yest. %R", &tm_then); /* Yest. 12:30 */
+ "Yest. %k·%M", &tm_then); /* Yest. 12·30 */
return result;
} else {
if (tm_then.tm_wday != tm_now.tm_wday) {
strftime (result, RELATIVE_DATE_MAX,
- "%a. %R", &tm_then); /* Mon. 12:30 */
+ "%a. %k·%M", &tm_then); /* Mon. 12·30 */
return result;
}
}