From 6a571435ab73d09fc2610c538a2a2a1fdc789064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jan 2025 10:23:41 -0800 Subject: [PATCH 1/3] libdeltachat: 1.152.0 -> 1.152.2 Diff: https://github.com/deltachat/deltachat-core-rust/compare/refs/tags/v1.152.0...v1.152.2 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.152.2/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 5d04ce8bde79..9c740ff6cd29 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.152.0"; + version = "1.152.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s="; + hash = "sha256-NPdUHBge6k2BqWf6SxA35Tqo0xGjFIIU2t5dbdnbMGg="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs="; + hash = "sha256-AbFtGL63wl2fo4rbxq8Hx8VvEw64sawtLHS8jQ496Vw="; }; nativeBuildInputs = [ From 6e59bb81cd771f01da61513a4665ab9ee76088d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jan 2025 10:27:36 -0800 Subject: [PATCH 2/3] deltachat-desktop: 1.50.0 -> 1.50.1 Diff: https://github.com/deltachat/deltachat-desktop/compare/refs/tags/v1.50.0...v1.50.1 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.50.1/CHANGELOG.md --- pkgs/by-name/de/deltachat-desktop/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 0bb503fc0af7..311acdceb04f 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.152.0"; + version = "1.152.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s="; + hash = "sha256-ty2pZWMZ5ZFwwpLm22ChxVAf2cqmIimk8BWvMBqzmks="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs="; + hash = "sha256-wbk4/yhhIRPD3x8ghAwJ0lQy0k8GQopTBBT1a021FRo="; }; }; electron = electron_32; @@ -37,18 +37,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.50.0"; + version = "1.50.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-0yVO9uIq70Oogt254+iHJv7p8mUeRpxVlJOcISJrKgo="; + hash = "sha256-G/qBGyx+vxkJvwmBYG5kpx01OO0C9dPji0Cafna9pyw="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-07jvAKY5GBrZ6EKY9yHwWESezjQXSjjRzImaG+yUlGc="; + hash = "sha256-UwfblmCkJOuy2Et5Rjm8ONWLbDmLppazqIk2+rV2RJU="; }; nativeBuildInputs = [ From 3d6c11ae5f179abbe66a6d1ce9b6630bc1a953f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jan 2025 15:22:29 -0800 Subject: [PATCH 3/3] deltatouch: 1.8.0 -> 1.10.2 Diff: https://codeberg.org/lk108/deltatouch.git/compare/v1.8.0...1.10.2 Changelog: https://codeberg.org/lk108/deltatouch/src/tag/v1.10.2/CHANGELOG --- pkgs/by-name/de/deltatouch/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 810f34ae7d8f..7b2d061fe88a 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -12,15 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.8.0"; + version = "1.10.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; rev = "v${finalAttrs.version}"; - hash = "sha256-HVq6eiy2ufFg96oXwnSpv7fMDL1haWyIelBzFd7pfk0="; - fetchSubmodules = true; + hash = "sha256-QcrBo7lrMYkOZGSyS5fLAwNxZwKFrylU5P5my2Jl93k="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { lomiri.lomiri-ui-toolkit lomiri.lomiri-ui-extras lomiri.lomiri-api - lomiri.lomiri-indicator-network # Lomiri.Connectivity module lomiri.qqc2-suru-style ]; @@ -48,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \ --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications" - substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile}/CMakeLists.txt \ + substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \ --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")' # Fix import of library dependencies - substituteInPlace plugins/{DeltaHandler,WebxdcEngineProfile}/CMakeLists.txt \ + substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \ --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"' substituteInPlace plugins/DeltaHandler/CMakeLists.txt \ --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"'