From a18b27a3f62c72da3c5a1ba6b75c6a188e9b0376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 09:55:33 -0800 Subject: [PATCH 1/3] libdeltachat: 1.110.0 -> 1.111.0 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.111.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index e1f4ff6373d6..89cad75d85a1 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.110.0"; + version = "1.111.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw="; + hash = "sha256-Fj5qrvlhty03+rxFqajdNoKFI+7qEHmKBXOLy3EonJ8="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA="; + hash = "sha256-5s4onnL5aX4jFxEZWDU9xK6wSdTg7ZJZirxKTiImy38="; }; nativeBuildInputs = [ From 6f10ea96ec9149ef88cf0bd689efbca6e812c314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 14:55:00 -0800 Subject: [PATCH 2/3] deltachat-desktop: remove old patch --- .../deltachat-desktop/no-static-lib.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch deleted file mode 100644 index 95238cf88524..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe7abe08..acdbe0d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ find_program(CARGO cargo) - - add_custom_command( - OUTPUT -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND -@@ -38,13 +37,11 @@ add_custom_target( - lib_deltachat - ALL - DEPENDS -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - include(GNUInstallDirs) - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml -index a34a27ba..cf354abb 100644 ---- a/deltachat-ffi/Cargo.toml -+++ b/deltachat-ffi/Cargo.toml -@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] - - [lib] - name = "deltachat" --crate-type = ["cdylib", "staticlib"] -+crate-type = ["cdylib"] - - [dependencies] - deltachat = { path = "../", default-features = false } From 5e5d6e16ed90c73684b8426c7ca2567c7f1538fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 15:01:59 -0800 Subject: [PATCH 3/3] python310Packages.deltachat: inherit meta from libdeltachat --- pkgs/development/libraries/libdeltachat/default.nix | 2 +- pkgs/development/python-modules/deltachat/default.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 89cad75d85a1..4da6dfe6abee 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda srapenne ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 92777f73e7ad..034be82d7e39 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -56,11 +56,8 @@ buildPythonPackage rec { "deltachat.message" ]; - meta = with lib; { + meta = libdeltachat.meta // { description = "Python bindings for the Delta Chat Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; - changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/python/CHANGELOG"; - license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda srapenne ]; }; }