pyrox.dev
Merge pull request #232312 from chivay/aerc
aerc: 0.14.0 -> 0.15.2
+11
-8
pkgs/applications/networking/mailreaders/aerc/default.nix
+11
-8
pkgs/applications/networking/mailreaders/aerc/default.nix
···
12
12
13
13
buildGoModule rec {
14
14
pname = "aerc";
15
-
version = "0.14.0";
15
+
version = "0.15.2";
16
16
17
17
src = fetchFromSourcehut {
18
18
owner = "~rjarry";
19
19
repo = "aerc";
20
20
rev = version;
21
-
hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg=";
21
+
hash = "sha256-OQDA4AHDcAdDzpwNSi8rW1FKjfYaFktOwiM0FEHPd70=";
22
22
};
23
23
24
24
proxyVendor = true;
25
-
vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M=";
25
+
vendorHash = "sha256-NWOySC0czNgNOakpxFguZLtmEI7AvjJQKXDE2vFWeZg=";
26
26
27
27
doCheck = false;
28
28
···
32
32
];
33
33
34
34
patches = [
35
-
./runtime-sharedir.patch
35
+
./runtime-libexec.patch
36
36
];
37
37
38
38
postPatch = ''
39
39
substituteAllInPlace config/aerc.conf
40
40
substituteAllInPlace config/config.go
41
41
substituteAllInPlace doc/aerc-config.5.scd
42
+
43
+
# Prevent buildGoModule from trying to build this
44
+
rm contrib/linters.go
42
45
'';
43
46
44
47
makeFlags = [ "PREFIX=${placeholder "out"}" ];
45
48
46
49
pythonPath = [
47
-
python3.pkgs.colorama
50
+
python3.pkgs.vobject
48
51
];
49
52
50
53
buildInputs = [ python3 notmuch gawk ];
···
60
63
postFixup = ''
61
64
wrapProgram $out/bin/aerc \
62
65
--prefix PATH ":" "${lib.makeBinPath [ ncurses ]}"
63
-
wrapProgram $out/share/aerc/filters/html \
66
+
wrapProgram $out/libexec/aerc/filters/html \
64
67
--prefix PATH ":" ${lib.makeBinPath [ w3m dante ]}
65
-
wrapProgram $out/share/aerc/filters/html-unsafe \
68
+
wrapProgram $out/libexec/aerc/filters/html-unsafe \
66
69
--prefix PATH ":" ${lib.makeBinPath [ w3m dante ]}
67
-
patchShebangs $out/share/aerc/filters
70
+
patchShebangs $out/libexec/aerc/filters
68
71
'';
69
72
70
73
meta = with lib; {
+87
pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch
+87
pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch
···
1
+
diff --git a/config/aerc.conf b/config/aerc.conf
2
+
index 7d33b43..4315f0e 100644
3
+
--- a/config/aerc.conf
4
+
+++ b/config/aerc.conf
5
+
@@ -202,8 +202,7 @@
6
+
#
7
+
# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
8
+
# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
9
+
-# /usr/local/share/aerc/stylesets
10
+
-# /usr/share/aerc/stylesets
11
+
+# @out@/share/aerc/stylesets
12
+
#
13
+
#stylesets-dirs=
14
+
15
+
@@ -547,8 +546,7 @@ message/rfc822=colorize
16
+
#
17
+
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
18
+
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
19
+
-# /usr/local/share/aerc/templates
20
+
-# /usr/share/aerc/templates
21
+
+# @out@/share/aerc/templates
22
+
#
23
+
#template-dirs=
24
+
25
+
diff --git a/config/config.go b/config/config.go
26
+
index d70bcfe..c19e59a 100644
27
+
--- a/config/config.go
28
+
+++ b/config/config.go
29
+
@@ -54,10 +54,8 @@ func buildDefaultDirs() []string {
30
+
}
31
+
32
+
// Add fixed fallback locations
33
+
- defaultDirs = append(defaultDirs, "/usr/local/libexec/aerc")
34
+
- defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
35
+
- defaultDirs = append(defaultDirs, "/usr/libexec/aerc")
36
+
- defaultDirs = append(defaultDirs, "/usr/share/aerc")
37
+
+ defaultDirs = append(defaultDirs, "@out@/libexec/aerc")
38
+
+ defaultDirs = append(defaultDirs, "@out@/share/aerc")
39
+
40
+
return defaultDirs
41
+
}
42
+
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
43
+
index 9e1f8a3..694abbc 100644
44
+
--- a/doc/aerc-config.5.scd
45
+
+++ b/doc/aerc-config.5.scd
46
+
@@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.
47
+
```
48
+
${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
49
+
${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
50
+
- /usr/local/share/aerc/stylesets
51
+
- /usr/share/aerc/stylesets
52
+
+ @out@/share/aerc/stylesets
53
+
```
54
+
55
+
*styleset-name* = _<string>_
56
+
@@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.
57
+
```
58
+
${XDG_CONFIG_HOME:-~/.config}/aerc/templates
59
+
${XDG_DATA_HOME:-~/.local/share}/aerc/templates
60
+
- /usr/local/share/aerc/templates
61
+
- /usr/share/aerc/templates
62
+
+ @out@/share/aerc/templates
63
+
```
64
+
65
+
*new-message* = _<template_name>_
66
+
diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd
67
+
index ae9bc6d..5f42b14 100644
68
+
--- a/doc/aerc-templates.7.scd
69
+
+++ b/doc/aerc-templates.7.scd
70
+
@@ -319,7 +319,7 @@ aerc provides the following additional functions:
71
+
Execute external command, provide the second argument to its stdin.
72
+
73
+
```
74
+
- {{exec `/usr/libexec/aerc/filters/html` .OriginalText}}
75
+
+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText}}
76
+
```
77
+
78
+
*.Local*
79
+
@@ -425,7 +425,7 @@ aerc provides the following additional functions:
80
+
81
+
```
82
+
{{if eq .OriginalMIMEType "text/html"}}
83
+
- {{exec `/usr/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}}
84
+
+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}}
85
+
{{else}}
86
+
{{wrap 72 .OriginalText | trimSignature | quote}}
87
+
{{end}}