From ea4364b2f7d3d92e200b1b5b7b831e2be8f1b896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 25 Aug 2021 19:17:17 -0700 Subject: [PATCH] kdeltachat: unstable-2021-08-02 -> unstable-2021-08-28 --- .../instant-messengers/kdeltachat/default.nix | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index dabec65b3cd4..eda47b56b796 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -11,34 +11,17 @@ , qtimageformats , qtmultimedia , qtwebengine -, rustPlatform }: -let - libdeltachat' = libdeltachat.overrideAttrs (old: rec { - inherit (old) pname; - version = "1.58.0"; - src = fetchFromGitHub { - owner = "deltachat"; - repo = "deltachat-core-rust"; - rev = version; - sha256 = "03xc0jlfmvmdcipmzavbzkq010qlxzf3mj1zi7wcix7kpl8gwmy7"; - }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = "1zijxyc1xjlbyh1gh2lyw44xjcrhz1msykrlqgfkw5w1w0yh78hd"; - }; - }); -in mkDerivation rec { +mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-08-02"; + version = "unstable-2021-08-28"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "950f4f22c01ab75f613479ef831bdf38f395d1dd"; - sha256 = "007gazqkzcc0w0rq2i8ysa9f50ldj7n9f5gp1mh8bi86bdvdkzsy"; + rev = "4d051bc35611fa5b75865769df7a512d90a13c65"; + sha256 = "1p8pb3pwgvxy5bvr6by54f1f62imdlddy2mk52qxcvrx8f833bml"; }; nativeBuildInputs = [ @@ -49,7 +32,7 @@ in mkDerivation rec { buildInputs = [ kirigami2 - libdeltachat' + libdeltachat qtimageformats qtmultimedia qtwebengine