From 312e701b7072a3140d0dd64bcf580a72078bc573 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 13:52:46 +0800 Subject: [PATCH 1/9] deepin.dtkcommon: 5.6.32 -> 5.7.13 --- 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 b7f7523abb9f..9ee627aa34d5 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "dtkcommon"; - version = "5.6.32"; + version = "5.7.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec="; + hash = "sha256-yQKkqHL5W2mHPE3zchAwtWUH55zrCEJwcVWCheC0rW4="; }; nativeBuildInputs = [ cmake ]; From bac30ee1f8c44a0a06a9b055854fba9059bee3b5 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:16:45 +0800 Subject: [PATCH 2/9] deepin.dtk6log: 0.0.1 -> 0.0.2 --- pkgs/desktops/deepin/library/dtk6log/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix index ac47ad7a2be9..d29c8fb740ee 100644 --- a/pkgs/desktops/deepin/library/dtk6log/default.nix +++ b/pkgs/desktops/deepin/library/dtk6log/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, qt6Packages, @@ -12,15 +13,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6log"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6log"; rev = finalAttrs.version; - hash = "sha256-R+jxlS8/FXUxnnzIDIePU2NwwNQU624n++E3q3oElco="; + hash = "sha256-uPuka+uVCcl2sBMr1SpgqLpcIqZm6BDZyGd7FOraHVM="; }; + patches = [ + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://github.com/linuxdeepin/dtklog/commit/ab7ed5aa8433c726470f2aecc1d99f118eae8b63.patch"; + hash = "sha256-QK4MOAzTZjjK5qfmzguXAgHO9guMCRN/5y+llBSY2vk="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 6bb6ff2e04225fd22c9f059f7406b1b8c430da45 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:25:14 +0800 Subject: [PATCH 3/9] deepin.dtk6core: 6.0.24 -> 6.0.33 --- pkgs/desktops/deepin/library/dtk6core/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index 97ac2fb5843f..bbd2eab47528 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, doxygen, @@ -14,18 +15,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c="; + hash = "sha256-AmGQoDt9qp0m0iV7WrR16DPTt80Y5leRUVXPOtHeugs="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://github.com/linuxdeepin/dtkcore/commit/8f523a8b387a006b942268e2143d0d58c574f7c5.patch"; + hash = "sha256-x8BfWCdsz8Bf/sAM7PymZWqlPyEabwP0e6ybfz/2oZ4="; + }) ]; postPatch = '' From 149232e9220b4bf47a570ed84a816532580d2ebd Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:31:34 +0800 Subject: [PATCH 4/9] deepin.dtk6gui: 6.0.24 -> 6.0.33 --- pkgs/desktops/deepin/library/dtk6gui/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 4204ad9f2356..c2b90a37d777 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, doxygen, @@ -12,18 +13,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ="; + hash = "sha256-ZnRhrlgrQ7Vusod2diFwVEVnNGHYNq5Ij12GbW6LXWc="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/ae64c77a73cdea069579ecf6833be63635237180/qt-6.9.patch"; + hash = "sha256-45L3ZQ9Hv7tLdDjtazLhVl8XgKBtcHL3CT2nw6GkqgM="; + }) ]; postPatch = '' From 33256ae39c01c1002cee92c7fd45870082229b47 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:37:13 +0800 Subject: [PATCH 5/9] deepin.dtk6widget: 6.0.24 -> 6.0.33 --- pkgs/desktops/deepin/library/dtk6widget/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index b1400c9cf9c8..ac0877d72cc4 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, doxygen, @@ -13,18 +14,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM="; + hash = "sha256-CSsN/6Geban/l6Rp5NuxIUomgTlqXyvttafTbjZIwSc="; }; patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/ce8f89bbed6ebd4659c7f964f158857ebfdee01c/qt-6.9.patch"; + hash = "sha256-LlFBXuoPxuszO9bkXK1Cy6zMTSnlh33UnmlKMJk3QH0="; + }) ]; postPatch = '' From b9fc20d90ce29a7509a7f15f9003bb30bfb0d1d8 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:46:22 +0800 Subject: [PATCH 6/9] deepin.dtk6declarative: 6.0.24 -> 6.0.33 --- 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 9092cafdac51..0f72d5e78575 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E="; + hash = "sha256-hFH5XCeNs31hslaPMyuXBLe0Du3s6STs9kltwL+/F1s="; }; patches = [ From b3d6434288370b210176630928525a30ea896838 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:54:59 +0800 Subject: [PATCH 7/9] deepin.qt6integration: 6.0.24 -> 6.0.33 --- .../deepin/library/qt6integration/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 1383ef81e07e..5b69215df8c6 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, dtk6widget, @@ -11,15 +12,23 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw="; + hash = "sha256-fxeXjUn1hJUE1Le24sqVEvKBX9Uo8qUVjr3sfz/5cQQ="; }; + patches = [ + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/e85e6836919d8e8424e800d7d4c8681bb23c29f9/qt-6.9.patch"; + hash = "sha256-GJH25cOEcA5Zep6FABwlRXU7HfpgMXNJzsbmWQdzx+Y="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 6b6b7f25be0bd093a22ebded1e16102f02d08208 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:55:22 +0800 Subject: [PATCH 8/9] deepin.qt6platform-plugins: 6.0.24 -> 6.0.33 --- pkgs/desktops/deepin/library/qt6platform-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 2befb9219bd3..aa4243b07d80 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4="; + hash = "sha256-uQ/dfk/HEvngTjHDLQOg965Jy+fH2YNfhKwXB+1BoUM="; }; postUnpack = '' From 6579406d61befdb48d08892594e1fcfbe78937cd Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 15:24:05 +0800 Subject: [PATCH 9/9] deepin.dde-shell: 1.0.9 -> 1.0.10 --- pkgs/desktops/deepin/core/dde-shell/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index 62663f6756e9..be854c40b97a 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, extra-cmake-modules, pkg-config, @@ -23,17 +24,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; rev = finalAttrs.version; - hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg="; + hash = "sha256-0nyTvSIJglx8raehPi6pYfQcxIjsCAaD1hVbuGvtfY8="; }; patches = [ ./fix-path-for-nixos.diff + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://github.com/linuxdeepin/dde-shell/commit/936d62a2c20398b9ca6ae28f9101dd288c8b1678.patch"; + hash = "sha256-u5TcPy2kZsOLGUgjTGZ5JX3mWnr/rOQ3SWBRyjWEiw4="; + }) + ]; postPatch = ''