diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-26 13:52:30 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-26 13:57:04 +0200 |
commit | 676e68e3394eeb07a02745d1cf191db9fee9e610 (patch) | |
tree | 973c57072eb9b784adab83fab8748d05a7ffc9c3 /overlays | |
parent | 98de2045a749b25d031b174c940096b4f5406b9d (diff) | |
download | Nix-676e68e3394eeb07a02745d1cf191db9fee9e610.tar.gz Nix-676e68e3394eeb07a02745d1cf191db9fee9e610.tar.zst Nix-676e68e3394eeb07a02745d1cf191db9fee9e610.zip |
Use overlays for package overrides
Diffstat (limited to 'overlays')
-rw-r--r-- | overlays/default.nix | 20 | ||||
-rw-r--r-- | overlays/dwm/default.nix | 7 | ||||
-rw-r--r-- | overlays/dwm/dwm_config.h | 98 | ||||
-rw-r--r-- | overlays/elinks/default.nix | 14 | ||||
-rw-r--r-- | overlays/elinks/elinks.json | 15 | ||||
-rw-r--r-- | overlays/goaccess/default.nix | 13 | ||||
-rw-r--r-- | overlays/ldapvi/default.nix | 3 | ||||
-rw-r--r-- | overlays/ldapvi/ldapvi.json | 14 | ||||
-rw-r--r-- | overlays/lesspipe/default.nix | 5 | ||||
-rw-r--r-- | overlays/neomutt/default.nix | 8 | ||||
-rw-r--r-- | overlays/nixops/default.nix | 7 | ||||
-rw-r--r-- | overlays/pass/default.nix | 8 | ||||
-rw-r--r-- | overlays/pass/pass-fix-pass-init.patch | 42 | ||||
-rw-r--r-- | overlays/pass/pass.json | 14 | ||||
-rw-r--r-- | overlays/pelican/default.nix | 6 | ||||
-rw-r--r-- | overlays/pelican/pelican.json | 15 | ||||
-rw-r--r-- | overlays/profanity/default.nix | 9 | ||||
-rw-r--r-- | overlays/sc-im/default.nix | 9 | ||||
-rw-r--r-- | overlays/slrn/default.nix | 11 | ||||
-rw-r--r-- | overlays/taskwarrior/default.nix | 13 | ||||
-rw-r--r-- | overlays/vit/default.nix | 8 | ||||
-rw-r--r-- | overlays/vit/vit.json | 15 | ||||
-rw-r--r-- | overlays/weboob/default.nix | 15 | ||||
-rw-r--r-- | overlays/weechat/default.nix | 14 |
24 files changed, 383 insertions, 0 deletions
diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..a2d9927 --- /dev/null +++ b/overlays/default.nix | |||
@@ -0,0 +1,20 @@ | |||
1 | { | ||
2 | mylibs = self: super: { mylibs = import ../libs.nix { nixpkgs = self; }; }; | ||
3 | |||
4 | dwm = import ./dwm; | ||
5 | elinks = import ./elinks; | ||
6 | goaccess = import ./goaccess; | ||
7 | ldapvi = import ./ldapvi; | ||
8 | lesspipe = import ./lesspipe; | ||
9 | neomutt = import ./neomutt; | ||
10 | nixops = import ./nixops; | ||
11 | pass = import ./pass; | ||
12 | pelican = import ./pelican; | ||
13 | profanity = import ./profanity; | ||
14 | sc-im = import ./sc-im; | ||
15 | slrn = import ./slrn; | ||
16 | taskwarrior = import ./taskwarrior; | ||
17 | vit = import ./vit; | ||
18 | weboob = import ./weboob; | ||
19 | weechat = import ./weechat; | ||
20 | } | ||
diff --git a/overlays/dwm/default.nix b/overlays/dwm/default.nix new file mode 100644 index 0000000..96ed3ff --- /dev/null +++ b/overlays/dwm/default.nix | |||
@@ -0,0 +1,7 @@ | |||
1 | self: super: { | ||
2 | dwm = super.dwm.overrideAttrs(old: rec { | ||
3 | postPatch = '' | ||
4 | cp ${./dwm_config.h} ./config.h | ||
5 | ''; | ||
6 | }); | ||
7 | } | ||
diff --git a/overlays/dwm/dwm_config.h b/overlays/dwm/dwm_config.h new file mode 100644 index 0000000..b1587e8 --- /dev/null +++ b/overlays/dwm/dwm_config.h | |||
@@ -0,0 +1,98 @@ | |||
1 | /* See LICENSE file for copyright and license details. */ | ||
2 | |||
3 | /* appearance */ | ||
4 | static const unsigned int borderpx = 1; /* border pixel of windows */ | ||
5 | static const unsigned int snap = 32; /* snap pixel */ | ||
6 | static const int showbar = 1; /* 0 means no bar */ | ||
7 | static const int topbar = 1; /* 0 means bottom bar */ | ||
8 | static const char *fonts[] = { "monospace:size=10" }; | ||
9 | static const char dmenufont[] = "monospace:size=10"; | ||
10 | static const char col_gray1[] = "#222222"; | ||
11 | static const char col_gray2[] = "#444444"; | ||
12 | static const char col_gray3[] = "#bbbbbb"; | ||
13 | static const char col_gray4[] = "#eeeeee"; | ||
14 | static const char col_cyan[] = "#005577"; | ||
15 | static const char *colors[][3] = { | ||
16 | /* fg bg border */ | ||
17 | [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, | ||
18 | [SchemeSel] = { col_gray4, col_cyan, col_cyan }, | ||
19 | }; | ||
20 | |||
21 | /* tagging */ | ||
22 | static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; | ||
23 | |||
24 | static const Rule rules[] = { | ||
25 | /* xprop(1): | ||
26 | * WM_CLASS(STRING) = instance, class | ||
27 | * WM_NAME(STRING) = title | ||
28 | */ | ||
29 | /* class instance title tags mask isfloating monitor */ | ||
30 | { "Nextcloud", NULL, NULL, 9 << 8, 0, -1 }, | ||
31 | }; | ||
32 | |||
33 | /* layout(s) */ | ||
34 | static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ | ||
35 | static const int nmaster = 1; /* number of clients in master area */ | ||
36 | static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ | ||
37 | |||
38 | static const Layout layouts[] = { | ||
39 | /* symbol arrange function */ | ||
40 | { "[M]", monocle }, /* first entry is default */ | ||
41 | { "[]=", tile }, | ||
42 | { "><>", NULL }, /* no layout function means floating behavior */ | ||
43 | }; | ||
44 | |||
45 | /* key definitions */ | ||
46 | #define MODKEY Mod1Mask | ||
47 | #define TAGKEYS(KEY,TAG) \ | ||
48 | { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ | ||
49 | { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ | ||
50 | { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ | ||
51 | { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, | ||
52 | |||
53 | /* helper for spawning shell commands in the pre dwm-5.0 fashion */ | ||
54 | #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } | ||
55 | |||
56 | /* commands */ | ||
57 | static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ | ||
58 | static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; | ||
59 | static const char *termcmd[] = { "st", NULL }; | ||
60 | |||
61 | static Key keys[] = { | ||
62 | /* modifier key function argument */ | ||
63 | { MODKEY, XK_p, spawn, {.v = dmenucmd } }, | ||
64 | { MODKEY, XK_t, spawn, {.v = termcmd } }, | ||
65 | { MODKEY, XK_Tab, view, {0} }, | ||
66 | { MODKEY|ShiftMask, XK_c, killclient, {0} }, | ||
67 | { MODKEY, XK_j, focusstack, {.i = +1 } }, | ||
68 | { MODKEY, XK_k, focusstack, {.i = -1 } }, | ||
69 | { MODKEY, XK_Return, zoom, {0} }, | ||
70 | TAGKEYS( XK_1, 0) | ||
71 | TAGKEYS( XK_2, 1) | ||
72 | TAGKEYS( XK_3, 2) | ||
73 | TAGKEYS( XK_4, 3) | ||
74 | TAGKEYS( XK_5, 4) | ||
75 | TAGKEYS( XK_6, 5) | ||
76 | TAGKEYS( XK_7, 6) | ||
77 | TAGKEYS( XK_8, 7) | ||
78 | TAGKEYS( XK_9, 8) | ||
79 | { MODKEY|ShiftMask, XK_q, quit, {0} }, | ||
80 | }; | ||
81 | |||
82 | /* button definitions */ | ||
83 | /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ | ||
84 | static Button buttons[] = { | ||
85 | /* click event mask button function argument */ | ||
86 | { ClkLtSymbol, 0, Button1, setlayout, {0} }, | ||
87 | { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, | ||
88 | { ClkWinTitle, 0, Button2, zoom, {0} }, | ||
89 | { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, | ||
90 | { ClkClientWin, MODKEY, Button1, movemouse, {0} }, | ||
91 | { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, | ||
92 | { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, | ||
93 | { ClkTagBar, 0, Button1, view, {0} }, | ||
94 | { ClkTagBar, 0, Button3, toggleview, {0} }, | ||
95 | { ClkTagBar, MODKEY, Button1, tag, {0} }, | ||
96 | { ClkTagBar, MODKEY, Button3, toggletag, {0} }, | ||
97 | }; | ||
98 | |||
diff --git a/overlays/elinks/default.nix b/overlays/elinks/default.nix new file mode 100644 index 0000000..1744dc0 --- /dev/null +++ b/overlays/elinks/default.nix | |||
@@ -0,0 +1,14 @@ | |||
1 | self: super: { | ||
2 | elinks = super.elinks.overrideAttrs (old: | ||
3 | self.mylibs.fetchedGithub ./elinks.json // rec { | ||
4 | preConfigure = ''sh autogen.sh''; | ||
5 | buildInputs = old.buildInputs ++ (with self; [ gettext automake autoconf ]); | ||
6 | configureFlags = [ | ||
7 | "--disable-smb" "--without-x" "--enable-cgi" | ||
8 | "--enable-leds" "--enable-256-colors" | ||
9 | "--enable-html-highlight" "--with-zlib" | ||
10 | ]; | ||
11 | patches = []; | ||
12 | } | ||
13 | ); | ||
14 | } | ||
diff --git a/overlays/elinks/elinks.json b/overlays/elinks/elinks.json new file mode 100644 index 0000000..ea13b1f --- /dev/null +++ b/overlays/elinks/elinks.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "f86be65-master", | ||
3 | "meta": { | ||
4 | "name": "elinks", | ||
5 | "url": "https://github.com/nabetaro/elinks", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "nabetaro", | ||
10 | "repo": "elinks", | ||
11 | "rev": "f86be659718c0cd0a67f88b42f07044c23d0d028", | ||
12 | "sha256": "1jxb7xgawcjkb3gw4gqyw26g02709wwdbhyczfckh3l4njxhy14m", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/overlays/goaccess/default.nix b/overlays/goaccess/default.nix new file mode 100644 index 0000000..12b28f3 --- /dev/null +++ b/overlays/goaccess/default.nix | |||
@@ -0,0 +1,13 @@ | |||
1 | self: super: { | ||
2 | goaccess = super.goaccess.overrideAttrs(old: rec { | ||
3 | name = "goaccess-${version}"; | ||
4 | version = "1.3"; | ||
5 | src = self.fetchurl { | ||
6 | url = "https://tar.goaccess.io/${name}.tar.gz"; | ||
7 | sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; | ||
8 | }; | ||
9 | configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; | ||
10 | buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ]; | ||
11 | }); | ||
12 | |||
13 | } | ||
diff --git a/overlays/ldapvi/default.nix b/overlays/ldapvi/default.nix new file mode 100644 index 0000000..030e676 --- /dev/null +++ b/overlays/ldapvi/default.nix | |||
@@ -0,0 +1,3 @@ | |||
1 | self: super: { | ||
2 | ldapvi = super.ldapvi.overrideAttrs (old: self.mylibs.fetchedGit ./ldapvi.json); | ||
3 | } | ||
diff --git a/overlays/ldapvi/ldapvi.json b/overlays/ldapvi/ldapvi.json new file mode 100644 index 0000000..ceaff71 --- /dev/null +++ b/overlays/ldapvi/ldapvi.json | |||
@@ -0,0 +1,14 @@ | |||
1 | { | ||
2 | "tag": "f1d42ba-master", | ||
3 | "meta": { | ||
4 | "name": "ldapvi", | ||
5 | "url": "http://www.lichteblau.com/git/ldapvi.git", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "git": { | ||
9 | "url": "http://www.lichteblau.com/git/ldapvi.git", | ||
10 | "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40", | ||
11 | "sha256": "0c2h4b1spp9z6a16gy9azf0wyxq397yy7001x1zlvc7c60q11wry", | ||
12 | "fetchSubmodules": true | ||
13 | } | ||
14 | } | ||
diff --git a/overlays/lesspipe/default.nix b/overlays/lesspipe/default.nix new file mode 100644 index 0000000..e53feae --- /dev/null +++ b/overlays/lesspipe/default.nix | |||
@@ -0,0 +1,5 @@ | |||
1 | self: super: { | ||
2 | lesspipe = super.lesspipe.overrideAttrs(old: { | ||
3 | configureFlags = (old.configureFlags or []) ++ [ "--yes" ]; | ||
4 | }); | ||
5 | } | ||
diff --git a/overlays/neomutt/default.nix b/overlays/neomutt/default.nix new file mode 100644 index 0000000..c8578c9 --- /dev/null +++ b/overlays/neomutt/default.nix | |||
@@ -0,0 +1,8 @@ | |||
1 | self: super: { | ||
2 | neomutt = super.neomutt.overrideAttrs (old: | ||
3 | { | ||
4 | buildInputs = old.buildInputs ++ [ self.gdbm ]; | ||
5 | configureFlags = old.configureFlags ++ [ "--gdbm" ]; | ||
6 | } | ||
7 | ); | ||
8 | } | ||
diff --git a/overlays/nixops/default.nix b/overlays/nixops/default.nix new file mode 100644 index 0000000..eb29ecd --- /dev/null +++ b/overlays/nixops/default.nix | |||
@@ -0,0 +1,7 @@ | |||
1 | self: super: { | ||
2 | nixops = super.nixops.overrideAttrs (old: { | ||
3 | preConfigure = (old.preConfigure or "") + '' | ||
4 | sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py | ||
5 | ''; | ||
6 | }); | ||
7 | } | ||
diff --git a/overlays/pass/default.nix b/overlays/pass/default.nix new file mode 100644 index 0000000..df42cf1 --- /dev/null +++ b/overlays/pass/default.nix | |||
@@ -0,0 +1,8 @@ | |||
1 | self: super: { | ||
2 | pass = (super.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: | ||
3 | self.mylibs.fetchedGit ./pass.json // { | ||
4 | patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; | ||
5 | } | ||
6 | ); | ||
7 | |||
8 | } | ||
diff --git a/overlays/pass/pass-fix-pass-init.patch b/overlays/pass/pass-fix-pass-init.patch new file mode 100644 index 0000000..10a76c1 --- /dev/null +++ b/overlays/pass/pass-fix-pass-init.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 33e8f1cd0065639a948d7b5ba3f93d43bdf7f3be Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org> | ||
3 | Date: Sun, 11 Nov 2018 19:47:33 +0100 | ||
4 | Subject: [PATCH] Fix pass init for some gpg keys | ||
5 | |||
6 | This fixes the pass init for gpg keys which have their main key as | ||
7 | encryption key. This may happen for instance with RSA keys and specific | ||
8 | configuration. | ||
9 | --- | ||
10 | src/password-store.sh | 2 +- | ||
11 | tests/t0300-reencryption.sh | 2 +- | ||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/src/password-store.sh b/src/password-store.sh | ||
15 | index d89d455..44d122e 100755 | ||
16 | --- a/src/password-store.sh | ||
17 | +++ b/src/password-store.sh | ||
18 | @@ -124,7 +124,7 @@ reencrypt_path() { | ||
19 | IFS=";" eval 'GPG_RECIPIENTS+=( $group )' # http://unix.stackexchange.com/a/92190 | ||
20 | unset "GPG_RECIPIENTS[$index]" | ||
21 | done | ||
22 | - gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/^sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)" | ||
23 | + gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/^[ps]ub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)" | ||
24 | fi | ||
25 | current_keys="$(LC_ALL=C $GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$passfile" 2>&1 | sed -n 's/^gpg: public key is \([A-F0-9]\+\)$/\1/p' | LC_ALL=C sort -u)" | ||
26 | |||
27 | diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh | ||
28 | index 3c88987..57d873f 100755 | ||
29 | --- a/tests/t0300-reencryption.sh | ||
30 | +++ b/tests/t0300-reencryption.sh | ||
31 | @@ -7,7 +7,7 @@ cd "$(dirname "$0")" | ||
32 | INITIAL_PASSWORD="will this password live? a big question indeed..." | ||
33 | |||
34 | canonicalize_gpg_keys() { | ||
35 | - $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u | ||
36 | + $GPG --list-keys --with-colons "$@" | sed -n 's/[ps]ub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u | ||
37 | } | ||
38 | gpg_keys_from_encrypted_file() { | ||
39 | $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | grep "public key is" | cut -d ' ' -f 5 | LC_ALL=C sort -u | ||
40 | -- | ||
41 | 2.19.1 | ||
42 | |||
diff --git a/overlays/pass/pass.json b/overlays/pass/pass.json new file mode 100644 index 0000000..a4638c1 --- /dev/null +++ b/overlays/pass/pass.json | |||
@@ -0,0 +1,14 @@ | |||
1 | { | ||
2 | "tag": "d29a389-master", | ||
3 | "meta": { | ||
4 | "name": "password-store", | ||
5 | "url": "https://git.zx2c4.com/password-store/", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "git": { | ||
9 | "url": "https://git.zx2c4.com/password-store/", | ||
10 | "rev": "d29a389a40524c684595f51bb937f66958bc14ea", | ||
11 | "sha256": "17g43i0if9nggcq6005iyxxy9my8s15ihc2nzwjgqzhy3svh5xvn", | ||
12 | "fetchSubmodules": true | ||
13 | } | ||
14 | } | ||
diff --git a/overlays/pelican/default.nix b/overlays/pelican/default.nix new file mode 100644 index 0000000..5f60b8f --- /dev/null +++ b/overlays/pelican/default.nix | |||
@@ -0,0 +1,6 @@ | |||
1 | self: super: { | ||
2 | pelican = with self.python3Packages; | ||
3 | pelican.overrideAttrs(old: self.mylibs.fetchedGithub ./pelican.json // { | ||
4 | propagatedBuildInputs = old.propagatedBuildInputs ++ [ pyyaml ]; | ||
5 | }); | ||
6 | } | ||
diff --git a/overlays/pelican/pelican.json b/overlays/pelican/pelican.json new file mode 100644 index 0000000..d8f4425 --- /dev/null +++ b/overlays/pelican/pelican.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "4.0.1", | ||
3 | "meta": { | ||
4 | "name": "pelican", | ||
5 | "url": "https://github.com/getpelican/pelican", | ||
6 | "branch": "refs/tags/4.0.1" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "getpelican", | ||
10 | "repo": "pelican", | ||
11 | "rev": "24d6efa9fda4ad45649ddf88c1c596193d589bf8", | ||
12 | "sha256": "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/overlays/profanity/default.nix b/overlays/profanity/default.nix new file mode 100644 index 0000000..33861f1 --- /dev/null +++ b/overlays/profanity/default.nix | |||
@@ -0,0 +1,9 @@ | |||
1 | self: super: { | ||
2 | profanity = (super.profanity.override { | ||
3 | notifySupport = true; | ||
4 | inherit (self) libnotify gpgme gdk_pixbuf; | ||
5 | python = self.python3; | ||
6 | }).overrideAttrs (old: rec { | ||
7 | configureFlags = old.configureFlags ++ [ "--enable-plugins" ]; | ||
8 | }); | ||
9 | } | ||
diff --git a/overlays/sc-im/default.nix b/overlays/sc-im/default.nix new file mode 100644 index 0000000..f728655 --- /dev/null +++ b/overlays/sc-im/default.nix | |||
@@ -0,0 +1,9 @@ | |||
1 | self: super: { | ||
2 | sc-im = super.sc-im.overrideAttrs (old: { | ||
3 | buildPhase = '' | ||
4 | cd src | ||
5 | sed -i Makefile -e 's@\...name.info@.local/state/$(name)info@' | ||
6 | cd .. | ||
7 | '' + old.buildPhase; | ||
8 | }); | ||
9 | } | ||
diff --git a/overlays/slrn/default.nix b/overlays/slrn/default.nix new file mode 100644 index 0000000..6caef55 --- /dev/null +++ b/overlays/slrn/default.nix | |||
@@ -0,0 +1,11 @@ | |||
1 | self: super: { | ||
2 | slrn = super.slrn.overrideAttrs (old: rec { | ||
3 | version = "1.0.3a"; | ||
4 | name = "slrn-${version}"; | ||
5 | src = self.fetchurl { | ||
6 | url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2"; | ||
7 | sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v"; | ||
8 | }; | ||
9 | configureFlags = old.configureFlags ++ [ "--with-slrnpull" ]; | ||
10 | }); | ||
11 | } | ||
diff --git a/overlays/taskwarrior/default.nix b/overlays/taskwarrior/default.nix new file mode 100644 index 0000000..64ea690 --- /dev/null +++ b/overlays/taskwarrior/default.nix | |||
@@ -0,0 +1,13 @@ | |||
1 | self: super: | ||
2 | { | ||
3 | taskwarrior = super.taskwarrior.overrideAttrs (old: { | ||
4 | postInstall = ''${old.postInstall} | ||
5 | mkdir -p "$out/share/vim/vimfiles/ftdetect" | ||
6 | mkdir -p "$out/share/vim/vimfiles/syntax" | ||
7 | ln -s "../../../../share/doc/task/scripts/vim/ftdetect/task.vim" "$out/share/vim/vimfiles/ftdetect/" | ||
8 | ln -s "../../../../share/doc/task/scripts/vim/syntax/taskrc.vim" "$out/share/vim/vimfiles/syntax/" | ||
9 | ln -s "../../../../share/doc/task/scripts/vim/syntax/taskdata.vim" "$out/share/vim/vimfiles/syntax/" | ||
10 | ln -s "../../../../share/doc/task/scripts/vim/syntax/taskedit.vim" "$out/share/vim/vimfiles/syntax/" | ||
11 | ''; | ||
12 | }); | ||
13 | } | ||
diff --git a/overlays/vit/default.nix b/overlays/vit/default.nix new file mode 100644 index 0000000..4624284 --- /dev/null +++ b/overlays/vit/default.nix | |||
@@ -0,0 +1,8 @@ | |||
1 | self: super: | ||
2 | { | ||
3 | vit = (super.vit.override { inherit (self) taskwarrior; }).overrideAttrs (old: | ||
4 | self.mylibs.fetchedGithub ./vit.json // { | ||
5 | buildInputs = old.buildInputs ++ (with self.perlPackages; [ TryTiny TextCharWidth ]); | ||
6 | } | ||
7 | ); | ||
8 | } | ||
diff --git a/overlays/vit/vit.json b/overlays/vit/vit.json new file mode 100644 index 0000000..d062f68 --- /dev/null +++ b/overlays/vit/vit.json | |||
@@ -0,0 +1,15 @@ | |||
1 | { | ||
2 | "tag": "dbacada-1.3", | ||
3 | "meta": { | ||
4 | "name": "vit", | ||
5 | "url": "https://github.com/scottkosty/vit", | ||
6 | "branch": "1.3" | ||
7 | }, | ||
8 | "github": { | ||
9 | "owner": "scottkosty", | ||
10 | "repo": "vit", | ||
11 | "rev": "dbacada5867b238fdf35dbf00a3ca0daf7703038", | ||
12 | "sha256": "1wlk62cv6dc0dqv8265xcx2l7ydzg40xf6l4qbrf6h5156ncc90l", | ||
13 | "fetchSubmodules": true | ||
14 | } | ||
15 | } | ||
diff --git a/overlays/weboob/default.nix b/overlays/weboob/default.nix new file mode 100644 index 0000000..d0a15a7 --- /dev/null +++ b/overlays/weboob/default.nix | |||
@@ -0,0 +1,15 @@ | |||
1 | self: super: { | ||
2 | weboob = (self.pythonPackages.weboob.overridePythonAttrs { | ||
3 | setupPyBuildFlags = [ "--no-qt" "--xdg" ]; | ||
4 | }).overrideAttrs (old: rec { | ||
5 | version = "1.5"; | ||
6 | src = self.fetchurl { | ||
7 | url = "https://git.weboob.org/weboob/weboob/-/archive/${version}/${old.pname}-${version}.tar.gz"; | ||
8 | sha256 = "0l6q5nm5g0zn6gmf809059kddrbds27wgygxsfkqja9blks5vq7z"; | ||
9 | }; | ||
10 | postInstall = ''${old.postInstall or ""} | ||
11 | mkdir -p $out/share/bash-completion/completions/ | ||
12 | cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob | ||
13 | ''; | ||
14 | }); | ||
15 | } | ||
diff --git a/overlays/weechat/default.nix b/overlays/weechat/default.nix new file mode 100644 index 0000000..07c6d89 --- /dev/null +++ b/overlays/weechat/default.nix | |||
@@ -0,0 +1,14 @@ | |||
1 | self: super: { | ||
2 | weechat = super.weechat.override { | ||
3 | configure = { availablePlugins, ... }: { | ||
4 | plugins = with self; with availablePlugins; [ | ||
5 | # Make sure websocket_client is not 0.55.0, it provokes | ||
6 | # regular crashes | ||
7 | (python.withPackages (ps: with ps; [websocket_client emoji])) | ||
8 | perl | ||
9 | ruby | ||
10 | ]; | ||
11 | }; | ||
12 | }; | ||
13 | |||
14 | } | ||