pyrox.dev / nixpkgs
lol
fork atom

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

deltachat-desktop: 1.41.4 -> 1.42.1

authored by Robert Schütz and committed by GitHub 51716948 e47087dd

+21 -11
unified split
+12 -3
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
··· 5 , buildGoModule 6 , esbuild 7 , fetchFromGitHub 8 , libdeltachat 9 , makeDesktopItem 10 , makeWrapper ··· 35 in 36 buildNpmPackage rec { 37 pname = "deltachat-desktop"; 38 - version = "1.41.4"; 39 40 src = fetchFromGitHub { 41 owner = "deltachat"; 42 repo = "deltachat-desktop"; 43 rev = "v${version}"; 44 - hash = "sha256-T2EPCYQ2N414sUEqpXtx459sZZXOnHgXM0/dz3Wi9hw="; 45 }; 46 47 - npmDepsHash = "sha256-q60qrTN6H1AfJGhula8dzRwnKw2l+X0BOIvnKZh5t2s="; 48 49 nativeBuildInputs = [ 50 makeWrapper 51 pkg-config 52 python3
··· 5 , buildGoModule 6 , esbuild 7 , fetchFromGitHub 8 + , jq 9 , libdeltachat 10 , makeDesktopItem 11 , makeWrapper ··· 36 in 37 buildNpmPackage rec { 38 pname = "deltachat-desktop"; 39 + version = "1.42.1"; 40 41 src = fetchFromGitHub { 42 owner = "deltachat"; 43 repo = "deltachat-desktop"; 44 rev = "v${version}"; 45 + hash = "sha256-Ua4HN02203l2FgeMotqLjcRSEHFP/4OTrl8sPS/0C+k="; 46 }; 47 48 + npmDepsHash = "sha256-c9ZwShmHIoFJ2mAabKyYkYsCMXqxUf+tAS1a1/7s0qo="; 49 + 50 + postPatch = '' 51 + test \ 52 + $(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \ 53 + = $(pkg-config --modversion deltachat) \ 54 + || (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1) 55 + ''; 56 57 nativeBuildInputs = [ 58 + jq 59 makeWrapper 60 pkg-config 61 python3
+5 -5
pkgs/development/libraries/libdeltachat/Cargo.lock
··· 1087 1088 [[package]] 1089 name = "deltachat" 1090 - version = "1.131.6" 1091 dependencies = [ 1092 "ansi_term", 1093 "anyhow", ··· 1165 1166 [[package]] 1167 name = "deltachat-jsonrpc" 1168 - version = "1.131.6" 1169 dependencies = [ 1170 "anyhow", 1171 "async-channel 2.1.0", ··· 1189 1190 [[package]] 1191 name = "deltachat-repl" 1192 - version = "1.131.6" 1193 dependencies = [ 1194 "ansi_term", 1195 "anyhow", ··· 1204 1205 [[package]] 1206 name = "deltachat-rpc-server" 1207 - version = "1.131.6" 1208 dependencies = [ 1209 "anyhow", 1210 "deltachat", ··· 1229 1230 [[package]] 1231 name = "deltachat_ffi" 1232 - version = "1.131.6" 1233 dependencies = [ 1234 "anyhow", 1235 "deltachat",
··· 1087 1088 [[package]] 1089 name = "deltachat" 1090 + version = "1.131.7" 1091 dependencies = [ 1092 "ansi_term", 1093 "anyhow", ··· 1165 1166 [[package]] 1167 name = "deltachat-jsonrpc" 1168 + version = "1.131.7" 1169 dependencies = [ 1170 "anyhow", 1171 "async-channel 2.1.0", ··· 1189 1190 [[package]] 1191 name = "deltachat-repl" 1192 + version = "1.131.7" 1193 dependencies = [ 1194 "ansi_term", 1195 "anyhow", ··· 1204 1205 [[package]] 1206 name = "deltachat-rpc-server" 1207 + version = "1.131.7" 1208 dependencies = [ 1209 "anyhow", 1210 "deltachat", ··· 1229 1230 [[package]] 1231 name = "deltachat_ffi" 1232 + version = "1.131.7" 1233 dependencies = [ 1234 "anyhow", 1235 "deltachat",
+4 -3
pkgs/development/libraries/libdeltachat/default.nix
··· 3 , fetchFromGitHub 4 , cargo 5 , cmake 6 , deltachat-repl 7 , openssl 8 , perl ··· 30 }; 31 in stdenv.mkDerivation rec { 32 pname = "libdeltachat"; 33 - version = "1.131.6"; 34 35 src = fetchFromGitHub { 36 owner = "deltachat"; 37 repo = "deltachat-core-rust"; 38 rev = "v${version}"; 39 - hash = "sha256-/LWWqa8f+ODP4LDIx9U9kRCFYI+5N6KztFDPbc2TiF0="; 40 }; 41 42 patches = [ ··· 81 passthru = { 82 inherit cargoLock; 83 tests = { 84 - inherit deltachat-repl; 85 python = python3.pkgs.deltachat; 86 }; 87 };
··· 3 , fetchFromGitHub 4 , cargo 5 , cmake 6 + , deltachat-desktop 7 , deltachat-repl 8 , openssl 9 , perl ··· 31 }; 32 in stdenv.mkDerivation rec { 33 pname = "libdeltachat"; 34 + version = "1.131.7"; 35 36 src = fetchFromGitHub { 37 owner = "deltachat"; 38 repo = "deltachat-core-rust"; 39 rev = "v${version}"; 40 + hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc="; 41 }; 42 43 patches = [ ··· 82 passthru = { 83 inherit cargoLock; 84 tests = { 85 + inherit deltachat-desktop deltachat-repl; 86 python = python3.pkgs.deltachat; 87 }; 88 };