Update nheko

This commit is contained in:
Alexander Bantyev 2020-05-04 12:58:14 +03:00
parent 4ee582d9f7
commit 4e561767d1
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
3 changed files with 42 additions and 10 deletions

35
flake.lock generated
View File

@ -116,18 +116,18 @@
"mtxclient": { "mtxclient": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1578915159, "lastModified": 1582462474,
"narHash": "sha256-cwQT5j4ClrHCfMXF6g8RXS4WCMkg+rpfdjpH3SZQBY4=" "narHash": "sha256-YKsewl0836v4ZWYDVh6m8vwmn3B4mfo2eK+VtNikVJU="
}, },
"locked": { "locked": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "mtxclient", "repo": "mtxclient",
"rev": "84c6778cc367bca79755e73e77b2cc69950375b2", "rev": "7fc1d357afaabb134cb6d9c593f94915973d31fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"ref": "84c6778cc367bca79755e73e77b2cc69950375b2", "ref": "0.3.0-dev",
"repo": "mtxclient", "repo": "mtxclient",
"type": "github" "type": "github"
} }
@ -135,18 +135,18 @@
"nheko": { "nheko": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1579642615, "lastModified": 1583199044,
"narHash": "sha256-kdfoWPVJp1KkyYHX0FlLCQydi2x3qarKYxJx9vmoLuU=" "narHash": "sha256-/ZBsWmIO0+bNLZfCvO/BHr5qpOvUvf/lAfvErmppGYI="
}, },
"locked": { "locked": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "nheko", "repo": "nheko",
"rev": "1943d1c74d5253ec9d2b7ee38f69d791d28e84c1", "rev": "6f248e75421f3742fedd3b5ea3d4d907f885267e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"ref": "1943d1c74d5253ec9d2b7ee38f69d791d28e84c1", "ref": "0.7.0-dev",
"repo": "nheko", "repo": "nheko",
"type": "github" "type": "github"
} }
@ -322,6 +322,7 @@
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"tweeny": "tweeny",
"weechat-notify-send": "weechat-notify-send", "weechat-notify-send": "weechat-notify-send",
"weechat-scripts": "weechat-scripts", "weechat-scripts": "weechat-scripts",
"yt-utilities": "yt-utilities" "yt-utilities": "yt-utilities"
@ -346,6 +347,24 @@
"url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver" "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": { "weechat-notify-send": {
"flake": false, "flake": false,
"info": { "info": {

View File

@ -40,14 +40,20 @@
type = "github"; type = "github";
owner = "nheko-reborn"; owner = "nheko-reborn";
repo = "mtxclient"; repo = "mtxclient";
ref = "84c6778cc367bca79755e73e77b2cc69950375b2"; ref = "0.3.0-dev";
flake = false;
};
tweeny = {
type = "github";
owner = "mobius3";
repo = "tweeny";
flake = false; flake = false;
}; };
nheko = { nheko = {
type = "github"; type = "github";
owner = "nheko-reborn"; owner = "nheko-reborn";
repo = "nheko"; repo = "nheko";
ref = "1943d1c74d5253ec9d2b7ee38f69d791d28e84c1"; ref = "0.7.0-dev";
flake = false; flake = false;
}; };
nixpkgs-old = { nixpkgs-old = {

View File

@ -47,6 +47,12 @@ in {
src = inputs.mtxclient; src = inputs.mtxclient;
}); });
tweeny = self.stdenv.mkDerivation {
name = "tweeny";
src = inputs.tweeny;
nativeBuildInputs = with self; [ cmake ];
};
nheko = super.nheko.overrideAttrs (oa: rec { nheko = super.nheko.overrideAttrs (oa: rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
buildInputs = with self; [ buildInputs = with self; [
@ -58,6 +64,7 @@ in {
lmdb lmdb
spdlog spdlog
cmark cmark
tweeny
qt5.qtbase qt5.qtbase
qt5.qtmultimedia qt5.qtmultimedia
qt5.qttools qt5.qttools