From 8395af32dc3c5fa28d43e741d14ba6a14fa1d240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 24 Nov 2023 22:48:32 -0800 Subject: [PATCH 1/4] libdeltachat: 1.131.6 -> 1.131.7 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.131.6...v1.131.7 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.131.7/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/Cargo.lock | 10 +++++----- pkgs/development/libraries/libdeltachat/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 45ed5539d5def..966dcb72535e1 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.131.6" +version = "1.131.7" dependencies = [ "ansi_term", "anyhow", @@ -1165,7 +1165,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.131.6" +version = "1.131.7" dependencies = [ "anyhow", "async-channel 2.1.0", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.131.6" +version = "1.131.7" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.131.6" +version = "1.131.7" dependencies = [ "anyhow", "deltachat", @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.131.6" +version = "1.131.7" dependencies = [ "anyhow", "deltachat", diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 8a762f6f6bd79..23046ccd2e105 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -30,13 +30,13 @@ let }; 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 = [ From 3d8eb1b5f7677720e097ec86de8cf92b15aed172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 24 Nov 2023 22:49:10 -0800 Subject: [PATCH 2/4] 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 --- .../instant-messengers/deltachat-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 80888d4fd8c6ebe9b3a7ca7b1bd156e804ff173f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Nov 2023 08:27:08 -0800 Subject: [PATCH 3/4] deltachat-desktop: ensure libdeltachat version matches jsonrpc-client --- .../instant-messengers/deltachat-desktop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) 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 From d07bce0acb0b90e9e0cfc8c9df6183adc294f66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Nov 2023 08:38:20 -0800 Subject: [PATCH 4/4] libdeltachat: add deltachat-desktop to passthru.tests --- pkgs/development/libraries/libdeltachat/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 23046ccd2e105..11e34045c36f1 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cargo , cmake +, deltachat-desktop , deltachat-repl , openssl , perl @@ -81,7 +82,7 @@ in stdenv.mkDerivation rec { passthru = { inherit cargoLock; tests = { - inherit deltachat-repl; + inherit deltachat-desktop deltachat-repl; python = python3.pkgs.deltachat; }; };