Merge pull request #265255 from NixOS/revert-265024-deltachat (43cb6e39) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix

+2 −4

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@

		python3.pkgs.buildPythonApplication rec {
		pname = "deltachat-cursed";
		version = "0.8.0";
		version = "0.7.2";

		src = fetchFromGitHub {
		owner = "adbenitez";
		repo = "deltachat-cursed";
		rev = "v${version}";
		hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY=";
		hash = "sha256-Cv2QT8GsPAcA5TTZGfNvFNwnUITSR0PmQE0QCO1nFNk=";
		};

		nativeBuildInputs = [
		@@ -25,8 +25,6 @@ python3.pkgs.buildPythonApplication rec {
		emoji
		notify-py
		urwid-readline
		setuptools
		appdirs
		];

		doCheck = false; # no tests implemented

+7 −6

Original line number	Diff line number	Diff line
		{ lib
		, buildNpmPackage
		, copyDesktopItems
		, electron_26
		, electron_22
		, buildGoModule
		, esbuild
		, fetchFromGitHub
		@@ -33,15 +33,16 @@ let
		in
		buildNpmPackage rec {
		pname = "deltachat-desktop";
		version = "unstable-2023-11-02";
		version = "1.40.4";

		src = fetchFromGitHub {
		owner = "deltachat";
		repo = "deltachat-desktop";
		rev = "2be9fccf54f24c9f4a2ab3db051d6adfea8bc9c1";
		hash = "sha256-OHpiHwVJb5pJIkehhDG8T52NoJOxENusf4Ns3sC7mZA=";
		rev = "v${version}";
		hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU=";
		};
		npmDepsHash = "sha256-g3nkgqZNoq+xuwXbXLHEMVpHH6Sq3792xhITCx7WvOc=";

		npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0=";

		nativeBuildInputs = [
		makeWrapper
		@@ -91,7 +92,7 @@ buildNpmPackage rec {
		$out/lib/node_modules/deltachat-desktop/html-dist/fonts
		done

		makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \
		makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \
		--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
		--add-flags $out/lib/node_modules/deltachat-desktop

+785 −684

File changed.

Preview size limit exceeded, changes collapsed.

+4 −17

Original line number	Diff line number	Diff line
		{ lib
		, rust
		, stdenv
		, fetchFromGitHub
		, cargo
		@@ -20,13 +19,13 @@

		stdenv.mkDerivation rec {
		pname = "libdeltachat";
		version = "1.128.0";
		version = "1.121.0";

		src = fetchFromGitHub {
		owner = "deltachat";
		repo = "deltachat-core-rust";
		rev = "v${version}";
		hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw=";
		hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA=";
		};

		patches = [
		@@ -36,25 +35,13 @@ stdenv.mkDerivation rec {
		cargoDeps = rustPlatform.importCargoLock {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU=";
		"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
		"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
		"iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo=";
		"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
		"quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg=";
		};
		};

		outputs = [ "bin" "out" ];

		preBuild = ''
		cargo build \
		--target ${rust.envVars.rustHostPlatformSpec} \
		--release \
		-p deltachat-repl \
		--frozen \
		-j $NIX_BUILD_CORES \
		-Z unstable-options --out-dir $bin/bin/
		'';

		nativeBuildInputs = [
		cmake
		perl

+2 −5

Original line number	Diff line number	Diff line
		@@ -56,11 +56,8 @@ buildPythonPackage rec {
		"deltachat.message"
		];

		meta = {
		meta = libdeltachat.meta // {
		description = "Python bindings for the Delta Chat Core library";
		homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python";
		license = lib.licenses.mpl20;
		maintainers = with lib.maintainers; [ dotlambda srapenne ];
		platforms = lib.platforms.unix;
		};
		}