summaryrefslogtreecommitdiff
path: root/overlays
diff options
context:
space:
mode:
Diffstat (limited to 'overlays')
-rw-r--r--overlays/bonfire/default.nix24
-rw-r--r--overlays/databases/mysql/default.nix11
-rw-r--r--overlays/default.nix5
-rw-r--r--overlays/neomutt/commands.patch87
-rw-r--r--overlays/neomutt/default.nix18
-rw-r--r--overlays/pelican/default.nix3
-rw-r--r--overlays/pelican/pelican.json15
-rw-r--r--overlays/profanity/default.nix20
-rw-r--r--overlays/simp_le/default.nix3
-rw-r--r--overlays/vit/default.nix8
-rw-r--r--overlays/vit/vit.json15
-rw-r--r--overlays/weechat/default.nix4
12 files changed, 28 insertions, 185 deletions
diff --git a/overlays/bonfire/default.nix b/overlays/bonfire/default.nix
new file mode 100644
index 00000000..68bde20f
--- /dev/null
+++ b/overlays/bonfire/default.nix
@@ -0,0 +1,24 @@
1self: super: {
2 bonfire = let
3 click = self.python3Packages.click.overridePythonAttrs(old: rec {
4 version = "6.7";
5 src = self.python3Packages.fetchPypi {
6 pname = "click";
7 inherit version;
8 sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
9 };
10 });
11 in
12 super.bonfire.overridePythonAttrs(old: {
13 version = "0.0.8";
14 src = self.fetchFromGitHub {
15 owner = "blue-yonder";
16 repo = "bonfire";
17 rev = "0a0f18469d484aba6871fa7421bbb2c00ccefcb0";
18 sha256 = "1y2r537ibghhmk6jngw0zwvh1vn2bihqcvji50ffh1j0qc6q3x6x";
19 };
20 postPatch = "";
21 propagatedBuildInputs = self.lib.remove self.python3Packages.click old.propagatedBuildInputs ++ [ click ];
22 meta.broken = false;
23 });
24}
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 797332bb..24bad1b6 100644
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -3,16 +3,5 @@ self: super: rec {
3 mariadbPAM = super.mariadb.overrideAttrs(old: { 3 mariadbPAM = super.mariadb.overrideAttrs(old: {
4 cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; 4 cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
5 buildInputs = old.buildInputs ++ [ self.pam ]; 5 buildInputs = old.buildInputs ++ [ self.pam ];
6 postInstall = old.postInstall + ''
7 # FIXME: hack because mariadb cannot find dialog.so
8 # fixed in 20.03: https://github.com/NixOS/nixpkgs/pull/80768
9 ln -s /nix $out/nix
10 cp "$dev"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$out"/lib/mysql/plugin
11 '';
12 }) // (with super.mariadb; {
13 inherit client;
14 servier = super.mariadb;
15 inherit connector-c;
16 inherit galera;
17 }); 6 });
18} 7}
diff --git a/overlays/default.nix b/overlays/default.nix
index b488fd73..881083dd 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -4,6 +4,7 @@
4 4
5 bitlbee = import ./bitlbee; 5 bitlbee = import ./bitlbee;
6 bitlbee-discord = import ./bitlbee-discord; 6 bitlbee-discord = import ./bitlbee-discord;
7 bonfire = import ./bonfire;
7 bundix = import ./bundix; 8 bundix = import ./bundix;
8 dwm = import ./dwm; 9 dwm = import ./dwm;
9 elinks = import ./elinks; 10 elinks = import ./elinks;
@@ -13,24 +14,20 @@
13 ldapvi = import ./ldapvi; 14 ldapvi = import ./ldapvi;
14 lesspipe = import ./lesspipe; 15 lesspipe = import ./lesspipe;
15 mysql = import ./databases/mysql; 16 mysql = import ./databases/mysql;
16 neomutt = import ./neomutt;
17 nixops = import ./nixops; 17 nixops = import ./nixops;
18 pass = import ./pass; 18 pass = import ./pass;
19 pelican = import ./pelican; 19 pelican = import ./pelican;
20 postgresql = import ./databases/postgresql; 20 postgresql = import ./databases/postgresql;
21 profanity = import ./profanity;
22 s6 = import ./s6; 21 s6 = import ./s6;
23 sc-im = import ./sc-im; 22 sc-im = import ./sc-im;
24 shaarli = import ./shaarli; 23 shaarli = import ./shaarli;
25 slrn = import ./slrn; 24 slrn = import ./slrn;
26 taskwarrior = import ./taskwarrior; 25 taskwarrior = import ./taskwarrior;
27 vcsh = import ./vcsh; 26 vcsh = import ./vcsh;
28 vit = import ./vit;
29 weboob = import ./weboob; 27 weboob = import ./weboob;
30 weechat = import ./weechat; 28 weechat = import ./weechat;
31 ympd = import ./ympd; 29 ympd = import ./ympd;
32 doing = import ./doing; 30 doing = import ./doing;
33 xmr-stak = import ./xmr-stak; 31 xmr-stak = import ./xmr-stak;
34 simp_le = import ./simp_le;
35} 32}
36// import ./python-packages 33// import ./python-packages
diff --git a/overlays/neomutt/commands.patch b/overlays/neomutt/commands.patch
deleted file mode 100644
index 6c910cfb..00000000
--- a/overlays/neomutt/commands.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1commit 763056828abe9716c4dfce754a47d8ecdefb3029
2Author: Ismaël Bouya <ismael.bouya@normalesup.org>
3Date: Mon Feb 10 16:13:33 2020 +0100
4
5 Fix commands that don’t need to have a non-empty mailbox to be valid
6
7 Some commands act on the whole mailbox (tag-pattern, delete-pattern,
8 search), and even though they don’t do anything when the mailbox is
9 empty, there is no reason to fail when it happens. This commit removes
10 the check that the mailbox is non-empty before doing said actions.
11
12diff --git a/index.c b/index.c
13index 0f4b9f99f..0adfc19f1 100644
14--- a/index.c
15+++ b/index.c
16@@ -1642,7 +1642,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
17 case OP_JUMP:
18 {
19 int msg_num = 0;
20- if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
21+ if (!prereq(Context, menu, CHECK_IN_MAILBOX))
22 break;
23 if (isdigit(LastKey))
24 mutt_unget_event(LastKey, 0);
25@@ -1687,7 +1687,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
26
27 case OP_MAIN_DELETE_PATTERN:
28 if (!prereq(Context, menu,
29- CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE | CHECK_READONLY | CHECK_ATTACH))
30+ CHECK_IN_MAILBOX | CHECK_READONLY | CHECK_ATTACH))
31 {
32 break;
33 }
34@@ -1852,12 +1852,17 @@ int mutt_index_menu(struct MuttWindow *dlg)
35 menu->redraw = REDRAW_FULL;
36 break;
37
38- case OP_SEARCH:
39+ // Initiating a search can happen on an empty mailbox, but
40+ // searching for next/previous/... needs to be on a message and
41+ // thus a non-empty mailbox
42 case OP_SEARCH_REVERSE:
43 case OP_SEARCH_NEXT:
44 case OP_SEARCH_OPPOSITE:
45 if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
46 break;
47+ case OP_SEARCH:
48+ if (!prereq(Context, menu, CHECK_IN_MAILBOX))
49+ break;
50 menu->current = mutt_search_command(menu->current, op);
51 if (menu->current == -1)
52 menu->current = menu->oldcurrent;
53@@ -1926,14 +1931,14 @@ int mutt_index_menu(struct MuttWindow *dlg)
54 }
55
56 case OP_MAIN_TAG_PATTERN:
57- if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
58+ if (!prereq(Context, menu, CHECK_IN_MAILBOX))
59 break;
60 mutt_pattern_func(MUTT_TAG, _("Tag messages matching: "));
61 menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
62 break;
63
64 case OP_MAIN_UNDELETE_PATTERN:
65- if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE | CHECK_READONLY))
66+ if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_READONLY))
67 break;
68 /* L10N: CHECK_ACL */
69 /* L10N: Due to the implementation details we do not know whether we
70@@ -1950,7 +1955,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
71 break;
72
73 case OP_MAIN_UNTAG_PATTERN:
74- if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
75+ if (!prereq(Context, menu, CHECK_IN_MAILBOX))
76 break;
77 if (mutt_pattern_func(MUTT_UNTAG, _("Untag messages matching: ")) == 0)
78 menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
79@@ -3189,7 +3194,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
80 }
81
82 case OP_MAIN_COLLAPSE_ALL:
83- if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
84+ if (!prereq(Context, menu, CHECK_IN_MAILBOX))
85 break;
86
87 if ((C_Sort & SORT_MASK) != SORT_THREADS)
diff --git a/overlays/neomutt/default.nix b/overlays/neomutt/default.nix
deleted file mode 100644
index 0b237342..00000000
--- a/overlays/neomutt/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
1self: super: {
2 neomutt = super.neomutt.overrideAttrs (old:
3 rec {
4 name = "neomutt-${version}";
5 version = "20191207";
6 src = self.fetchFromGitHub {
7 owner = "neomutt";
8 repo = "neomutt";
9 rev = version;
10 sha256 = "16xr7wdmjw0i72xbnyyh098wx4cr0m8w2cr1szdi1b14p4kpgr67";
11 };
12 patches = old.patches or [] ++ [ ./commands.patch ];
13 buildInputs = old.buildInputs ++ [ self.gdbm ];
14 configureFlags = old.configureFlags ++ [ "--gdbm" ];
15 doCheck = false;
16 }
17 );
18}
diff --git a/overlays/pelican/default.nix b/overlays/pelican/default.nix
index 5a487aa6..4f8aece9 100644
--- a/overlays/pelican/default.nix
+++ b/overlays/pelican/default.nix
@@ -1,6 +1,7 @@
1self: super: { 1self: super: {
2 pelican = with self.python3Packages; 2 pelican = with self.python3Packages;
3 pelican.overrideAttrs(old: self.mylibs.fetchedGithub ./pelican.json // { 3 pelican.overrideAttrs(old: {
4 propagatedBuildInputs = old.propagatedBuildInputs ++ [ pyyaml markdown ]; 4 propagatedBuildInputs = old.propagatedBuildInputs ++ [ pyyaml markdown ];
5 doInstallCheck = false;
5 }); 6 });
6} 7}
diff --git a/overlays/pelican/pelican.json b/overlays/pelican/pelican.json
deleted file mode 100644
index d8f4425e..00000000
--- a/overlays/pelican/pelican.json
+++ /dev/null
@@ -1,15 +0,0 @@
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
deleted file mode 100644
index 64fae490..00000000
--- a/overlays/profanity/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
1self: 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 version = "0.7.1";
8 pname = "profanity";
9 name = "profanity-0.7.1";
10 src = self.fetchFromGitHub {
11 owner = "profanity-im";
12 repo = "profanity";
13 rev = version;
14 sha256 = "1mcgr86wqyzqx7mqxfkk2jwx6cgnvrky3zi4v1ww0lh6j05wj9gf";
15 };
16 patches = builtins.tail old.patches;
17 buildInputs = old.buildInputs ++ [ self.libsignal-protocol-c self.libgcrypt ];
18 configureFlags = old.configureFlags ++ [ "--enable-plugins" "--enable-omemo" ];
19 });
20}
diff --git a/overlays/simp_le/default.nix b/overlays/simp_le/default.nix
deleted file mode 100644
index 76891eda..00000000
--- a/overlays/simp_le/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
1self: super: {
2 simp_le = self.simp_le_0_17;
3}
diff --git a/overlays/vit/default.nix b/overlays/vit/default.nix
deleted file mode 100644
index 46242840..00000000
--- a/overlays/vit/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
1self: 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
deleted file mode 100644
index d062f685..00000000
--- a/overlays/vit/vit.json
+++ /dev/null
@@ -1,15 +0,0 @@
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/weechat/default.nix b/overlays/weechat/default.nix
index 17faa0ec..e8cc792f 100644
--- a/overlays/weechat/default.nix
+++ b/overlays/weechat/default.nix
@@ -2,9 +2,7 @@ self: super: {
2 weechat = super.weechat.override { 2 weechat = super.weechat.override {
3 configure = { availablePlugins, ... }: { 3 configure = { availablePlugins, ... }: {
4 plugins = with self; with availablePlugins; [ 4 plugins = with self; with availablePlugins; [
5 # Make sure websocket_client is not 0.55.0, it provokes 5 (python.withPackages (ps: with ps; [websocket_client emoji]))
6 # regular crashes
7 (python.withPackages (ps: with ps; assert websocket_client.version == "0.54.0"; [websocket_client emoji]))
8 perl 6 perl
9 ruby 7 ruby
10 ]; 8 ];