Merge pull request #136050 from dotlambda/libdeltachat-1.59.0

libdeltachat: 1.56.0 -> 1.59.0

pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix

@@ -8,19 +8,22 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "deltachat-cursed";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "adbenitez";
     repo = "deltachat-cursed";
     rev = "v${version}";
-    sha256 = "0kbb7lh17dbkd85mcqf438qwk5masz2fxsy8ljdh23kis55nksh8";
+    sha256 = "0zzzrzc8yxw6ffwfirbrr5ahbidbvlwdvgdg82zjsdjjbarxph8c";
   };
 
   nativeBuildInputs = [
+    python3.pkgs.setuptools-scm
     wrapGAppsHook
   ];
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   buildInputs = [
     gobject-introspection
     libnotify
@@ -28,6 +31,7 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     deltachat
+    notify-py
     pygobject3
     urwid-readline
   ];

pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix

@@ -8,11 +8,26 @@
 , makeWrapper
 , nodePackages
 , pkg-config
+, rustPlatform
 , stdenv
 , CoreServices
 }:
 
 let
+  libdeltachat' = libdeltachat.overrideAttrs (old: rec {
+    version = "1.56.0";
+    src = fetchFromGitHub {
+      owner = "deltachat";
+      repo = "deltachat-core-rust";
+      rev = version;
+      sha256 = "07vcwbvpzcnvpls0hmpapi7v1npca8ydbx2i235k26xym8il89b7";
+    };
+    cargoDeps = rustPlatform.fetchCargoTarball {
+      inherit src;
+      name = "${old.pname}-${version}";
+      sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8";
+    };
+  });
   electronExec = if stdenv.isDarwin then
     "${electron}/Applications/Electron.app/Contents/MacOS/Electron"
   else
@@ -37,7 +52,7 @@ in nodePackages.deltachat-desktop.override rec {
   ];
 
   buildInputs = [
-    libdeltachat
+    libdeltachat'
   ] ++ lib.optionals stdenv.isDarwin [
     CoreServices
   ];

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

pkgs/development/libraries/libdeltachat/default.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.56.0";
+  version = "1.59.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = version;
-    sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8=";
+    sha256 = "1lwck5gb2kys7wxg08q3pnb8cqhzwwqy6nxcf2yc030gmnwm4sya";
   };
 
   patches = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8";
+    sha256 = "13zzc8c50cy6fknrxzw5gf6rcclsn5bcb2bi3z9mmzsl29ga32gx";
   };
 
   nativeBuildInputs = [