mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
Merge pull request #310778 from wineee/dde23
deepin desktop environment: update
This commit is contained in:
rewine
GitHub
commit
9b3299c8cd
53 changed files with 636 additions and 260 deletions
|
|
@ -477,6 +477,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
|
||||
|
|
|
|||
38
nixos/modules/services/desktops/deepin/deepin-anything.nix
Normal file
38
nixos/modules/services/desktops/deepin/deepin-anything.nix
Normal file
|
|
@ -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" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -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,8 +142,10 @@ in
|
|||
dtkwidget
|
||||
dtkdeclarative
|
||||
qt5platform-plugins
|
||||
qt6platform-plugins
|
||||
qt5integration
|
||||
qt6integration
|
||||
deepin-pw-check
|
||||
deepin-turbo
|
||||
|
||||
dde-account-faces
|
||||
deepin-icon-theme
|
||||
|
|
@ -152,7 +156,9 @@ 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
|
||||
dde-session-shell
|
||||
|
|
@ -171,6 +177,7 @@ in
|
|||
dde-appearance
|
||||
dde-application-manager
|
||||
deepin-service-manager
|
||||
dde-grand-search
|
||||
];
|
||||
optionalPackages = [
|
||||
onboard # dde-dock plugin
|
||||
|
|
@ -194,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
|
||||
|
|
@ -209,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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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"}" ];
|
||||
|
|
|
|||
|
|
@ -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"}" ];
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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" {} \;
|
||||
'';
|
||||
|
|
|
|||
83
pkgs/desktops/deepin/core/dde-grand-search/default.nix
Normal file
83
pkgs/desktops/deepin/core/dde-grand-search/default.nix
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dde-qt-dbus-factory
|
||||
, dde-dock
|
||||
, deepin-pdfium
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, taglib
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, pcre
|
||||
, 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
|
||||
pcre
|
||||
];
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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")
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,57 +2,48 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dtkdeclarative
|
||||
, qtbase
|
||||
, appstream-qt
|
||||
, kitemmodels
|
||||
, qt5integration
|
||||
, qt6Packages
|
||||
, qt6integration
|
||||
, qt6platform-plugins
|
||||
, dtk6declarative
|
||||
, dde-shell
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-launchpad";
|
||||
version = "0.4.4";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY=";
|
||||
hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace desktopintegration.cpp \
|
||||
--replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qt6Packages.qttools
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
dtkdeclarative
|
||||
qt6integration
|
||||
qt6platform-plugins
|
||||
dtk6declarative
|
||||
dde-shell
|
||||
] ++ (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 = "'launcher' or 'start menu' component for DDE";
|
||||
mainProgram = "dde-launchpad";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
94
pkgs/desktops/deepin/core/dde-shell/default.nix
Normal file
94
pkgs/desktops/deepin/core/dde-shell/default.nix
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, wayland-scanner
|
||||
, dtk6declarative
|
||||
, dtk6widget
|
||||
, dde-qt-dbus-factory
|
||||
, qt6Packages
|
||||
, qt6integration
|
||||
, qt6platform-plugins
|
||||
, kdePackages
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, yaml-cpp
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dde-shell";
|
||||
version = "0.0.23-unstable-2024-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dde-shell";
|
||||
rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3";
|
||||
hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-plugins-use-qt5.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
|
||||
pkg-config
|
||||
qt6Packages.wrapQtAppsHook
|
||||
qt6Packages.qttools
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
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 = [
|
||||
"-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 = {
|
||||
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 ];
|
||||
};
|
||||
})
|
||||
|
|
@ -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(
|
||||
17
pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
Normal file
17
pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff
Normal file
|
|
@ -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")
|
||||
26
pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff
Normal file
26
pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff
Normal file
|
|
@ -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})
|
||||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, pkgs, config, libsForQt5, qt6Packages }:
|
||||
{ lib, pkgs, config, libsForQt5 }:
|
||||
let
|
||||
packages = self:
|
||||
let
|
||||
|
|
@ -28,12 +28,14 @@ let
|
|||
dtk6widget = callPackage ./library/dtk6widget { };
|
||||
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 { };
|
||||
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 { };
|
||||
|
|
@ -49,6 +51,8 @@ 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 { };
|
||||
dde-grand-search = callPackage ./core/dde-grand-search { };
|
||||
|
||||
#### Dtk Application
|
||||
deepin-album = callPackage ./apps/deepin-album { };
|
||||
|
|
@ -71,9 +75,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 { };
|
||||
dde-daemon = callPackage ./go-package/dde-daemon { };
|
||||
deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
|
||||
|
|
@ -83,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 { };
|
||||
|
|
@ -98,6 +100,9 @@ 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
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -19,13 +19,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 = [
|
||||
|
|
@ -65,7 +65,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 = ''
|
||||
|
|
@ -76,6 +75,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";
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
47
pkgs/desktops/deepin/library/qt6integration/default.nix
Normal file
47
pkgs/desktops/deepin/library/qt6integration/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
58
pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
Normal file
58
pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
54
pkgs/desktops/deepin/tools/deepin-anything/default.nix
Normal file
54
pkgs/desktops/deepin/tools/deepin-anything/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
29
pkgs/os-specific/linux/deepin-anything-module/default.nix
Normal file
29
pkgs/os-specific/linux/deepin-anything-module/default.nix
Normal file
|
|
@ -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)";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -337,6 +337,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 { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue