Upgrade to nixos-unstable

12 files changed, 28 insertions, 185 deletions

diff --git a/overlays/bonfire/default.nix b/overlays/bonfire/default.nix
new file mode 100644
index 0000000..68bde20
--- /dev/null
+++ b/overlays/bonfire/default.nix
@@ -0,0 +1,24 @@
+self: super: {
+  bonfire = let
+    click = self.python3Packages.click.overridePythonAttrs(old: rec {
+      version = "6.7";
+      src = self.python3Packages.fetchPypi {
+        pname = "click";
+        inherit version;
+        sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
+      };
+    });
+  in
+    super.bonfire.overridePythonAttrs(old: {
+      version = "0.0.8";
+      src = self.fetchFromGitHub {
+        owner = "blue-yonder";
+        repo = "bonfire";
+        rev = "0a0f18469d484aba6871fa7421bbb2c00ccefcb0";
+        sha256 = "1y2r537ibghhmk6jngw0zwvh1vn2bihqcvji50ffh1j0qc6q3x6x";
+      };
+      postPatch = "";
+      propagatedBuildInputs = self.lib.remove self.python3Packages.click old.propagatedBuildInputs ++ [ click ];
+      meta.broken = false;
+    });
+}
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 797332b..24bad1b 100644
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -3,16 +3,5 @@ self: super: rec {
   mariadbPAM = super.mariadb.overrideAttrs(old: {
     cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
     buildInputs = old.buildInputs ++ [ self.pam ];
-    postInstall = old.postInstall + ''
-      # FIXME: hack because mariadb cannot find dialog.so
-      # fixed in 20.03: https://github.com/NixOS/nixpkgs/pull/80768
-      ln -s /nix $out/nix
-      cp "$dev"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$out"/lib/mysql/plugin
-      '';
-  }) // (with super.mariadb; {
-    inherit client;
-    servier = super.mariadb;
-    inherit connector-c;
-    inherit galera;
   });
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index b488fd7..881083d 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -4,6 +4,7 @@
 
   bitlbee = import ./bitlbee;
   bitlbee-discord = import ./bitlbee-discord;
+  bonfire = import ./bonfire;
   bundix = import ./bundix;
   dwm = import ./dwm;
   elinks = import ./elinks;
@@ -13,24 +14,20 @@
   ldapvi = import ./ldapvi;
   lesspipe = import ./lesspipe;
   mysql = import ./databases/mysql;
-  neomutt = import ./neomutt;
   nixops = import ./nixops;
   pass = import ./pass;
   pelican = import ./pelican;
   postgresql = import ./databases/postgresql;
-  profanity = import ./profanity;
   s6 = import ./s6;
   sc-im = import ./sc-im;
   shaarli = import ./shaarli;
   slrn = import ./slrn;
   taskwarrior = import ./taskwarrior;
   vcsh = import ./vcsh;
-  vit = import ./vit;
   weboob = import ./weboob;
   weechat = import ./weechat;
   ympd = import ./ympd;
   doing = import ./doing;
   xmr-stak = import ./xmr-stak;
-  simp_le = import ./simp_le;
 }
 // import ./python-packages
diff --git a/overlays/neomutt/commands.patch b/overlays/neomutt/commands.patch
deleted file mode 100644
index 6c910cf..0000000
--- a/overlays/neomutt/commands.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 763056828abe9716c4dfce754a47d8ecdefb3029
-Author: Ismaël Bouya <ismael.bouya@normalesup.org>
-Date:   Mon Feb 10 16:13:33 2020 +0100
-
-    Fix commands that don’t need to have a non-empty mailbox to be valid
-    
-    Some commands act on the whole mailbox (tag-pattern, delete-pattern,
-    search), and even though they don’t do anything when the mailbox is
-    empty, there is no reason to fail when it happens. This commit removes
-    the check that the mailbox is non-empty before doing said actions.
-
-diff --git a/index.c b/index.c
-index 0f4b9f99f..0adfc19f1 100644
---- a/index.c
-+++ b/index.c
-@@ -1642,7 +1642,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
-       case OP_JUMP:
-       {
-         int msg_num = 0;
--        if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
-+        if (!prereq(Context, menu, CHECK_IN_MAILBOX))
-           break;
-         if (isdigit(LastKey))
-           mutt_unget_event(LastKey, 0);
-@@ -1687,7 +1687,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
- 
-       case OP_MAIN_DELETE_PATTERN:
-         if (!prereq(Context, menu,
--                    CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE | CHECK_READONLY | CHECK_ATTACH))
-+                    CHECK_IN_MAILBOX | CHECK_READONLY | CHECK_ATTACH))
-         {
-           break;
-         }
-@@ -1852,12 +1852,17 @@ int mutt_index_menu(struct MuttWindow *dlg)
-         menu->redraw = REDRAW_FULL;
-         break;
- 
--      case OP_SEARCH:
-+      // Initiating a search can happen on an empty mailbox, but
-+      // searching for next/previous/... needs to be on a message and
-+      // thus a non-empty mailbox
-       case OP_SEARCH_REVERSE:
-       case OP_SEARCH_NEXT:
-       case OP_SEARCH_OPPOSITE:
-         if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
-           break;
-+      case OP_SEARCH:
-+        if (!prereq(Context, menu, CHECK_IN_MAILBOX))
-+          break;
-         menu->current = mutt_search_command(menu->current, op);
-         if (menu->current == -1)
-           menu->current = menu->oldcurrent;
-@@ -1926,14 +1931,14 @@ int mutt_index_menu(struct MuttWindow *dlg)
-       }
- 
-       case OP_MAIN_TAG_PATTERN:
--        if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
-+        if (!prereq(Context, menu, CHECK_IN_MAILBOX))
-           break;
-         mutt_pattern_func(MUTT_TAG, _("Tag messages matching: "));
-         menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
-         break;
- 
-       case OP_MAIN_UNDELETE_PATTERN:
--        if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE | CHECK_READONLY))
-+        if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_READONLY))
-           break;
-         /* L10N: CHECK_ACL */
-         /* L10N: Due to the implementation details we do not know whether we
-@@ -1950,7 +1955,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
-         break;
- 
-       case OP_MAIN_UNTAG_PATTERN:
--        if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
-+        if (!prereq(Context, menu, CHECK_IN_MAILBOX))
-           break;
-         if (mutt_pattern_func(MUTT_UNTAG, _("Untag messages matching: ")) == 0)
-           menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
-@@ -3189,7 +3194,7 @@ int mutt_index_menu(struct MuttWindow *dlg)
-       }
- 
-       case OP_MAIN_COLLAPSE_ALL:
--        if (!prereq(Context, menu, CHECK_IN_MAILBOX | CHECK_MSGCOUNT | CHECK_VISIBLE))
-+        if (!prereq(Context, menu, CHECK_IN_MAILBOX))
-           break;
- 
-         if ((C_Sort & SORT_MASK) != SORT_THREADS)
diff --git a/overlays/neomutt/default.nix b/overlays/neomutt/default.nix
deleted file mode 100644
index 0b23734..0000000
--- a/overlays/neomutt/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-self: super: {
-  neomutt = super.neomutt.overrideAttrs (old:
-    rec {
-      name = "neomutt-${version}";
-      version = "20191207";
-      src = self.fetchFromGitHub {
-        owner = "neomutt";
-        repo = "neomutt";
-        rev = version;
-        sha256 = "16xr7wdmjw0i72xbnyyh098wx4cr0m8w2cr1szdi1b14p4kpgr67";
-      };
-      patches = old.patches or [] ++ [ ./commands.patch ];
-      buildInputs = old.buildInputs ++ [ self.gdbm ];
-      configureFlags = old.configureFlags ++ [ "--gdbm" ];
-      doCheck = false;
-    }
-  );
-}
diff --git a/overlays/pelican/default.nix b/overlays/pelican/default.nix
index 5a487aa..4f8aece 100644
--- a/overlays/pelican/default.nix
+++ b/overlays/pelican/default.nix
@@ -1,6 +1,7 @@
 self: super: {
   pelican = with self.python3Packages;
-    pelican.overrideAttrs(old: self.mylibs.fetchedGithub ./pelican.json // {
+    pelican.overrideAttrs(old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ pyyaml markdown ];
+      doInstallCheck = false;
     });
 }
diff --git a/overlays/pelican/pelican.json b/overlays/pelican/pelican.json
deleted file mode 100644
index d8f4425..0000000
--- a/overlays/pelican/pelican.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "4.0.1",
-  "meta": {
-    "name": "pelican",
-    "url": "https://github.com/getpelican/pelican",
-    "branch": "refs/tags/4.0.1"
-  },
-  "github": {
-    "owner": "getpelican",
-    "repo": "pelican",
-    "rev": "24d6efa9fda4ad45649ddf88c1c596193d589bf8",
-    "sha256": "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl",
-    "fetchSubmodules": true
-  }
-}
diff --git a/overlays/profanity/default.nix b/overlays/profanity/default.nix
deleted file mode 100644
index 64fae49..0000000
--- a/overlays/profanity/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-self: super: {
-  profanity = (super.profanity.override {
-    notifySupport = true;
-    inherit (self) libnotify gpgme gdk_pixbuf;
-    python = self.python3;
-  }).overrideAttrs (old: rec {
-    version = "0.7.1";
-    pname = "profanity";
-    name = "profanity-0.7.1";
-    src = self.fetchFromGitHub {
-      owner = "profanity-im";
-      repo = "profanity";
-      rev = version;
-      sha256 = "1mcgr86wqyzqx7mqxfkk2jwx6cgnvrky3zi4v1ww0lh6j05wj9gf";
-    };
-    patches = builtins.tail old.patches;
-    buildInputs = old.buildInputs ++ [ self.libsignal-protocol-c self.libgcrypt ];
-    configureFlags = old.configureFlags ++ [ "--enable-plugins" "--enable-omemo" ];
-  });
-}
diff --git a/overlays/simp_le/default.nix b/overlays/simp_le/default.nix
deleted file mode 100644
index 76891ed..0000000
--- a/overlays/simp_le/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-self: super: {
-  simp_le = self.simp_le_0_17;
-}
diff --git a/overlays/vit/default.nix b/overlays/vit/default.nix
deleted file mode 100644
index 4624284..0000000
--- a/overlays/vit/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-self: super:
-{
-  vit = (super.vit.override { inherit (self) taskwarrior; }).overrideAttrs (old:
-    self.mylibs.fetchedGithub ./vit.json // {
-      buildInputs = old.buildInputs ++ (with self.perlPackages; [ TryTiny TextCharWidth ]);
-    }
-  );
-}
diff --git a/overlays/vit/vit.json b/overlays/vit/vit.json
deleted file mode 100644
index d062f68..0000000
--- a/overlays/vit/vit.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "dbacada-1.3",
-  "meta": {
-    "name": "vit",
-    "url": "https://github.com/scottkosty/vit",
-    "branch": "1.3"
-  },
-  "github": {
-    "owner": "scottkosty",
-    "repo": "vit",
-    "rev": "dbacada5867b238fdf35dbf00a3ca0daf7703038",
-    "sha256": "1wlk62cv6dc0dqv8265xcx2l7ydzg40xf6l4qbrf6h5156ncc90l",
-    "fetchSubmodules": true
-  }
-}
diff --git a/overlays/weechat/default.nix b/overlays/weechat/default.nix
index 17faa0e..e8cc792 100644
--- a/overlays/weechat/default.nix
+++ b/overlays/weechat/default.nix
@@ -2,9 +2,7 @@ self: super: {
   weechat = super.weechat.override {
     configure = { availablePlugins, ... }: {
       plugins = with self; with availablePlugins; [
-          # Make sure websocket_client is not 0.55.0, it provokes
-          # regular crashes
-         (python.withPackages (ps: with ps; assert websocket_client.version == "0.54.0"; [websocket_client emoji]))
+         (python.withPackages (ps: with ps; [websocket_client emoji]))
          perl
          ruby
         ];