From 4438aef1a23958faacf1a75afbf84e57e98f11c7 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 11 May 2024 16:09:13 +0800
Subject: [PATCH 01/49] deepin.dde-shell: init at 0.0.17

---
 .../deepin/core/dde-shell/default.nix         | 65 +++++++++++++++++++
 .../dde-shell/disable-plugins-use-qt5.diff    | 18 +++++
 .../core/dde-shell/fix-path-for-nixos.diff    | 17 +++++
 .../fix-translations-cant-install.diff        | 24 +++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 5 files changed, 125 insertions(+)
 create mode 100644 pkgs/desktops/deepin/core/dde-shell/default.nix
 create mode 100644 pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
 create mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
 create mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff

diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
new file mode 100644
index 000000000000..c6bb4337ea98
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -0,0 +1,65 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, pkg-config
+, wrapQtAppsHook
+, wayland-scanner
+, dtk6declarative
+, dtk6widget
+, qt6Packages
+, libsForQt5
+, wayland
+, wayland-protocols
+, yaml-cpp
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dde-shell";
+  version = "0.0.17";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "dde-shell";
+    rev = "e666b487d978d34c8f7f7488d42482397755615c";
+    hash = "sha256-DvcxCLKTddUtPELMN7oBcQPSbHoNWEmXYLeCo3O8rOg=";
+  };
+
+  patches = [
+    ./disable-plugins-use-qt5.diff
+    ./fix-translations-cant-install.diff
+    ./fix-path-for-nixos.diff
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    pkg-config
+    qt6Packages.wrapQtAppsHook
+    qt6Packages.qttools
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    qt6Packages.qtbase
+    qt6Packages.qtwayland
+    dtk6declarative
+    dtk6widget
+    wayland
+    wayland-protocols
+    yaml-cpp
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "SYSTEMD_USER_UNIT_DIR" "${placeholder "out"}/lib/systemd/user")
+  ];
+
+  meta = {
+    description = "A plugin system that integrates plugins developed on DDE";
+    homepage = "https://github.com/linuxdeepin/dde-shell";
+    license = with lib.licenses; [ gpl3Plus ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ rewine ];
+  };
+})
diff --git a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
new file mode 100644
index 000000000000..0625bcf2dbce
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
@@ -0,0 +1,18 @@
+diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt
+index 1a20179..83c5ff2 100644
+--- a/panels/dock/CMakeLists.txt
++++ b/panels/dock/CMakeLists.txt
+@@ -85,11 +85,11 @@ add_subdirectory(searchitem)
+ add_subdirectory(launcherItem)
+ add_subdirectory(showdesktop)
+ add_subdirectory(taskmanager)
+-add_subdirectory(tray)
++#add_subdirectory(tray)
+ add_subdirectory(multitaskview)
+ 
+ # dock plugin load program
+-add_subdirectory(dockplugin)
++#add_subdirectory(dockplugin)
+ 
+ # dock qml element(include Dock.xx defines and DockCompositor)
+ file(
diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
new file mode 100644
index 000000000000..cc334a3220a4
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
@@ -0,0 +1,17 @@
+diff --git a/misc/DDEShellConfig.cmake.in b/misc/DDEShellConfig.cmake.in
+index e28cc2f..3875769 100644
+--- a/misc/DDEShellConfig.cmake.in
++++ b/misc/DDEShellConfig.cmake.in
+@@ -5,9 +5,9 @@ find_dependency(Dtk@DTK_VERSION_MAJOR@Gui)
+ find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED)
+ 
+ include(${CMAKE_CURRENT_LIST_DIR}/DDEShellTargets.cmake)
+-set(DDE_SHELL_PACKAGE_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PACKAGE_INSTALL_DIR@)
+-set(DDE_SHELL_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PLUGIN_INSTALL_DIR@)
+-set(DDE_SHELL_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_TRANSLATION_INSTALL_DIR@)
++set(DDE_SHELL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell)
++set(DDE_SHELL_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-shell)
++set(DDE_SHELL_TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell)
+ check_required_components(Dtk@DTK_VERSION_MAJOR@Core)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/DDEShellPackageMacros.cmake")
diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff b/pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff
new file mode 100644
index 000000000000..691f2d21ff9a
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff
@@ -0,0 +1,24 @@
+diff --git a/cmake/DDEShellPackageMacros.cmake b/cmake/DDEShellPackageMacros.cmake
+index c9fa45a..b9d9d2c 100644
+--- a/cmake/DDEShellPackageMacros.cmake
++++ b/cmake/DDEShellPackageMacros.cmake
+@@ -73,9 +73,9 @@ function(ds_handle_package_translation)
+     )
+ 
+     set(package_dirs ${PROJECT_BINARY_DIR}/packages/${_config_PACKAGE}/)
+-    set_source_files_properties(${TRANSLATION_FILES}
+-        PROPERTIES OUTPUT_LOCATION "${package_dirs}/translations"
+-    )
++    #set_source_files_properties(${TRANSLATION_FILES}
++    #    PROPERTIES OUTPUT_LOCATION "${package_dirs}/translations"
++    #)
+ 
+     add_custom_target(${_config_PACKAGE}_translation ALL
+         SOURCES ${TRANSLATION_FILES}
+@@ -89,4 +89,4 @@ function(ds_handle_package_translation)
+ 
+     # /usr/share/dde-shell/org.deepin.xxx/translations/org.deepin.xxx.qm
+     install(FILES ${TRANSLATED_FILES} DESTINATION ${DDE_SHELL_TRANSLATION_INSTALL_DIR}/${_config_PACKAGE}/translations)
+-endfunction()
+\ No newline at end of file
++endfunction()
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 4b2dc27c1100..252e58449b55 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -49,6 +49,7 @@ let
     dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
     dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
     dde-widgets = callPackage ./core/dde-widgets { };
+    dde-shell = callPackage ./core/dde-shell { };
 
     #### Dtk Application
     deepin-album = callPackage ./apps/deepin-album { };

From 10a7facbdfc9c5513e51c71ad8b69ca4eeeae86d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 11 May 2024 16:09:56 +0800
Subject: [PATCH 02/49] deepin.dde-launchpad: 0.4.4 -> 0.6.10

---
 .../deepin/core/dde-launchpad/default.nix     | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index 3e3b15f3a250..d018eac33c83 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -2,57 +2,47 @@
 , lib
 , fetchFromGitHub
 , cmake
-, qttools
 , pkg-config
-, wrapQtAppsHook
-, dtkwidget
-, dtkdeclarative
-, qtbase
+, qt6Packages
+, dtk6declarative
 , appstream-qt
 , kitemmodels
-, qt5integration
+, dde-shell
 }:
 
 stdenv.mkDerivation rec {
   pname = "dde-launchpad";
-  version = "0.4.4";
+  version = "0.6.10";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY=";
+    hash = "sha256-MVSWcUqbZDloKKfly+E7HLObpJlj0Oq8G8pP5Lkpriw=";
   };
 
-  postPatch = ''
-    substituteInPlace desktopintegration.cpp \
-      --replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h"
-  '';
-
   nativeBuildInputs = [
     cmake
-    qttools
     pkg-config
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    dtkwidget
-    dtkdeclarative
+    dtk6declarative
+    dde-shell
+    #kitemmodels
+  ] ++ (with qt6Packages ; [
     qtbase
+    qtsvg
+    qtwayland
     appstream-qt
-    kitemmodels
-  ];
+  ]);
 
   cmakeFlags = [
     "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
   ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
-
   meta = with lib; {
     description = "The 'launcher' or 'start menu' component for DDE";
     mainProgram = "dde-launchpad";

From 505fbdb97e07fd00defb2ea79fd7b401bc49cbf0 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 10:42:25 +0800
Subject: [PATCH 03/49] deepin.dtkcommon: 5.6.21 -> 5.6.29

---
 pkgs/desktops/deepin/library/dtkcommon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix
index 1a55d6855ec9..e38d8cb3f891 100644
--- a/pkgs/desktops/deepin/library/dtkcommon/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dtkcommon";
-  version = "5.6.21";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-wRTzgvtmbGJJaIwi1f5m98K2o6g7yZdnKYR1nsDDwk8=";
+    hash = "sha256-1u+GhPI5F3t2h14VlRKpyPNArGoGgWOk2zA8D6vR6nU=";
   };
 
   nativeBuildInputs = [

From 8bfa4dd2cc0704dd0b2899f1cb3015731cd286cb Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 10:42:52 +0800
Subject: [PATCH 04/49] deepin.dtkcore: 5.6.22 -> 5.6.29

---
 .../desktops/deepin/library/dtkcore/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix
index ba921fd6eef7..bf24da37b51f 100644
--- a/pkgs/desktops/deepin/library/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcore/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dtkcore";
-  version = "5.6.22";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-W8uLNWC8bYzrKrX/hq9p1h66dWrxp4Vt+/27zDJeAS4=";
+    hash = "sha256-toqbEobi2R5tGnCYaShLyFdp4toEybMrWU+IORI/vu4=";
   };
 
   patches = [
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
     ./fix-pri-path.patch
   ];
 
+  postPatch = ''
+    substituteInPlace misc/DtkCoreConfig.cmake.in \
+      --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk5/DCore/bin
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -60,7 +65,7 @@ stdenv.mkDerivation rec {
     "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
     "-DDSG_PREFIX_PATH='/run/current-system/sw'"
     "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
-    "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec"
+    "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin"
     "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
     "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
   ];
@@ -73,6 +78,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
+  postFixup = ''
+    for binary in $out/libexec/dtk5/DCore/bin/*; do
+      wrapQtApp $binary
+    done
+  '';
+
   meta = with lib; {
     description = "Deepin tool kit core library";
     homepage = "https://github.com/linuxdeepin/dtkcore";

From a469dd4fb8735d6fae639fb9c1d07fe05bcc0c49 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 10:47:52 +0800
Subject: [PATCH 05/49] deepin.dtkgui: 5.6.22 -> 5.6.29

---
 pkgs/desktops/deepin/library/dtkgui/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
index 9066a3298574..7d93e7ec997c 100644
--- a/pkgs/desktops/deepin/library/dtkgui/default.nix
+++ b/pkgs/desktops/deepin/library/dtkgui/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dtkgui";
-  version = "5.6.22";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-h3DFG6FaJXP9o9u8R31MtX3Z1+P3DrNDT8Xbd8tlI4Y=";
+    hash = "sha256-TSU6sqdwBa86k7HcyNSJeJ6gj+n6EfIMjE8skSG5o0c=";
   };
 
   patches = [
@@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
     "-DBUILD_DOCS=ON"
     "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
     "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
-    "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec"
   ];
 
   preConfigure = ''
@@ -64,6 +63,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
+  postFixup = ''
+    for binary in $out/libexec/dtk5/DGui/bin/*; do
+      wrapQtApp $binary
+    done
+  '';
+
   meta = with lib; {
     description = "Deepin Toolkit, gui module for DDE look and feel";
     homepage = "https://github.com/linuxdeepin/dtkgui";

From f7697d14d204fbb16de1d17d72ba474d499d75c3 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:13:22 +0800
Subject: [PATCH 06/49] deepin.dtkwidget: 5.6.22 -> 5.6.29

---
 pkgs/desktops/deepin/library/dtkwidget/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix
index 59c1ae7be856..ffbd25f1c83b 100644
--- a/pkgs/desktops/deepin/library/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dtkwidget";
-  version = "5.6.22";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-szy1gPm+PsiUXGvo5QuXKYMVPCcaqVX47iu48WXOjWU=";
+    hash = "sha256-eFEigOJGw5gTi0G13/rtnqoaeTdnO0aSLfZlRwHg3yE=";
   };
 
   patches = [
@@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
     "-DBUILD_DOCS=ON"
     "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules"
     "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
-    "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "dev"}/libexec"
   ];
 
   preConfigure = ''
@@ -77,6 +76,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "doc" ];
 
+  postFixup = ''
+    for binary in $out/lib/dtk5/DWidget/bin/*; do
+        wrapQtApp $binary
+    done
+  '';
+
   meta = with lib; {
     description = "Deepin graphical user interface library";
     homepage = "https://github.com/linuxdeepin/dtkwidget";

From e2864158d27471b821d2a296e68bd0cba7406a2d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:19:14 +0800
Subject: [PATCH 07/49] deepin.dtkdeclarative: 5.6.24 -> 5.6.29

---
 pkgs/desktops/deepin/library/dtkdeclarative/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
index 32e499ad242a..7e389f97e912 100644
--- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dtkdeclarative";
-  version = "5.6.24";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-bGy8e+JAyHiAwWvO5Xz1TubHUDP4i4nWUR4h5/appM0=";
+    hash = "sha256-7pAC7NHsmQudAO2KvEgI5BbnsgjqxaJY5v9GNfKBm1U=";
   };
 
   patches = [

From 333c37196e52f79df8bfa005bbcb4f6d44c0b1ce Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:25:35 +0800
Subject: [PATCH 08/49] deepin.qt5integration: 5.6.20 -> 5.6.29

---
 pkgs/desktops/deepin/library/qt5integration/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
index c7d219f8de69..5fa19075cfaa 100644
--- a/pkgs/desktops/deepin/library/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt5integration/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qt5integration";
-  version = "5.6.20";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-cmvscSIu3LOTKuMs/+JUdJAvQ7OB4o1k+LqfRxNefZU=";
+    hash = "sha256-yFY+bsvmVo92u6eLw9VYGAz5nehVrFob4AkdyG0nvjM=";
   };
 
   nativeBuildInputs = [

From aa0139812baf098950362e85987fdcd5c73f9b88 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:26:37 +0800
Subject: [PATCH 09/49] deepin.qt5platform-plugins: 5.6.22 -> 5.6.29

---
 pkgs/desktops/deepin/library/qt5platform-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
index 11a342e217fc..660c861d95a2 100644
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qt5platform-plugins";
-  version = "5.6.22";
+  version = "5.6.29";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-0XQ4s6xpFHoG6SC8RE8WVnbHH7qNeOYkhrYUkDEH8Dc=";
+    hash = "sha256-KoX3TkEzGNwqG8XL6op0mpTVvdSQTzqd5OpAuCU2Ok4";
   };
 
   nativeBuildInputs = [

From 41c948e12359eb5f26cebd354f424c58e5708c9e Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:29:34 +0800
Subject: [PATCH 10/49] deepin.deepin-shortcut-viewer: 5.0.7 -> 5.0.9

---
 pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
index fc0fd4eab8e1..2a1f4cab4aa8 100644
--- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-shortcut-viewer";
-  version = "5.0.7";
+  version = "5.0.9";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-r/ZhA9yiPnJNTrBkVOvaTqfRvGO/NTod5tiQCquG5Gw=";
+    sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0=";
   };
 
   nativeBuildInputs = [

From 3f3c3d6f71b37a59e2eb7e1a9f74856c652bdfad Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:34:04 +0800
Subject: [PATCH 11/49] deepin.deepin-icon-theme: 2024.01.31 -> 2024.04.16

---
 pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
index 5260df0ece63..59d82477b128 100644
--- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "deepin-icon-theme";
-  version = "2024.01.31";
+  version = "2024.04.16";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-08maujG5Tibsv9N+5olOeD8MrXTRiZh0OQm0bg8t+Cc=";
+    hash = "sha256-IUiKGHsFGJawWnwfckS8ZeB2WOxDyDlre4oekJuCKcc=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

From 993b9efb71d02e135debe935b64ae89be296235b Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:37:46 +0800
Subject: [PATCH 12/49] deepin.dde-device-formatter: 0.0.1.15 -> 0.0.1.16

---
 pkgs/desktops/deepin/tools/dde-device-formatter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
index f090c6feefa8..d9326d74b77a 100644
--- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
+++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-device-formatter";
-  version = "0.0.1.15";
+  version = "0.0.1.16";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-M0XKvo/Qph09GIlqXTdYyPWilWyQhvFAF3c9Yf1Z9m0=";
+    hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I=";
   };
 
   postPatch = ''

From 43c7023ca693b03028097d821c9db900d3038b2f Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 11:56:22 +0800
Subject: [PATCH 13/49] deepin.deepin-kwin: 5.25.17 -> 5.25.26

---
 pkgs/desktops/deepin/core/deepin-kwin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index a46088a63dd6..507b23460587 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-kwin";
-  version = "5.25.17";
+  version = "5.25.26";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-Zi6SNNiwty16b3cCMK52zrXqglq8TqK2x8smSD504+o=";
+    hash = "sha256-xBCJu89OV+JMGsd/txAqj2Kce91mnOsRK31WGz7qS40=";
   };
 
   patches = [

From f24c01e7cffb5fa4325953a513343bc51419fde8 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 12:00:12 +0800
Subject: [PATCH 14/49] deepin.util-dfm: 1.2.21 -> 1.2.24

---
 pkgs/desktops/deepin/library/util-dfm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
index e7576f7169f8..3dad7da5ff63 100644
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ b/pkgs/desktops/deepin/library/util-dfm/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "util-dfm";
-  version = "1.2.21";
+  version = "1.2.24";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-EqNca3heIUUV5joMskpriCY+7NwjUc/vmQwomDkru80=";
+    hash = "sha256-7MuQVkb+xRMtcbB5PQBv6Au/i3ONA0c1whnZ9bMrA/8=";
   };
 
   nativeBuildInputs = [

From 1024aad55552b917e9ef4d2d3ab1c75181982c22 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 13:02:01 +0800
Subject: [PATCH 15/49] deepin.dde-polkit-agent: 6.0.5 -> 6.0.7

---
 pkgs/desktops/deepin/core/dde-polkit-agent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
index f3f93be7f30e..2e6bd31a9395 100644
--- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-polkit-agent";
-  version = "6.0.5";
+  version = "6.0.7";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-NSMwNL4ttCaqo0h0sF11bOJ20FhOB+SG27K4k8F4O/o=";
+    hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys=";
   };
 
   nativeBuildInputs = [

From 0830bef3c819f31df547e4d4e1252305e969447e Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 13:41:03 +0800
Subject: [PATCH 16/49] deepin.dde-session-shell: 6.0.17 -> 6.0.20

---
 pkgs/desktops/deepin/core/dde-session-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
index cfaa12338eb2..a9c283c6ff98 100644
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-session-shell";
-  version = "6.0.17";
+  version = "6.0.20";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA=";
+    hash = "sha256-RPVGjCg7U0nWxqesoSNDtEzh/+OYDSsX31YU+LLllVM=";
   };
 
   postPatch = ''

From cd627017817a79f2e7e8a6ccd15c9482e0ea6248 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 13:43:28 +0800
Subject: [PATCH 17/49] deepin.dde-session-ui: 6.0.16 -> 6.0.19

---
 pkgs/desktops/deepin/core/dde-session-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
index 190ad0bbc704..478214bc199e 100644
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-session-ui";
-  version = "6.0.16";
+  version = "6.0.19";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0=";
+    hash = "sha256-elDtY7fZf2I8ngEmMB9sRRhm78nEDf5ag6jny7UDG70=";
   };
 
   postPatch = ''

From f85cb635d47b5cb8ebd40dcf65b0d33cf53e8cdb Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 13:45:53 +0800
Subject: [PATCH 18/49] deepin.dde-widgets: 6.0.19 -> 6.0.22

---
 pkgs/desktops/deepin/core/dde-widgets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix
index f7455a92e0b7..786f6dab521e 100644
--- a/pkgs/desktops/deepin/core/dde-widgets/default.nix
+++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-widgets";
-  version = "6.0.19";
+  version = "6.0.22";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU=";
+    hash = "sha256-rE/7AoTID9UWxAS+LVYY5WYDNAo8GnSJmUrJFn3l+1M=";
   };
 
   nativeBuildInputs = [

From 162552d4e55109eda6f784cd0ea99de104ebc582 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 13:50:16 +0800
Subject: [PATCH 19/49] deepin.dde-network-core: 2.0.21 -> 2.0.26

---
 pkgs/desktops/deepin/core/dde-network-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix
index f9d97f735a62..58c7f30f14e5 100644
--- a/pkgs/desktops/deepin/core/dde-network-core/default.nix
+++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-network-core";
-  version = "2.0.21";
+  version = "2.0.26";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw=";
+    hash = "sha256-eicwutePtKPY5DmNmIFSTQkdrE/i2RKfu766lQWy+iY=";
   };
 
   nativeBuildInputs = [

From bf989adabb23f02faac2a21959bba2879abd7e4f Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:03:05 +0800
Subject: [PATCH 20/49] deepin.deepin-desktop-theme: 1.0.9 -> 1.0.13

---
 pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
index a8c94910ccfc..32109c4b6c0a 100644
--- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-desktop-theme";
-  version = "1.0.9";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-rhbxqKT9yrtW4JJ8jCUSpsIh0JeEIttkS414vBhD9vs=";
+    hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

From 04ff4c5c52f0394baae67450f86e95c91e50a2a6 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:06:52 +0800
Subject: [PATCH 21/49] deepin.dde-session: 1.2.5 -> 1.2.10

---
 pkgs/desktops/deepin/core/dde-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix
index 0e919c144d46..9b1b49384093 100644
--- a/pkgs/desktops/deepin/core/dde-session/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-session";
-  version = "1.2.5";
+  version = "1.2.10";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E=";
+    hash = "sha256-nLoSVsPyrNA996H7C8N77aiheaiLs3Sd7ZVuxiuNLE4=";
   };
 
   postPatch = ''

From 743e3bf933399b1dfef4077b595d59439f8f0fe9 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:24:43 +0800
Subject: [PATCH 22/49] deepin.dde-control-center: 6.0.44 -> 6.0.55

---
 pkgs/desktops/deepin/core/dde-control-center/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix
index ffb94b9b52b3..2f6a8afb9d6a 100644
--- a/pkgs/desktops/deepin/core/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-control-center";
-  version = "6.0.44";
+  version = "6.0.55";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0=";
+    hash = "sha256-dCUtCS7Vmd7LX34JA70P3dgsmSdRefgO//NERhKlRlE=";
   };
 
   postPatch = ''
@@ -61,6 +61,8 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
+  env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+
   cmakeFlags = [
     "-DCVERSION=${version}"
     "-DDISABLE_AUTHENTICATION=YES"

From 602cff3e0c7e9445e62241397443dc4cdf8e25c5 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:32:11 +0800
Subject: [PATCH 23/49] deepin.dde-application-manager: 1.1.8 -> 1.2.13

---
 .../core/dde-application-manager/default.nix  | 27 +++++--------------
 pkgs/desktops/deepin/default.nix              |  4 +--
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
index b386d0bbeabf..bb4a2c299ae3 100644
--- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
@@ -1,45 +1,32 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , pkg-config
-, wrapQtAppsHook
-, qtbase
+, qt6Packages
+, dtk6core
 }:
 
 stdenv.mkDerivation rec {
   pname = "dde-application-manager";
-  version = "1.1.8";
+  version = "1.2.13";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U=";
+    hash = "sha256-nyT5bp37gOWKbpPBmLULJmeL9oZyBwIC5vYwPyBLcAc=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "set-more-scale-envs-to-application.patch";
-      url = "https://github.com/linuxdeepin/dde-application-manager/commit/a1f8ad276d88c81249dd3468779862186a180238.patch";
-      hash = "sha256-/iKg6NZZomNEKYsZCZP1IfNr7ZAXiA9RVBnyf+M/f4w=";
-    })
-    (fetchpatch {
-      name = "support-execSearchPath-to-prevent-systemd-from-finding-binaries.patch";
-      url = "https://github.com/linuxdeepin/dde-application-manager/commit/2eaca7c6b8b841d571e9d3510f9f14c321cd976e.patch";
-      hash = "sha256-GWUIv4NIBLQpnY4GcjLShMjiXAfPi3zKdol3whchC/Y=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6Packages.qtbase
+    dtk6core
   ];
 
   meta = with lib; {
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 252e58449b55..f9beb284c94c 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, libsForQt5, qt6Packages }:
+{ lib, pkgs, config, libsForQt5 }:
 let
   packages = self:
   let
@@ -33,7 +33,7 @@ let
     deepin-kwin = callPackage ./core/deepin-kwin { };
     dde-appearance = callPackage ./core/dde-appearance { };
     dde-app-services = callPackage ./core/dde-app-services { };
-    dde-application-manager = qt6Packages.callPackage ./core/dde-application-manager { };
+    dde-application-manager = callPackage ./core/dde-application-manager { };
     dde-control-center = callPackage ./core/dde-control-center { };
     dde-calendar = callPackage ./core/dde-calendar { };
     dde-clipboard = callPackage ./core/dde-clipboard { };

From cf7b36c5f68545ceeec8eaddb1aafd3cd3679449 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:46:45 +0800
Subject: [PATCH 24/49] deepin.dtk6core: 6.0.15 -> 6.0.16

---
 pkgs/desktops/deepin/library/dtk6core/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix
index 8acd1aa98686..ab583e2e45dc 100644
--- a/pkgs/desktops/deepin/library/dtk6core/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6core/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dtk6core";
-  version = "6.0.15";
+  version = "6.0.16";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6core";
     rev = finalAttrs.version;
-    hash = "sha256-zUJFilafR0hNH/Owmuyh6BLBFPbBuFKcHv40fena0GM=";
+    hash = "sha256-m2unpWx8FBvZT8AmdFlzc5dp55kgtDsR62SHF8RwHhU=";
   };
 
   patches = [
@@ -35,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace misc/DtkCoreConfig.cmake.in \
+      --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk6/DCore/bin
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From a1d81d6cfb2aa87e74854e3cac0f712a2e58694c Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:54:00 +0800
Subject: [PATCH 25/49] deepin.dde-file-manager: 6.0.40 -> 6.0.51

---
 .../deepin/core/dde-file-manager/default.nix  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index 42d371628b3e..cfc610420957 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -43,13 +43,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-file-manager";
-  version = "6.0.40";
+  version = "6.0.51";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA=";
+    hash = "sha256-MvrOhdejQPK693wFlqkERuwYM88ALtFNnbyu7H3TI4Q=";
   };
 
   nativeBuildInputs = [
@@ -69,25 +69,25 @@ stdenv.mkDerivation rec {
     patchShebangs .
 
     substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \
-      --replace "/usr/bin/deepin-compressor" "deepin-compressor"
+      --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor"
 
     substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \
-      --replace "/usr/bin/mountavfs" "mountavfs" \
-      --replace "/usr/bin/umountavfs" "umountavfs"
+      --replace-fail "/usr/bin/mountavfs" "mountavfs" \
+      --replace-fail "/usr/bin/umountavfs" "umountavfs"
 
     substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \
-      --replace "/usr" "$out"
+      --replace-fail "/usr" "$out"
 
     substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \
-      --replace "/usr/bin/dde-file-manager" "dde-file-manager" \
-      --replace "/usr/bin/dde-desktop" "dde-desktop"
+      --replace-fail "/usr/bin/dde-file-manager" "dde-file-manager" \
+      --replace-fail "/usr/bin/dde-desktop" "dde-desktop"
 
     substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \
-      --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
+      --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
 
     substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \
       src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \
-      --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds"
+      --replace-fail "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds"
 
     find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \;
   '';

From 751809fb339e6dbffc2eb3cc26a431f05551c34f Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:57:59 +0800
Subject: [PATCH 26/49] deepin.dde-calendar: 5.12.1 -> 5.13.1

---
 pkgs/desktops/deepin/core/dde-calendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
index b244898566e9..59c09cea1b2f 100644
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-calendar";
-  version = "5.12.1";
+  version = "5.13.1";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI=";
+    hash = "sha256-Hn759Cxtzv+HBllA2vdZcH6P8EWZkjawpgkmLiE2+uA=";
   };
 
   patches = [

From 6169f667928539a4bf26b6e7f318488c58aac610 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 14:59:54 +0800
Subject: [PATCH 27/49] deepin.dde-clipboard: 6.0.7 -> 6.0.9

---
 pkgs/desktops/deepin/core/dde-clipboard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
index 78f2fd0da6a2..efa6faf080d2 100644
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-clipboard";
-  version = "6.0.7";
+  version = "6.0.9";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-6CbCor0vgVMsMt8KY2uWrNqOsBEIaz7s2nViiHz+m1g=";
+    hash = "sha256-9sBAurO3v/9HOc5k1RrtdNHusImTHLklpxetLMuQuW4=";
   };
 
   nativeBuildInputs = [

From c4e23c50e5eb21abadc8bd0f4b2fee1b51cbdf7d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:06:30 +0800
Subject: [PATCH 28/49] deepin.dtk6gui: 6.0.15 -> 6.0.16

---
 pkgs/desktops/deepin/library/dtk6gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
index 73638c39e62f..2b8de231eb51 100644
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dtk6gui";
-  version = "6.0.15";
+  version = "6.0.16";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6gui";
     rev = finalAttrs.version;
-    hash = "sha256-B/A3VXPCon+NIUhO+IVGoojACVjut2h0nH5pLdJYufw=";
+    hash = "sha256-fnbCKqeeQE5WBnNJ0D1ihsZswDSJ/Oj98eUXFrOuk+w=";
   };
 
   patches = [

From d536b267bc546b881ba2fe89e13722b21fecb50a Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:07:06 +0800
Subject: [PATCH 29/49] deepin.dtk6widget: 6.0.15 -> 6.0.16

---
 .../deepin/library/dtk6widget/default.nix     |  5 ++---
 .../dtk6widget/fix-build-on-qt-6_7.patch      | 20 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch

diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix
index 3c1870581988..038ab37ab2ff 100644
--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix
@@ -12,19 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dtk6widget";
-  version = "6.0.15";
+  version = "6.0.16";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6widget";
     rev = finalAttrs.version;
-    hash = "sha256-QCdRjkD4JTPecLeZK+Y5U/H9pBgKI4DHRuchz/GymWQ=";
+    hash = "sha256-4WmnO4msQVWAEOzH1zOWfvJl5X+/VKWv4bbZAH//IXg=";
   };
 
   patches = [
     ./fix-pkgconfig-path.patch
     ./fix-pri-path.patch
-    ./fix-build-on-qt-6_7.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch
deleted file mode 100644
index 16d2d2ec9b54..000000000000
--- a/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp
-index a99e17ae..0e1c57f6 100644
---- a/src/widgets/dkeysequenceedit.cpp
-+++ b/src/widgets/dkeysequenceedit.cpp
-@@ -276,13 +276,13 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e)
-     }
- 
-     if (e->modifiers() & Qt::ShiftModifier) {
--        QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
-+        auto possibleKeys = QKeyMapper::possibleKeys(e);
-         int pkTotal = possibleKeys.count();
-         if (!pkTotal)
-             return;
-         bool found = false;
-         for (int i = 0; i < possibleKeys.size(); ++i) {
--            if (possibleKeys.at(i) - nextKey == int(e->modifiers())
-+            if (static_cast<int>(possibleKeys.at(i)) - nextKey == static_cast<int>(e->modifiers())
-                 || (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) {
-                 nextKey = possibleKeys.at(i);
-                 found = true;

From ea314aae72e695bc0a34ddf3d3ee5f91a8500a8a Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:08:34 +0800
Subject: [PATCH 30/49] deepin.dtk6declarative: 6.0.15 -> 6.0.16

---
 pkgs/desktops/deepin/library/dtk6declarative/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
index ecafebf66b71..a2ba93744592 100644
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dtk6declarative";
-  version = "6.0.15";
+  version = "6.0.16";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dtk6declarative";
     rev = finalAttrs.version;
-    hash = "sha256-euHEfK2N2jtWMzeajgvTnHSl39zXwp7I0cQIqZRVGZ0=";
+    hash = "sha256-OvLmK/UAuF9VEnT7DO3/m7S9Xjze5WQuZAYBTcgZbyk=";
   };
 
   patches = [

From 7b14239eba1fb7ddd0f2170fce36859b47c7c323 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:37:49 +0800
Subject: [PATCH 31/49] deepin.go-lib: remove

---
 pkgs/desktops/deepin/default.nix              |  2 +-
 .../deepin/go-package/go-lib/default.nix      | 42 -------------------
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/go-package/go-lib/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index f9beb284c94c..7e0a533bc1dc 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -72,7 +72,6 @@ let
     deepin-screensaver = callPackage ./apps/deepin-screensaver { };
 
     #### Go Packages
-    go-lib = callPackage ./go-package/go-lib { };
     go-gir-generator = callPackage ./go-package/go-gir-generator { };
     go-dbus-factory = callPackage ./go-package/go-dbus-factory { };
     dde-api = callPackage ./go-package/dde-api { };
@@ -99,6 +98,7 @@ let
   } // lib.optionalAttrs config.allowAliases {
     dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
     dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
+    go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
   };
 in
 lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/deepin/go-package/go-lib/default.nix b/pkgs/desktops/deepin/go-package/go-lib/default.nix
deleted file mode 100644
index 751cba56ce35..000000000000
--- a/pkgs/desktops/deepin/go-package/go-lib/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
-, runtimeShell
-}:
-
-stdenv.mkDerivation rec {
-  pname = "go-lib";
-  version = "5.8.27";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-ZV5zWu7UvNKVcVo79/iKMhF4H09rGyDCvEL61H05lZc=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "fix_IsDir_for_symlink.patch";
-      url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch";
-      sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4=";
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/gocode/src/github.com/linuxdeepin/go-lib
-    cp -a * $out/share/gocode/src/github.com/linuxdeepin/go-lib
-    rm -r $out/share/gocode/src/github.com/linuxdeepin/go-lib/debian
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Library containing many useful go routines for things such as glib, gettext, archive, graphic, etc";
-    homepage = "https://github.com/linuxdeepin/go-lib";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
-  };
-}

From 8a11f404b40d0c297ab6abda9288b38ef11f3b0e Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:39:24 +0800
Subject: [PATCH 32/49] deepin.go-gir-generator: remove

---
 pkgs/desktops/deepin/default.nix              |  2 +-
 .../go-package/go-gir-generator/default.nix   | 44 -------------------
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/go-package/go-gir-generator/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 7e0a533bc1dc..9bf8bf849c62 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -72,7 +72,6 @@ let
     deepin-screensaver = callPackage ./apps/deepin-screensaver { };
 
     #### Go Packages
-    go-gir-generator = callPackage ./go-package/go-gir-generator { };
     go-dbus-factory = callPackage ./go-package/go-dbus-factory { };
     dde-api = callPackage ./go-package/dde-api { };
     dde-daemon = callPackage ./go-package/dde-daemon { };
@@ -99,6 +98,7 @@ let
     dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
     dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
     go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
+    go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
   };
 in
 lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix
deleted file mode 100644
index 45c486d606d3..000000000000
--- a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, go
-, pkg-config
-, libgudev
-, gobject-introspection
-}:
-
-stdenv.mkDerivation rec {
-  pname = "go-gir-generator";
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-lFseui/M3+TyfYoa+rnS0cGhN6gdLrgpzgOwqzYcyPk=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    go
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    libgudev
-  ];
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "GOCACHE=$(TMPDIR)/go-cache"
-  ];
-
-  meta = with lib; {
-    description = "Generate static golang bindings for GObject";
-    mainProgram = "gir-generator";
-    homepage = "https://github.com/linuxdeepin/go-gir-generator";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
-  };
-}

From 2cf6e466a72921fd6bcaa6347316a16f59a2649d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:41:47 +0800
Subject: [PATCH 33/49] deepin.go-dbus-factory: remove

---
 pkgs/desktops/deepin/default.nix              |  2 +-
 .../go-package/go-dbus-factory/default.nix    | 26 -------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 9bf8bf849c62..a478e3608c5e 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -72,7 +72,6 @@ let
     deepin-screensaver = callPackage ./apps/deepin-screensaver { };
 
     #### Go Packages
-    go-dbus-factory = callPackage ./go-package/go-dbus-factory { };
     dde-api = callPackage ./go-package/dde-api { };
     dde-daemon = callPackage ./go-package/dde-daemon { };
     deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
@@ -99,6 +98,7 @@ let
     dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
     go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
     go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
+    go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
   };
 in
 lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix
deleted file mode 100644
index eed8208367b0..000000000000
--- a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-}:
-
-stdenv.mkDerivation rec {
-  pname = "go-dbus-factory";
-  version = "2.0.8";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY=";
-  };
-
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  meta = with lib; {
-    description = "Generate go binding of D-Bus interfaces";
-    homepage = "https://github.com/linuxdeepin/go-dbus-factory";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
-  };
-}

From ccbf715d43d813d1686e225a5db20d4a43b25c34 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:47:11 +0800
Subject: [PATCH 34/49] deepin: don't install deepin-turbo as it's unmaintained

---
 nixos/modules/services/x11/desktop-managers/deepin.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index 30bd14adb419..bd3484abfb9d 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -141,7 +141,6 @@ in
             dtkdeclarative
             qt5platform-plugins
             deepin-pw-check
-            deepin-turbo
 
             dde-account-faces
             deepin-icon-theme

From cab913114a0591d77dac60f93b7d4c7fecfee74c Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:55:59 +0800
Subject: [PATCH 35/49] deepin: new deepin 23 components

---
 nixos/modules/services/x11/desktop-managers/deepin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index bd3484abfb9d..e39f91f60d1c 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -151,7 +151,7 @@ in
             deepin-desktop-base
 
             startdde
-            dde-dock
+            dde-shell
             dde-launchpad
             dde-session-ui
             dde-session-shell

From 702ee1d7403ef564dcbe3aca980cc435e129b372 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 16:10:51 +0800
Subject: [PATCH 36/49] deepin.qt6platform-plugins: init at 6.0.16

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../library/qt6platform-plugins/default.nix   | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/desktops/deepin/library/qt6platform-plugins/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index a478e3608c5e..c41b640b5035 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -28,6 +28,7 @@ let
     dtk6widget = callPackage ./library/dtk6widget { };
     dtk6declarative = callPackage ./library/dtk6declarative { };
     dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
+    qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
 
     #### CORE
     deepin-kwin = callPackage ./core/deepin-kwin { };
diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
new file mode 100644
index 000000000000..c5c7d7f6e98e
--- /dev/null
+++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, pkg-config
+, mtdev
+, cairo
+, xorg
+, qt6Packages
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qt6platform-plugins";
+  version = "6.0.16";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    hash = "sha256-0/hwsdB0UNzlekxfdKeItW2lXTMTzEtBR2hS153woLo=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "support-to-qt_6_7_1.patch";
+      url = "https://github.com/linuxdeepin/qt6platform-plugins/commit/88ba963d11355391d62501cd5a6da9e3d5e9ddce.patch";
+      hash = "sha256-9NiKIdY9PXBYgKQGRf5pFV+tNrHe7BjbVrnwII9lLFI=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    mtdev
+    cairo
+    xorg.libSM
+    qt6Packages.qtbase
+  ];
+
+  cmakeFlags = [
+    "-DDTK_VERSION=${version}"
+    "-DINSTALL_PATH=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}/platforms"
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Qt platform plugins for DDE";
+    homepage = "https://github.com/linuxdeepin/qt6platform-plugins";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+}

From be6b9d7bd3c815f34611084c1cf3ab70bc4a77dd Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 16:23:22 +0800
Subject: [PATCH 37/49] deepin.qt6integration: init at 6.0.16

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/library/qt6integration/default.nix | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/desktops/deepin/library/qt6integration/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index c41b640b5035..77811b417663 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -29,6 +29,7 @@ let
     dtk6declarative = callPackage ./library/dtk6declarative { };
     dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
     qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
+    qt6integration = callPackage ./library/qt6integration { };
 
     #### CORE
     deepin-kwin = callPackage ./core/deepin-kwin { };
diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix
new file mode 100644
index 000000000000..3f6f9dff964b
--- /dev/null
+++ b/pkgs/desktops/deepin/library/qt6integration/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, dtk6widget
+, qt6Packages
+, gtest
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qt6integration";
+  version = "6.0.16";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    hash = "sha256-2QNHJZ4Bz21UyuRhD/9gC7Ls9GggHp4QwtFzoxyyAL4=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    dtk6widget
+    qt6Packages.qtbase
+    gtest
+  ];
+
+  cmakeFlags = [
+    "-DDTK_VERSION=${version}"
+    "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}"
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Qt platform theme integration plugins for DDE";
+    homepage = "https://github.com/linuxdeepin/qt6integration";
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+}

From 71b88333b6d747074a4e505a1f5976155c4d1b4d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 2 Jun 2024 04:50:32 +0800
Subject: [PATCH 38/49] deepin.startdde: 6.0.13 -> 6.0.14

---
 pkgs/desktops/deepin/go-package/startdde/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix
index 63ebea8f08ab..1f582a43b80a 100644
--- a/pkgs/desktops/deepin/go-package/startdde/default.nix
+++ b/pkgs/desktops/deepin/go-package/startdde/default.nix
@@ -19,13 +19,13 @@
 
 buildGoModule rec {
   pname = "startdde";
-  version = "6.0.13";
+  version = "6.0.14";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U=";
+    hash = "sha256-2aPQaH78+J18a/SXA2i+gQ5iypsjNhcYaORGN2qkz7c=";
   };
 
   vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE=";

From ca86ee82e4a8f5a3954b6611b9c814fef70caa96 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 2 Jun 2024 04:51:05 +0800
Subject: [PATCH 39/49] deepin.dde-api: 6.0.9 -> 6.0.11

---
 pkgs/desktops/deepin/go-package/dde-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix
index 2c7c6276cff6..890ce1b64f75 100644
--- a/pkgs/desktops/deepin/go-package/dde-api/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix
@@ -20,13 +20,13 @@
 
 buildGoModule rec {
   pname = "dde-api";
-  version = "6.0.9";
+  version = "6.0.11";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY=";
+    hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM=";
   };
 
   vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q=";

From 88674ae89c97f8c44afe041100490106ecee4c8a Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 4 Jun 2024 15:49:00 +0800
Subject: [PATCH 40/49] deepin.dde-grand-search: init at 5.4.9

---
 .../deepin/core/dde-grand-search/default.nix  | 81 +++++++++++++++++++
 .../fix-dbus-path-for-daemon.diff             |  9 +++
 .../patch-check-v23-interface.diff            | 13 +++
 pkgs/desktops/deepin/default.nix              |  1 +
 4 files changed, 104 insertions(+)
 create mode 100644 pkgs/desktops/deepin/core/dde-grand-search/default.nix
 create mode 100644 pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff
 create mode 100644 pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff

diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
new file mode 100644
index 000000000000..0eb341204ad7
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -0,0 +1,81 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, qttools
+, pkg-config
+, wrapQtAppsHook
+, dtkwidget
+, dde-qt-dbus-factory
+, dde-dock
+, deepin-pdfium
+, qt5integration
+, qt5platform-plugins
+, taglib
+, ffmpeg
+, ffmpegthumbnailer
+, dbus
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dde-grand-search";
+  version = "5.4.9";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    qttools
+    pkg-config
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    dtkwidget
+    dde-dock
+    dde-qt-dbus-factory
+    deepin-pdfium
+    qt5integration
+    qt5platform-plugins
+    taglib
+    ffmpeg
+    ffmpegthumbnailer
+  ];
+
+  patches = [
+    # This patch revert the commit e6735e7
+    # FIXME: why StartManager can't work, is dde-api-proxy still required?
+    ./fix-dbus-path-for-daemon.diff
+    ./patch-check-v23-interface.diff
+  ];
+
+  postPatch = ''
+    # fix access permit to daemon
+    substituteInPlace src/libgrand-search-daemon/dbusservice/grandsearchinterface.cpp \
+      --replace-fail "/usr/bin/dde-grand-search" "$out/bin/.dde-grand-search-wrapped"
+
+    for file in $(grep -rl "/usr/bin/dde-grand-search"); do
+      substituteInPlace $file --replace-fail "/usr/bin/dde-grand-search" "$out/bin/dde-grand-search"
+    done
+
+    substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
+  '';
+
+  cmakeFlags = [
+    "-DVERSION=${version}"
+    "-DNIX_DEEPIN_VERSION=23"
+  ];
+
+  meta = {
+    description = "System-wide desktop search for DDE";
+    homepage = "https://github.com/linuxdeepin/dde-grand-search";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+}
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff
new file mode 100644
index 000000000000..dd036bf6ec5e
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff
@@ -0,0 +1,9 @@
+diff --git a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
+index 14823cb..33dd51e 100644
+--- a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
++++ b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=com.deepin.dde.daemon.GrandSearch
+-Exec=/usr/bin/dbus-send --print-reply --session --dest=com.deepin.SessionManager /com/deepin/StartManager com.deepin.StartManager.Launch string:/usr/share/applications/dde-grand-search-daemon.desktop
++Exec=@out@/bin/dde-grand-search-daemon
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff
new file mode 100644
index 000000000000..bcb9f2b6c0c2
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76dac13..f43600e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ 
+ #Indentify the version
+ find_package(DtkCMake REQUIRED)
+-if (${DEEPIN_OS_VERSION} MATCHES "23")
++if (${NIX_DEEPIN_VERSION} MATCHES "23")
+     add_definitions(-DCOMPILE_ON_V23)
+     set(COMPLIE_ON_V23 TRUE)
+     message("COMPILE ON v23")
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 77811b417663..5d4211c28c5a 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -52,6 +52,7 @@ let
     dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
     dde-widgets = callPackage ./core/dde-widgets { };
     dde-shell = callPackage ./core/dde-shell { };
+    dde-grand-search = callPackage ./core/dde-grand-search { };
 
     #### Dtk Application
     deepin-album = callPackage ./apps/deepin-album { };

From 9fa4925d0e58faa90892ea77e9574adf67a4110b Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 2 Jun 2024 04:51:33 +0800
Subject: [PATCH 41/49] deepin.deepin-desktop-schemas: 6.0.5 -> 6.0.6

---
 .../deepin/go-package/deepin-desktop-schemas/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
index 4dab20303d8c..61d7c18dca2d 100644
--- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "deepin-desktop-schemas";
-  version = "6.0.5";
+  version = "6.0.6";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-lvAY0CJ+EohMK16fwIkB7Jq7gTpMhDimPYs9b/IklA4=";
+    hash = "sha256-zheIZ3Z0vm0/0F9hFcdlYwhE3/PRunxUCT8KSe4T3wk=";
   };
 
   vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ=";

From bbd2c1dae162673bdc21366a6c46e4a74f050c70 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 4 Jun 2024 15:52:38 +0800
Subject: [PATCH 42/49] deepin.dde-gsettings-schemas: update

---
 pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
index c1a26e100a29..5003129c1ea9 100644
--- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
+++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
@@ -3,7 +3,7 @@
 , runCommand
 , glib
 , gtk3
-, dde-dock
+, dde-grand-search
 , startdde
 , dde-session-shell
 , dde-file-manager
@@ -17,7 +17,7 @@
 
 let
   gsettingsOverridePackages = [
-    dde-dock
+    dde-grand-search
     startdde
     dde-session-shell
     dde-file-manager

From 9cf457ffe76669b7befd95004e5b49a0132ac5a9 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:22:49 +0800
Subject: [PATCH 43/49] deepin.dde-launchpad: 0.6.10 -> 0.7.0

---
 pkgs/desktops/deepin/core/dde-launchpad/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index d018eac33c83..19f3210e99e6 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -4,21 +4,21 @@
 , cmake
 , pkg-config
 , qt6Packages
+, qt6integration
+, qt6platform-plugins
 , dtk6declarative
-, appstream-qt
-, kitemmodels
 , dde-shell
 }:
 
 stdenv.mkDerivation rec {
   pname = "dde-launchpad";
-  version = "0.6.10";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-MVSWcUqbZDloKKfly+E7HLObpJlj0Oq8G8pP5Lkpriw=";
+    hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM=";
   };
 
   nativeBuildInputs = [
@@ -29,10 +29,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    qt6integration
+    qt6platform-plugins
     dtk6declarative
     dde-shell
-    #kitemmodels
-  ] ++ (with qt6Packages ; [
+  ] ++ (with qt6Packages; [
     qtbase
     qtsvg
     qtwayland

From d8cb64ad2561302b01194dc6db4eef52820a6eb8 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 31 May 2024 15:15:50 +0800
Subject: [PATCH 44/49] deepin.dde-shell: 0.0.17 -> 0.0.23-unstable-2024-06-11

---
 .../deepin/core/dde-shell/default.nix         | 45 +++++++++++++++----
 .../dde-shell/disable-plugins-use-qt5.diff    |  2 +-
 .../fix-translations-cant-install.diff        | 24 ----------
 .../deepin/core/dde-shell/only-use-qt6.diff   | 26 +++++++++++
 4 files changed, 64 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff
 create mode 100644 pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff

diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index c6bb4337ea98..8a66181c2fc9 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -8,30 +8,44 @@
 , wayland-scanner
 , dtk6declarative
 , dtk6widget
+, dde-qt-dbus-factory
 , qt6Packages
-, libsForQt5
+, qt6integration
+, qt6platform-plugins
+, kdePackages
 , wayland
 , wayland-protocols
 , yaml-cpp
+, xorg
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dde-shell";
-  version = "0.0.17";
+  version = "0.0.23-unstable-2024-06-11";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-shell";
-    rev = "e666b487d978d34c8f7f7488d42482397755615c";
-    hash = "sha256-DvcxCLKTddUtPELMN7oBcQPSbHoNWEmXYLeCo3O8rOg=";
+    rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3";
+    hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw=";
   };
 
   patches = [
     ./disable-plugins-use-qt5.diff
-    ./fix-translations-cant-install.diff
     ./fix-path-for-nixos.diff
+    ./only-use-qt6.diff # remove in next release
   ];
 
+  postPatch = ''
+    for file in $(grep -rl "/usr/lib/dde-dock/tmp"); do
+      substituteInPlace $file --replace-fail "/usr/lib/dde-dock/tmp" "/run/current-system/sw/lib/dde-dock/tmp"
+    done
+
+    for file in $(grep -rl "/usr/lib/deepin-daemon"); do
+      substituteInPlace $file --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
+    done
+  '';
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
@@ -42,17 +56,32 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    qt6Packages.qtbase
-    qt6Packages.qtwayland
     dtk6declarative
     dtk6widget
+    dde-qt-dbus-factory
+    qt6Packages.qtbase
+    qt6Packages.qtwayland
+    qt6Packages.qtsvg
+    qt6platform-plugins
+    kdePackages.networkmanager-qt
     wayland
     wayland-protocols
     yaml-cpp
+    xorg.libXcursor
+    xorg.libXres
   ];
 
+  env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+
   cmakeFlags = [
-    (lib.cmakeFeature "SYSTEMD_USER_UNIT_DIR" "${placeholder "out"}/lib/systemd/user")
+    "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}"
+  ];
+
+  qtWrapperArgs = [
+     # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH
+     "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}"
+     "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
+     "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
   ];
 
   meta = {
diff --git a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
index 0625bcf2dbce..0e1107abc7dc 100644
--- a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
+++ b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
@@ -7,7 +7,7 @@ index 1a20179..83c5ff2 100644
  add_subdirectory(showdesktop)
  add_subdirectory(taskmanager)
 -add_subdirectory(tray)
-+#add_subdirectory(tray)
++ add_subdirectory(tray)
  add_subdirectory(multitaskview)
  
  # dock plugin load program
diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff b/pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff
deleted file mode 100644
index 691f2d21ff9a..000000000000
--- a/pkgs/desktops/deepin/core/dde-shell/fix-translations-cant-install.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/cmake/DDEShellPackageMacros.cmake b/cmake/DDEShellPackageMacros.cmake
-index c9fa45a..b9d9d2c 100644
---- a/cmake/DDEShellPackageMacros.cmake
-+++ b/cmake/DDEShellPackageMacros.cmake
-@@ -73,9 +73,9 @@ function(ds_handle_package_translation)
-     )
- 
-     set(package_dirs ${PROJECT_BINARY_DIR}/packages/${_config_PACKAGE}/)
--    set_source_files_properties(${TRANSLATION_FILES}
--        PROPERTIES OUTPUT_LOCATION "${package_dirs}/translations"
--    )
-+    #set_source_files_properties(${TRANSLATION_FILES}
-+    #    PROPERTIES OUTPUT_LOCATION "${package_dirs}/translations"
-+    #)
- 
-     add_custom_target(${_config_PACKAGE}_translation ALL
-         SOURCES ${TRANSLATION_FILES}
-@@ -89,4 +89,4 @@ function(ds_handle_package_translation)
- 
-     # /usr/share/dde-shell/org.deepin.xxx/translations/org.deepin.xxx.qm
-     install(FILES ${TRANSLATED_FILES} DESTINATION ${DDE_SHELL_TRANSLATION_INSTALL_DIR}/${_config_PACKAGE}/translations)
--endfunction()
-\ No newline at end of file
-+endfunction()
diff --git a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff
new file mode 100644
index 000000000000..cdfad415403e
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff
@@ -0,0 +1,26 @@
+diff --git a/panels/dock/tray/CMakeLists.txt b/panels/dock/tray/CMakeLists.txt
+index ed6da31..1a33d06 100644
+--- a/panels/dock/tray/CMakeLists.txt
++++ b/panels/dock/tray/CMakeLists.txt
+@@ -10,7 +10,7 @@ endif()
+ 
+ # project(dde-dock)
+ 
+-find_package(DtkTools REQUIRED)
++find_package(Dtk6Tools REQUIRED)
+ 
+ set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+ set(CMAKE_HAVE_THREADS_LIBRARY 1)
+diff --git a/panels/dock/tray/frame/CMakeLists.txt b/panels/dock/tray/frame/CMakeLists.txt
+index b55aa48..0a397cb 100644
+--- a/panels/dock/tray/frame/CMakeLists.txt
++++ b/panels/dock/tray/frame/CMakeLists.txt
+@@ -22,7 +22,7 @@ find_package(Qt6WaylandClient REQUIRED)
+ find_package(Dtk6Gui REQUIRED)
+ find_package(Dtk6Core REQUIRED)
+ find_package(Dtk6Widget REQUIRED)
+-find_package(DtkCMake REQUIRED)
++find_package(Dtk6CMake REQUIRED)
+ # find_package(dbusmenu-qt6 REQUIRED)
+ find_package(ECM REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})

From 2550a743850900402f936990199bb47c43ec58e9 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 4 Jun 2024 16:33:49 +0800
Subject: [PATCH 45/49] deepin-anything: init at 6.1.9

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/tools/deepin-anything/default.nix  | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/desktops/deepin/tools/deepin-anything/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 5d4211c28c5a..6c4f7a3b20d7 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -84,6 +84,7 @@ let
     #### TOOLS
     dde-device-formatter = callPackage ./tools/dde-device-formatter { };
     deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
+    deepin-anything = callPackage ./tools/deepin-anything { };
 
     #### ARTWORK
     dde-account-faces = callPackage ./artwork/dde-account-faces { };
diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
new file mode 100644
index 000000000000..cfcbb6f1c1f7
--- /dev/null
+++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wrapQtAppsHook
+, udisks2-qt5
+, util-linux
+, libnl
+, glib
+, pcre
+}:
+
+stdenv.mkDerivation rec {
+  pname = "deepin-anything";
+  version = "6.1.9";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "deepin-anything";
+    rev = version;
+    hash = "sha256-OYPsUXMjuU6gG+EzyYl640+2/59n8D5V906CVGwn6Bo=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail 'add_subdirectory("kernelmod")' " "
+    substituteInPlace src/server/backend/CMakeLists.txt \
+      --replace-fail "/usr" "$out" \
+      --replace-fail "/etc" "$out/etc"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    udisks2-qt5
+    util-linux
+    libnl
+    glib
+    pcre
+  ];
+
+  meta = {
+    description = "Deepin Anything file search tool";
+    homepage = "https://github.com/linuxdeepin/deepin-anything";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+}

From f670b4741560caaaf821f32cd4dc4a543855fe79 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 4 Jun 2024 17:10:29 +0800
Subject: [PATCH 46/49] deepin-anything-module: init

---
 .../linux/deepin-anything-module/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/linux/deepin-anything-module/default.nix

diff --git a/pkgs/os-specific/linux/deepin-anything-module/default.nix b/pkgs/os-specific/linux/deepin-anything-module/default.nix
new file mode 100644
index 000000000000..5ee7c8a35e81
--- /dev/null
+++ b/pkgs/os-specific/linux/deepin-anything-module/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, deepin
+, kernel
+}:
+
+stdenv.mkDerivation {
+  pname = "deepin-anything-module";
+  inherit (deepin.deepin-anything) version src;
+  sourceRoot = "${deepin.deepin-anything.src.name}/src/kernelmod";
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  buildPhase = ''
+    runHook preBuild
+    make kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D -t $out/lib/modules/${kernel.modDirVersion}/extra *.ko
+    runHook postInstall
+  '';
+
+  meta = deepin.deepin-anything.meta // {
+    description = "Deepin Anything file search tool (kernel modules)";
+  };
+}
+
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index bce80c21b32b..56a7a2c65d8c 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -336,6 +336,8 @@ in {
 
     cpupower = callPackage ../os-specific/linux/cpupower { };
 
+    deepin-anything-module = callPackage ../os-specific/linux/deepin-anything-module { };
+
     ddcci-driver = callPackage ../os-specific/linux/ddcci { };
 
     dddvb = callPackage ../os-specific/linux/dddvb { };

From 6ce484389329ebfdd19ddc9024b3281b5e7062bf Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 4 Jun 2024 17:27:22 +0800
Subject: [PATCH 47/49] nixos/modules: init deepin-anything

---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/deepin/deepin-anything.nix       | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 nixos/modules/services/desktops/deepin/deepin-anything.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 159696be8b6d..9db09d5f8b08 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -474,6 +474,7 @@
   ./services/desktops/bamf.nix
   ./services/desktops/blueman.nix
   ./services/desktops/cpupower-gui.nix
+  ./services/desktops/deepin/deepin-anything.nix
   ./services/desktops/deepin/dde-api.nix
   ./services/desktops/deepin/app-services.nix
   ./services/desktops/deepin/dde-daemon.nix
diff --git a/nixos/modules/services/desktops/deepin/deepin-anything.nix b/nixos/modules/services/desktops/deepin/deepin-anything.nix
new file mode 100644
index 000000000000..4e88a789551b
--- /dev/null
+++ b/nixos/modules/services/desktops/deepin/deepin-anything.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, lib, ... }:
+
+{
+
+  meta = {
+    maintainers = lib.teams.deepin.members;
+  };
+
+  options = {
+
+    services.deepin.deepin-anything = {
+
+      enable = lib.mkEnableOption "deepin anything file search tool";
+
+    };
+
+  };
+
+  config = lib.mkIf config.services.deepin.dde-api.enable {
+    environment.systemPackages = [ pkgs.deepin.deepin-anything ];
+
+    services.dbus.packages = [ pkgs.deepin.deepin-anything ];
+
+    users.groups.deepin-anything = { };
+
+    users.users.deepin-anything = {
+      description = "Deepin Anything Server";
+      home = "/var/lib/deepin-anything";
+      createHome = true;
+      group = "deepin-anything";
+      isSystemUser = true;
+    };
+
+    boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything-module ];
+    boot.kernelModules = [ "vfs_monitor" ];
+  };
+
+}

From 8e793b457aa62035b71209ccc839dd8f3653c860 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 2 Jun 2024 07:34:06 +0800
Subject: [PATCH 48/49] deepin.nix: update

---
 .../services/x11/desktop-managers/deepin.nix       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index e39f91f60d1c..1151178a8824 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -53,6 +53,7 @@ in
       services.deepin.dde-daemon.enable = mkForce true;
       services.deepin.dde-api.enable = mkForce true;
       services.deepin.app-services.enable = mkForce true;
+      services.deepin.deepin-anything.enable = mkDefault true;
 
       services.colord.enable = mkDefault true;
       services.accounts-daemon.enable = mkDefault true;
@@ -98,11 +99,12 @@ in
         "/share/dsg"
         "/share/deepin-themes"
         "/share/deepin"
+        "/share/dde-shell"
       ];
 
       environment.etc = {
         "deepin-installer.conf".text = ''
-          system_info_vendor_name="Copyright (c) 2003-2023 NixOS contributors"
+          system_info_vendor_name="Copyright (c) 2003-2024 NixOS contributors"
         '';
       };
 
@@ -140,6 +142,9 @@ in
             dtkwidget
             dtkdeclarative
             qt5platform-plugins
+            qt6platform-plugins
+            qt5integration
+            qt6integration
             deepin-pw-check
 
             dde-account-faces
@@ -151,6 +156,8 @@ in
             deepin-desktop-base
 
             startdde
+            # TODO: should remove dde-dock, but dde-shell still need it's dconfig
+            dde-dock
             dde-shell
             dde-launchpad
             dde-session-ui
@@ -170,6 +177,7 @@ in
             dde-appearance
             dde-application-manager
             deepin-service-manager
+            dde-grand-search
           ];
           optionalPackages = [
             onboard # dde-dock plugin
@@ -193,7 +201,7 @@ in
         ++ utils.removePackagesByName optionalPackages config.environment.deepin.excludePackages;
 
       services.dbus.packages = with pkgs.deepin; [
-        dde-dock
+        dde-shell
         dde-launchpad
         dde-session-ui
         dde-session-shell
@@ -208,9 +216,11 @@ in
         dde-appearance
         dde-application-manager
         deepin-service-manager
+        dde-grand-search
       ];
 
       systemd.packages = with pkgs.deepin; [
+        dde-shell
         dde-launchpad
         dde-file-manager
         dde-calendar

From 4f1aacd85893252150cb4be157c108bedc1dc503 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Mon, 24 Jun 2024 22:33:41 +0800
Subject: [PATCH 49/49] deepin.dde-grand-search: fix build on aarch64-linux

---
 pkgs/desktops/deepin/core/dde-grand-search/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
index 0eb341204ad7..8b653004f27a 100644
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -14,6 +14,7 @@
 , taglib
 , ffmpeg
 , ffmpegthumbnailer
+, pcre
 , dbus
 }:
 
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
     taglib
     ffmpeg
     ffmpegthumbnailer
+    pcre
   ];
 
   patches = [