diff options
Diffstat (limited to 'pkgs/desktops/deepin/core')
16 files changed, 61 insertions, 68 deletions
diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix index 4c27ced09d56..64713d08b11f 100644 --- a/pkgs/desktops/deepin/core/dde-app-services/default.nix +++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-app-services"; - version = "1.0.23"; + version = "1.0.25"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-INxbRDpG3MqPW6IMTqEagDCGo7vwxkR6D1+lcWdjO3w="; + hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix index fef56b3978f7..01fd610099c7 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dde-appearance"; - version = "1.1.6"; + version = "1.1.25"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7oRbydLXw8yRzi9L1GH/q0cjMY/DLyWbj4RUSyNpVNM="; + hash = "sha256-H9TvWF6Q0lX4GF4mQ71E3SUqWbhH7dzHIlScovbN7lM="; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { substituteInPlace src/service/modules/api/themethumb.cpp \ --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" - substituteInPlace src/service/dbus/deepinwmfaker.cpp \ + substituteInPlace fakewm/dbus/deepinwmfaker.cpp \ --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" substituteInPlace src/service/modules/api/locale.cpp \ diff --git a/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff b/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff index 14fb527c7ef4..3ed997dc0cc5 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff +++ b/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff @@ -11,10 +11,10 @@ index b612e6e..371f966 100644 "serial": 0, "flags": [], "name": "Background_Uris", -diff --git a/src/service/dbus/deepinwmfaker.cpp b/src/service/dbus/deepinwmfaker.cpp +diff --git a/fakewm/dbus/deepinwmfaker.cpp b/fakewm/dbus/deepinwmfaker.cpp index 5d455fa..40ec608 100644 ---- a/src/service/dbus/deepinwmfaker.cpp -+++ b/src/service/dbus/deepinwmfaker.cpp +--- a/fakewm/dbus/deepinwmfaker.cpp ++++ b/fakewm/dbus/deepinwmfaker.cpp @@ -54,13 +54,13 @@ Q_GLOBAL_STATIC_WITH_ARGS(QGSettings, _gsettings_dde_zone, ("com.deepin.dde.zone #define KWinDBusCompositorInterface "org.kde.kwin.Compositing" diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index 0949bc6e4993..865352f92475 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -1,42 +1,36 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook , qtbase -, dtkwidget -, dde-polkit-agent -, gsettings-qt -, libcap -, jemalloc -, xorg -, iconv }: stdenv.mkDerivation rec { pname = "dde-application-manager"; - version = "1.0.19"; + version = "1.1.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-1P265xqlL/wML66nKdfTgkRx6MCpLwrt5rXu+CyeShU="; + hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U="; }; - # remove this patch after next release - postPatch = '' - substituteInPlace src/modules/mimeapp/mime_app.cpp src/modules/launcher/common.h src/service/main.cpp \ - misc/dconf/com.deepin.dde.appearance.json \ - --replace "/usr/share" "/run/current-system/sw/share" - - substituteInPlace src/lib/dlocale.cpp --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias" - - for file in $(grep -rl "/usr/bin"); do - substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/" - done - ''; + 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 @@ -46,12 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase - dtkwidget - gsettings-qt - libcap - jemalloc - xorg.libXdmcp - xorg.libXres ]; meta = with lib; { diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index a9a3af0adee1..930b75a65644 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.11.1"; + version = "5.12.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-EQcB+a0dK2c6NdvGFbyp65a8nN2PmOpZLWx61UDOTJg="; + hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI="; }; patches = [ diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index f397e9ca2837..cca8a03e771f 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -17,19 +17,20 @@ , polkit-qt , libxcrypt , librsvg +, gtest , runtimeShell , dbus }: stdenv.mkDerivation rec { pname = "dde-control-center"; - version = "6.0.28"; + version = "6.0.44"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-kgQ4ySiYtaklOqER56QtKD9lk1CnRSEAU4QPHycl9eI="; + hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0="; }; postPatch = '' @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { polkit-qt libxcrypt librsvg + gtest ]; cmakeFlags = [ diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix index 5ea7da4ed201..39aa5492a44d 100644 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "dde-dock"; - version = "6.0.22"; + version = "6.0.35"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-fhc2faiPH35ZKw6SCoGTz+6mgxabNpCFQeY2p68Ba5w="; + hash = "sha256-ATC/Ze6GyjT92eCgAt9g2FIQbXLVHUMuXuAslNnbkCE="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix index a197980c8d74..552fa748d51f 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , runtimeShell , dtkwidget , qt5integration @@ -44,13 +43,13 @@ stdenv.mkDerivation rec { pname = "dde-file-manager"; - version = "6.0.31"; + version = "6.0.40"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM="; + hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA="; }; nativeBuildInputs = [ @@ -63,13 +62,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; patches = [ - ./use_v23_dbus_interface.diff - - (fetchpatch { - name = "use-pkgconfig-to-check-mount.patch"; - url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch"; - hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU="; - }) + ./patch_check_v23_interface.diff ]; postPatch = '' @@ -132,6 +125,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" + "-DNIX_DEEPIN_VERSION=23" + "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff b/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff index 5a42ecd4a1f5..c41306f59031 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff +++ b/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e93d3ad..94e3eca 100644 +index 8a8cfb079..34092aa57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +@@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) endif() #Indentify the version -if (${DEEPIN_OS_VERSION} MATCHES "23") -+if (TRUE) ++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/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index a6104d61c922..d57609bea945 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -15,15 +15,20 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.3.0"; + version = "0.4.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-8m0DjQYih3hB/n2VHuJgUYBe8tpGwBU0NdkLxr1OsFc="; + hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY="; }; + postPatch = '' + substituteInPlace desktopintegration.cpp \ + --replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h" + ''; + nativeBuildInputs = [ cmake qttools diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index 24d46698765e..f9d97f735a62 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.15"; + version = "2.0.21"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-AMuWEz3Eyw0tG0srLWpqS7MO7Z4ZzIay4z59cZQZU0o="; + hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix index 48479c6893ea..b30840f74ff3 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.10"; + version = "6.0.17"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-h4X3RZe7+CxVeFmk/7+7K4d/2D1+jhECKQaxl4TsuvM="; + hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index a732589d7ea1..190ad0bbc704 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.10"; + version = "6.0.16"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-JwktVbwWdfqURhZuEFdB5oaKMsBZu5DekpZ2WGpcL4Q="; + hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix index 72ae99f8c843..0e919c144d46 100644 --- a/pkgs/desktops/deepin/core/dde-session/default.nix +++ b/pkgs/desktops/deepin/core/dde-session/default.nix @@ -15,16 +15,19 @@ stdenv.mkDerivation rec { pname = "dde-session"; - version = "1.1.9"; + version = "1.2.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-CyHvvNALXe4fOMjD48By/iaU6/xNUhH9yG19Ob3bHy0="; + hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E="; }; postPatch = '' + substituteInPlace misc/CMakeLists.txt \ + --replace "/etc" "$out/etc" + # Avoid using absolute path to distinguish applications substituteInPlace src/dde-session/impl/sessionmanager.cpp \ --replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \ diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix index 975cb978e7a7..f071d4f63fc0 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.14"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-bmhT7UhMXtC5wlRtwlVnGjoq8rUQcDSk4rGQ0Xrz9ZI="; + hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix index 03e40357317c..f31a0a57fb7b 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.11"; + version = "5.25.15"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-J92T1hsRmmtkjF9OPsrikRtd7bQSEG88UOYu+BHUSx0="; + hash = "sha256-aI5wHEFfvZeoz4ykw9dVx/9e96T1Yahs4YZNutv+CYM="; }; patches = [ |