deltachat-desktop: 1.34.2 -> 1.34.3

Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.34.2...v1.34.3

Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.34.3/CHANGELOG.md

2 files changed, 6 insertions, 48 deletions

diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 805aadfc40a9f..3d9fc7627b608 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -21,17 +21,17 @@
 
 let
   libdeltachat' = libdeltachat.overrideAttrs (old: rec {
-    version = "1.106.0";
+    version = "1.107.0";
     src = fetchFromGitHub {
       owner = "deltachat";
       repo = "deltachat-core-rust";
       rev = version;
-      hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc=";
+      hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY=";
     };
     cargoDeps = rustPlatform.fetchCargoTarball {
       inherit src;
       name = "${old.pname}-${version}";
-      hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs=";
+      hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o=";
     };
   });
   esbuild' = esbuild.override {
@@ -48,24 +48,16 @@ let
   };
 in buildNpmPackage rec {
   pname = "deltachat-desktop";
-  version = "1.34.2";
+  version = "1.34.3";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     rev = "v${version}";
-    hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco=";
+    hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "bump-electron-to-22.1.0.patch";
-      url = "https://github.com/deltachat/deltachat-desktop/commit/944d2735cda6cd5a95cb83c57484fbaf16720a9c.patch";
-      hash = "sha256-kaKi32eFQ3hGLZLjiXmH9qs4GXezcDQ7zTdT2+D8NcQ=";
-    })
-  ];
-
-  npmDepsHash = "sha256-J3/S/jYQvO/U8StDtYI+jozon0d4VCdeqFX6x1hHzMo=";
+  npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -137,8 +129,6 @@ in buildNpmPackage rec {
     ];
   });
 
-  passthru.updateScript = ./update.sh;
-
   meta = with lib; {
     description = "Email-based instant messaging for Desktop";
     homepage = "https://github.com/deltachat/deltachat-desktop";
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh
deleted file mode 100755
index f31279cf4f0ea..0000000000000
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps
-
-set -euo pipefail
-cd "$(dirname "$0")"
-
-owner=deltachat
-repo=deltachat-desktop
-nixpkgs=../../../../..
-
-rev=$(
-    curl -s "https://api.github.com/repos/$owner/$repo/releases" |
-    jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output
-)
-ver=$(echo "$rev" | sed 's/^v//')
-old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1)
-if [ "$ver" = "$old_ver" ]; then
-    echo "Up to date: $ver"
-    exit
-fi
-echo "$old_ver -> $ver"
-
-hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev")
-tac default.nix \
-    | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \
-          -e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \
-    | tac \
-    | sponge default.nix
-
-src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link)
-hash=$(prefetch-npm-deps $src/package-lock.json)
-sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix