tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
wikiman: 2.13.2 -> 2.14.1
pluie.me
9 months ago
8b3268ba
69ea4392
verified
This commit was signed with the committer's
known signature
.
pluie.me
SSH Key Fingerprint:
SHA256:YtI1D7vlcZ4obaiJ4tQihtswcMhHKdfYZuc4whOX2y8=
+9
-9
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
wi
wikiman
fix-paths.patch
package.nix
+7
-7
pkgs/by-name/wi/wikiman/fix-paths.patch
···
1
1
diff --git a/wikiman.sh b/wikiman.sh
2
2
-
index 89a436e..adc6510 100755
2
2
+
index 994c0b7..49bfc4b 100755
3
3
--- a/wikiman.sh
4
4
+++ b/wikiman.sh
5
5
-
@@ -46,38 +46,7 @@ if printenv WIKIMAN_TUI_PREVIEW >/dev/null; then
5
5
+
@@ -50,38 +50,7 @@ if printenv WIKIMAN_TUI_PREVIEW >/dev/null; then
6
6
fi
7
7
8
8
init() {
···
22
22
- *)
23
23
- case "$(dirname "$(command -v wikiman)")" in
24
24
- "$HOME/bin"|"$HOME/.local/bin")
25
25
-
- echo 'warning: unsupported installation path, using fallback for user install' 1>&2;
25
25
+
- >&2 echo 'warning: unsupported installation path, using fallback for user install' ;
26
26
- conf_sys_usr="$HOME/.local/share";
27
27
- conf_sys_etc="${XDG_CONFIG_HOME:-"$HOME/.config"}/wikiman";;
28
28
- '/bin'|'/sbin'|'/usr/bin'|'/usr/sbin')
29
29
-
- echo 'warning: unsupported installation path, using fallback for Linux' 1>&2;
29
29
+
- >&2 echo 'warning: unsupported installation path, using fallback for Linux' ;
30
30
- conf_sys_usr='/usr';
31
31
- conf_sys_etc='/etc';;
32
32
- '/usr/local/bin'|'/usr/local/sbin')
33
33
-
- echo 'warning: unsupported installation path, using fallback for BSD' 1>&2;
33
33
+
- >&2 echo 'warning: unsupported installation path, using fallback for BSD' ;
34
34
- conf_sys_usr='/usr/local';
35
35
- conf_sys_etc='/usr/local/etc';;
36
36
- *)
37
37
-
- echo 'error: unsupported installation path - failed to establish fallback' 1>&2;
37
37
+
- >&2 echo 'error: unsupported installation path - failed to establish fallback' ;
38
38
- exit 5;;
39
39
- esac;;
40
40
- esac
41
41
-
+ conf_sys_etc="/etc/xdg/wikiman/wikiman.conf"
41
41
+
+ conf_sys_etc="/etc"
42
42
43
43
export conf_sys_usr
44
44
export conf_sys_etc
+2
-2
pkgs/by-name/wi/wikiman/package.nix
···
15
15
}:
16
16
stdenvNoCC.mkDerivation (finalAttrs: {
17
17
pname = "wikiman";
18
18
-
version = "2.13.2";
18
18
+
version = "2.14.1";
19
19
20
20
src = fetchFromGitHub {
21
21
owner = "filiparag";
22
22
repo = "wikiman";
23
23
tag = finalAttrs.version;
24
24
-
hash = "sha256-gk/9PVIRw9OQrdCSS+LcniXDYNcHUQUxZ2XGQCwpHaI=";
24
24
+
hash = "sha256-EvYMUHKFJhSFyoW85EEzI7q5OMGGe9c+A2JlkAoxt3o=";
25
25
};
26
26
27
27
patches = [ ./fix-paths.patch ];