Merge pull request #269801 from dotlambda/deltachat-desktop-1.42.1

deltachat-desktop: 1.41.4 -> 1.42.1

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

···
 , buildGoModule
 , esbuild
 , fetchFromGitHub
+, jq
 , libdeltachat
 , makeDesktopItem
 , makeWrapper
···
 in
 buildNpmPackage rec {
   pname = "deltachat-desktop";
-  version = "1.41.4";
+  version = "1.42.1";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     rev = "v${version}";
-    hash = "sha256-T2EPCYQ2N414sUEqpXtx459sZZXOnHgXM0/dz3Wi9hw=";
+    hash = "sha256-Ua4HN02203l2FgeMotqLjcRSEHFP/4OTrl8sPS/0C+k=";
   };
 
-  npmDepsHash = "sha256-q60qrTN6H1AfJGhula8dzRwnKw2l+X0BOIvnKZh5t2s=";
+  npmDepsHash = "sha256-c9ZwShmHIoFJ2mAabKyYkYsCMXqxUf+tAS1a1/7s0qo=";
+
+  postPatch = ''
+    test \
+      $(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
+      = $(pkg-config --modversion deltachat) \
+      || (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1)
+  '';
 
   nativeBuildInputs = [
+    jq
     makeWrapper
     pkg-config
     python3

pkgs/development/libraries/libdeltachat/Cargo.lock

···
 
 [[package]]
 name = "deltachat"
-version = "1.131.6"
+version = "1.131.7"
 dependencies = [
  "ansi_term",
  "anyhow",
···
 
 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.131.6"
+version = "1.131.7"
 dependencies = [
  "anyhow",
  "async-channel 2.1.0",
···
 
 [[package]]
 name = "deltachat-repl"
-version = "1.131.6"
+version = "1.131.7"
 dependencies = [
  "ansi_term",
  "anyhow",
···
 
 [[package]]
 name = "deltachat-rpc-server"
-version = "1.131.6"
+version = "1.131.7"
 dependencies = [
  "anyhow",
  "deltachat",
···
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.131.6"
+version = "1.131.7"
 dependencies = [
  "anyhow",
  "deltachat",

pkgs/development/libraries/libdeltachat/default.nix

···
 , fetchFromGitHub
 , cargo
 , cmake
+, deltachat-desktop
 , deltachat-repl
 , openssl
 , perl
···
   };
 in stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.131.6";
+  version = "1.131.7";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = "v${version}";
-    hash = "sha256-/LWWqa8f+ODP4LDIx9U9kRCFYI+5N6KztFDPbc2TiF0=";
+    hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc=";
   };
 
   patches = [
···
   passthru = {
     inherit cargoLock;
     tests = {
-      inherit deltachat-repl;
+      inherit deltachat-desktop deltachat-repl;
       python = python3.pkgs.deltachat;
     };
   };