summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-09-08 05:11:54 +0000
committerGitHub <noreply@github.com>2023-09-08 05:11:54 +0000
commitc34b716a00228092006f7b19af89488cbc811682 (patch)
tree61e6d5eb0a5431467fd5f0309b4e85df6d5e8d4b /pkgs
parentf9fd44b04075d9c39a17dbba027d489a4a56f960 (diff)
parent74cce92876075a577ea8186e6715765253601b02 (diff)
downloadnixpkgs-c34b716a00228092006f7b19af89488cbc811682.tar
nixpkgs-c34b716a00228092006f7b19af89488cbc811682.tar.gz
nixpkgs-c34b716a00228092006f7b19af89488cbc811682.tar.bz2
nixpkgs-c34b716a00228092006f7b19af89488cbc811682.tar.lz
nixpkgs-c34b716a00228092006f7b19af89488cbc811682.tar.xz
nixpkgs-c34b716a00228092006f7b19af89488cbc811682.tar.zst
nixpkgs-c34b716a00228092006f7b19af89488cbc811682.zip
Merge pull request #253888 from dotlambda/deltachat-desktop-1.40.2
deltachat-desktop: 1.40.1 -> 1.40.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix8
-rw-r--r--pkgs/development/libraries/libdeltachat/Cargo.lock10
-rw-r--r--pkgs/development/libraries/libdeltachat/default.nix4
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 4965369ef5f..a5cdf0fee52 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -33,16 +33,16 @@ let
 in
 buildNpmPackage rec {
   pname = "deltachat-desktop";
-  version = "1.40.1";
+  version = "1.40.2";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
-    rev = "v${version}";
-    hash = "sha256-UmRI1aYPAz8I6Th+L5N1YXbvaIOS6m2jEKFl6MdCUVA=";
+    rev = "v${version}-fixed-tag";
+    hash = "sha256-3apr4dCnw+eIJ7PkpQtpgGYWl1jPLV/z/aRuBVbFdHk=";
   };
 
-  npmDepsHash = "sha256-zk7Zc/I8uK8CXo0nHMg1CPG28OHRoL1fh1MLOsIr3ao=";
+  npmDepsHash = "sha256-qOABH0rAQyioYOSEjyJtVoqMmaxFXfXXT1MRDjuo1rI=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock
index 1f09a5f93ed..1e9b02504bd 100644
--- a/pkgs/development/libraries/libdeltachat/Cargo.lock
+++ b/pkgs/development/libraries/libdeltachat/Cargo.lock
@@ -1103,7 +1103,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.120.0"
+version = "1.121.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1179,7 +1179,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.120.0"
+version = "1.121.0"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -1203,7 +1203,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-repl"
-version = "1.120.0"
+version = "1.121.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1218,7 +1218,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-rpc-server"
-version = "1.120.0"
+version = "1.121.0"
 dependencies = [
  "anyhow",
  "deltachat",
@@ -1243,7 +1243,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.120.0"
+version = "1.121.0"
 dependencies = [
  "anyhow",
  "deltachat",
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index f99e76416da..395764d955e 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.120.0";
+  version = "1.121.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = "v${version}";
-    hash = "sha256-q2Va0NbWwte8wZQWhXiORlYGoFDvuWmQShSRtlwbA6Y=";
+    hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA=";
   };
 
   patches = [