From 4e561767d1f80d770c8a18b50d6788a0a9509ad5 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Mon, 4 May 2020 12:58:14 +0300
Subject: [PATCH] Update nheko

---
 flake.lock           | 35 +++++++++++++++++++++++++++--------
 flake.nix            | 10 ++++++++--
 modules/packages.nix |  7 +++++++
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9fbfebe..ab1492c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -116,18 +116,18 @@
     "mtxclient": {
       "flake": false,
       "info": {
-        "lastModified": 1578915159,
-        "narHash": "sha256-cwQT5j4ClrHCfMXF6g8RXS4WCMkg+rpfdjpH3SZQBY4="
+        "lastModified": 1582462474,
+        "narHash": "sha256-YKsewl0836v4ZWYDVh6m8vwmn3B4mfo2eK+VtNikVJU="
       },
       "locked": {
         "owner": "nheko-reborn",
         "repo": "mtxclient",
-        "rev": "84c6778cc367bca79755e73e77b2cc69950375b2",
+        "rev": "7fc1d357afaabb134cb6d9c593f94915973d31fa",
         "type": "github"
       },
       "original": {
         "owner": "nheko-reborn",
-        "ref": "84c6778cc367bca79755e73e77b2cc69950375b2",
+        "ref": "0.3.0-dev",
         "repo": "mtxclient",
         "type": "github"
       }
@@ -135,18 +135,18 @@
     "nheko": {
       "flake": false,
       "info": {
-        "lastModified": 1579642615,
-        "narHash": "sha256-kdfoWPVJp1KkyYHX0FlLCQydi2x3qarKYxJx9vmoLuU="
+        "lastModified": 1583199044,
+        "narHash": "sha256-/ZBsWmIO0+bNLZfCvO/BHr5qpOvUvf/lAfvErmppGYI="
       },
       "locked": {
         "owner": "nheko-reborn",
         "repo": "nheko",
-        "rev": "1943d1c74d5253ec9d2b7ee38f69d791d28e84c1",
+        "rev": "6f248e75421f3742fedd3b5ea3d4d907f885267e",
         "type": "github"
       },
       "original": {
         "owner": "nheko-reborn",
-        "ref": "1943d1c74d5253ec9d2b7ee38f69d791d28e84c1",
+        "ref": "0.7.0-dev",
         "repo": "nheko",
         "type": "github"
       }
@@ -322,6 +322,7 @@
         "nixpkgs-old": "nixpkgs-old",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
+        "tweeny": "tweeny",
         "weechat-notify-send": "weechat-notify-send",
         "weechat-scripts": "weechat-scripts",
         "yt-utilities": "yt-utilities"
@@ -346,6 +347,24 @@
         "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver"
       }
     },
+    "tweeny": {
+      "flake": false,
+      "info": {
+        "lastModified": 1582937217,
+        "narHash": "sha256-9rSIa3t+WBzqtydStZf1pNozR8vq1dCcIlWo9E7xa2M="
+      },
+      "locked": {
+        "owner": "mobius3",
+        "repo": "tweeny",
+        "rev": "7c10995cb5f019cf8991941e1ae69e055b8eec3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mobius3",
+        "repo": "tweeny",
+        "type": "github"
+      }
+    },
     "weechat-notify-send": {
       "flake": false,
       "info": {
diff --git a/flake.nix b/flake.nix
index 0f04930..39258dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,14 +40,20 @@
       type = "github";
       owner = "nheko-reborn";
       repo = "mtxclient";
-      ref = "84c6778cc367bca79755e73e77b2cc69950375b2";
+      ref = "0.3.0-dev";
+      flake = false;
+    };
+    tweeny = {
+      type = "github";
+      owner = "mobius3";
+      repo = "tweeny";
       flake = false;
     };
     nheko = {
       type = "github";
       owner = "nheko-reborn";
       repo = "nheko";
-      ref = "1943d1c74d5253ec9d2b7ee38f69d791d28e84c1";
+      ref = "0.7.0-dev";
       flake = false;
     };
     nixpkgs-old = {
diff --git a/modules/packages.nix b/modules/packages.nix
index 274173c..922422a 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -47,6 +47,12 @@ in {
           src = inputs.mtxclient;
         });
 
+        tweeny = self.stdenv.mkDerivation {
+          name = "tweeny";
+          src = inputs.tweeny;
+          nativeBuildInputs = with self; [ cmake ];
+        };
+        
         nheko = super.nheko.overrideAttrs (oa: rec {
           name = "${pname}-${version}";
           buildInputs = with self; [
@@ -58,6 +64,7 @@ in {
             lmdb
             spdlog
             cmark
+            tweeny
             qt5.qtbase
             qt5.qtmultimedia
             qt5.qttools