Merge pull request #334681 from dotlambda/deltachat-desktop (5c2a3cf6) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix→pkgs/by-name/de/deltachat-desktop/package.nix

+7 −6

Original line number	Diff line number	Diff line
		{ lib
		, buildNpmPackage
		, copyDesktopItems
		, electron
		, electron_30
		, buildGoModule
		, esbuild
		, fetchFromGitHub
		@@ -15,12 +15,13 @@
		, roboto
		, sqlcipher
		, stdenv
		, CoreServices
		, darwin
		, testers
		, deltachat-desktop
		}:

		let
		electron = electron_30;
		esbuild' = esbuild.override {
		buildGoModule = args: buildGoModule (args // rec {
		version = "0.19.12";
		@@ -36,16 +37,16 @@ let
		in
		buildNpmPackage rec {
		pname = "deltachat-desktop";
		version = "1.46.2";
		version = "1.46.5";

		src = fetchFromGitHub {
		owner = "deltachat";
		repo = "deltachat-desktop";
		rev = "v${version}";
		hash = "sha256-5XGtyfc7Kak7qSQOQAH5gFtSaHeWclRhtsYSGPIQo6w=";
		hash = "sha256-u/2/lCQpUf5bxKPseHz6SFmiW0m9SywuA5Ng3BBnX88=";
		};

		npmDepsHash = "sha256-4UPDNz0aw4VH3bMT+s/7DE6+ZPNP5w1iGCRpZZMXzPc=";
		npmDepsHash = "sha256-jnuSL0yr6E8P0Tev9rMsfCLs59WStaH19DhZe0zthmw=";

		nativeBuildInputs = [
		jq
		@@ -59,7 +60,7 @@ buildNpmPackage rec {
		buildInputs = [
		deltachat-rpc-server
		] ++ lib.optionals stdenv.isDarwin [
		CoreServices
		darwin.apple_sdk.frameworks.CoreServices
		];

		env = {

+141 −400

File changed and moved.

Preview size limit exceeded, changes collapsed.

+0 −0

File moved.

+6 −8

Original line number	Diff line number	Diff line
		@@ -14,9 +14,7 @@
		, sqlcipher
		, sqlite
		, fixDarwinDylibNames
		, CoreFoundation
		, Security
		, SystemConfiguration
		, darwin
		, libiconv
		}:

		@@ -31,13 +29,13 @@ let
		};
		in stdenv.mkDerivation rec {
		pname = "libdeltachat";
		version = "1.142.1";
		version = "1.142.7";

		src = fetchFromGitHub {
		owner = "deltachat";
		repo = "deltachat-core-rust";
		rev = "v${version}";
		hash = "sha256-ea0OKQWZareqgE1C8lYem3BKaNmqJgYLItOHdPWqz6M=";
		hash = "sha256-Wj7fmhp67a3OtzxPbfqOpZCzM9WokzKiaWNQS9qYyCo=";
		};

		patches = [
		@@ -61,9 +59,9 @@ in stdenv.mkDerivation rec {
		sqlcipher
		sqlite
		] ++ lib.optionals stdenv.isDarwin [
		CoreFoundation
		Security
		SystemConfiguration
		darwin.apple_sdk.frameworks.CoreFoundation
		darwin.apple_sdk.frameworks.Security
		darwin.apple_sdk.frameworks.SystemConfiguration
		libiconv
		];

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		{
		buildPythonPackage,
		deltachat-rpc-server,
		imap-tools,
		lib,
		pytestCheckHook,
		setuptools,
		}:

		buildPythonPackage rec {
		pname = "deltachat-rpc-client";
		inherit (deltachat-rpc-server) version src;
		pyproject = true;

		sourceRoot = "${src.name}/deltachat-rpc-client";

		postPatch = ''
		substituteInPlace src/deltachat_rpc_client/rpc.py \
		--replace-fail deltachat-rpc-server "${lib.getExe deltachat-rpc-server}"
		'';

		build-system = [ setuptools ];

		dependencies = [ imap-tools ];

		pythonImportsCheck = [ "deltachat_rpc_client" ];

		nativeCheckInputs = [ pytestCheckHook ];

		# requires a chatmail server
		doCheck = false;

		meta = {
		inherit (deltachat-rpc-server.meta) changelog license maintainers;
		description = "Python client for Delta Chat core JSON-RPC interface";
		homepage = "https://github.com/deltachat/deltachat-core-rust/tree/main/deltachat-rpc-client";
		};
		}