From 3d8eb1b5f7677720e097ec86de8cf92b15aed172 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Fri, 24 Nov 2023 22:49:10 -0800 Subject: deltachat-desktop: 1.41.4 -> 1.42.1 Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.41.4...v1.42.1 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.42.1/CHANGELOG.md --- .../networking/instant-messengers/deltachat-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index c3117c80a8aea..f7abc714e184c 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -35,16 +35,16 @@ let 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="; nativeBuildInputs = [ makeWrapper -- cgit 1.4.1 From 80888d4fd8c6ebe9b3a7ca7b1bd156e804ff173f Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 25 Nov 2023 08:27:08 -0800 Subject: deltachat-desktop: ensure libdeltachat version matches jsonrpc-client --- .../networking/instant-messengers/deltachat-desktop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index f7abc714e184c..a946ab60e4db5 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -5,6 +5,7 @@ , buildGoModule , esbuild , fetchFromGitHub +, jq , libdeltachat , makeDesktopItem , makeWrapper @@ -46,7 +47,15 @@ buildNpmPackage rec { 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 -- cgit 1.4.1