nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdeltachat: 1.148.7 -> 1.150.0 (#358240)

Browse Source
This commit is contained in:
Robert Schütz 2024-11-23 17:07:43 -08:00 committed by GitHub
commit 9e708b3c14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 7174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/by-name/de/deltachat-desktop/package.nix
View File

@ -9,6 +9,7 @@
, pkg-config
, pnpm_9
, python3
, rustPlatform
, stdenv
, darwin
, testers
@ -17,6 +18,20 @@
}:
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "1.148.7";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
};
};
electron = electron_32;
pnpm = pnpm_9;
in
@ -47,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
copyDesktopItems
];
buildInputs = [
deltachat-rpc-server
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
@ -63,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
test \
$(yq -r '.catalogs.default."@deltachat/jsonrpc-client".version' pnpm-lock.yaml) \
= ${deltachat-rpc-server.version} \
= ${deltachat-rpc-server'.version} \
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
test \
@ -83,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
pushd packages/target-electron/dist/*-unpacked/resources/app.asar.unpacked
rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-*
ln -s ${lib.getExe deltachat-rpc-server'} node_modules/@deltachat/stdio-rpc-server-*
popd
runHook postBuild

7166
pkgs/by-name/li/libdeltachat/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/by-name/li/libdeltachat/package.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.148.7";
version = "1.150.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
hash = "sha256-lVMXW2fnpoa/iiypLhHl7WXLqouHfrRapEbXL37X7B8=";
};
patches = [
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
hash = "sha256-nzAQEaTHkKjDmKDmwZEznpvVh1KfxTM83/82hjV/Cpw=";
};
nativeBuildInputs = [