From 143bf54f188b464c742c9573ac35aba80e0687a8 Mon Sep 17 00:00:00 2001
From: Robert Schütz <nix@dotlambda.de>
Date: Wed, 8 Sep 2021 15:36:34 -0700
Subject: deltachat-desktop: unstable-2021-08-04 -> 1.21.0

https://github.com/deltachat/deltachat-desktop/blob/v1.21.0/CHANGELOG.md
---
 .../deltachat-desktop/default.nix                  | 22 ++++------------------
 .../deltachat-desktop/package.json                 | 14 +++++++-------
 2 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 41c7470a26d99..c4647b4cdfee1 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -14,33 +14,19 @@
 }:
 
 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
     "${electron}/bin/electron";
 in nodePackages.deltachat-desktop.override rec {
   pname = "deltachat-desktop";
-  version = "unstable-2021-08-04";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
-    rev = "2c47d6b7e46f4f68c7eb45508ab9e145af489ea1";
-    sha256 = "03b6j3cj2yanvsargh6q57bf1llg17yrqgmd14lp0wkam767kkfa";
+    rev = "v${version}";
+    sha256 = "1fwnv77qa9p50js98byb26ms7mhv7rfwhfv21f282a74pbqsar45";
   };
 
   nativeBuildInputs = [
@@ -52,7 +38,7 @@ in nodePackages.deltachat-desktop.override rec {
   ];
 
   buildInputs = [
-    libdeltachat'
+    libdeltachat
   ] ++ lib.optionals stdenv.isDarwin [
     CoreServices
   ];
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
index f332352e4b61d..a6355fde2b24f 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json
@@ -1,20 +1,18 @@
 {
   "name": "deltachat-desktop",
-  "version": "1.20.3",
+  "version": "1.21.0",
   "dependencies": {
     "@blueprintjs/core": "^3.22.3",
     "@mapbox/geojson-extent": "^1.0.0",
     "application-config": "^1.0.1",
-    "array-differ": "^3.0.0",
     "classnames": "^2.3.1",
     "debounce": "^1.2.0",
-    "deltachat-node": "1.56.2",
+    "deltachat-node": "1.60.0",
     "emoji-js-clean": "^4.0.0",
     "emoji-mart": "^3.0.0",
     "emoji-regex": "^9.2.2",
     "error-stack-parser": "^2.0.6",
     "filesize": "^6.1.0",
-    "fs-extra": "^8.1.0",
     "mapbox-gl": "^1.12.0",
     "mime-types": "^2.1.31",
     "moment": "^2.27.0",
@@ -27,7 +25,9 @@
     "react-qr-reader": "^2.2.1",
     "react-qr-svg": "^2.1.0",
     "react-string-replace": "^0.4.4",
-    "react-virtualized": "^9.21.2",
+    "react-virtualized-auto-sizer": "^1.0.5",
+    "react-window": "^1.8.6",
+    "react-window-infinite-loader": "^1.0.7",
     "simple-markdown": "^0.7.1",
     "source-map-support": "^0.5.19",
     "tempy": "^0.3.0",
@@ -38,7 +38,6 @@
     "@babel/preset-env": "^7.7.7",
     "@babel/preset-react": "^7.7.4",
     "@types/emoji-mart": "^3.0.2",
-    "@types/fs-extra": "^8.0.1",
     "@types/mapbox-gl": "^0.54.5",
     "@types/mime-types": "^2.1.0",
     "@types/node": "^14.14.20",
@@ -47,7 +46,8 @@
     "@types/rc": "^1.1.0",
     "@types/react": "^16.9.17",
     "@types/react-dom": "^16.9.4",
-    "@types/react-virtualized": "^9.21.10",
+    "@types/react-window": "^1.8.4",
+    "@types/react-window-infinite-loader": "^1.0.4",
     "@types/url-parse": "^1.4.3",
     "electron": "^13.1.6",
     "glob-watcher": "^5.0.5",
-- 
cgit 1.4.1