nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #332706 from dotlambda/deltachat-desktop

Browse Source 
deltachat-desktop: 1.46.1 -> 1.46.2
This commit is contained in:
Robert Schütz 2024-08-09 12:28:18 -07:00 committed by GitHub
commit 033d54ee79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 566 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,12 +23,12 @@
let
esbuild' = esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.19.8";
version = "0.19.12";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw=";
hash = "sha256-NQ06esCSU6YPvQ4cMsi3DEFGIQGl8Ff6fhdTxUAyGvo=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
@ -36,28 +36,16 @@ let
in
buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.46.1";
version = "1.46.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-90/Wmh0h75i3kvqj3Wo+A3KlKW8LLDWfPza2gDrDY6E=";
hash = "sha256-5XGtyfc7Kak7qSQOQAH5gFtSaHeWclRhtsYSGPIQo6w=";
};
npmDepsHash = "sha256-UzWxMd+DYH5A8Zo1rzi8oIsoKbmzsVbGpr3uWtc02rY=";
postPatch = ''
test \
$(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
= ${deltachat-rpc-server.version} \
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
test \
$(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \
= ${lib.versions.major electron.version} \
|| (echo 'error: electron version doesn not match package-lock.json' && exit 1)
'';
npmDepsHash = "sha256-4UPDNz0aw4VH3bMT+s/7DE6+ZPNP5w1iGCRpZZMXzPc=";
nativeBuildInputs = [
jq
@ -82,6 +70,16 @@ buildNpmPackage rec {
};
preBuild = ''
test \
$(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
= ${deltachat-rpc-server.version} \
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
test \
$(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \
= ${lib.versions.major electron.version} \
|| (echo 'error: electron version doesn not match package-lock.json' && exit 1)
rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-linux-*
'';

773
pkgs/development/libraries/libdeltachat/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/libraries/libdeltachat/default.nix
View File

@ -31,13 +31,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.140.2";
version = "1.142.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-BSbvgKiI89B+nxp5McBKTJAwgePt27C1QvSQLhTL7pQ=";
hash = "sha256-ea0OKQWZareqgE1C8lYem3BKaNmqJgYLItOHdPWqz6M=";
};
patches = [

3
pkgs/development/python-modules/deltachat2/default.nix
View File

@ -2,7 +2,6 @@
, fetchFromGitHub
, buildPythonPackage
, deltachat-rpc-server
, libdeltachat
, setuptools-scm
, substituteAll
}:
@ -37,6 +36,6 @@ buildPythonPackage rec {
homepage = "https://github.com/adbenitez/deltachat2";
license = lib.licenses.mpl20;
mainProgram = "deltachat2";
inherit (libdeltachat.meta) maintainers;
inherit (deltachat-rpc-server.meta) maintainers;
};
}