commit 69a81b09a3a21e74f6f084e98edf66a5f16f0895

+9 -14

pkgs/desktops/deepin/apps/deepin-editor/default.nix

··· 4 fetchFromGitHub, 5 cmake, 6 pkg-config, 7 - qttools, 8 - wrapQtAppsHook, 9 dtkwidget, 10 qt5integration, 11 qt5platform-plugins, 12 - qtbase, 13 - qtsvg, 14 dde-qt-dbus-factory, 15 - kcodecs, 16 - syntax-highlighting, 17 libchardet, 18 libuchardet, 19 libiconv, 20 }: 21 22 stdenv.mkDerivation rec { 23 pname = "deepin-editor"; 24 - version = "6.5.0"; 25 26 src = fetchFromGitHub { 27 owner = "linuxdeepin"; 28 repo = pname; 29 rev = version; 30 - hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8="; 31 }; 32 33 nativeBuildInputs = [ 34 cmake 35 pkg-config 36 - qttools 37 - wrapQtAppsHook 38 ]; 39 40 buildInputs = [ 41 dtkwidget 42 qt5integration 43 qt5platform-plugins 44 - qtbase 45 - qtsvg 46 dde-qt-dbus-factory 47 - kcodecs 48 - syntax-highlighting 49 libchardet 50 libuchardet 51 libiconv

··· 4 fetchFromGitHub, 5 cmake, 6 pkg-config, 7 dtkwidget, 8 qt5integration, 9 qt5platform-plugins, 10 dde-qt-dbus-factory, 11 libchardet, 12 libuchardet, 13 libiconv, 14 + libsForQt5, 15 }: 16 17 stdenv.mkDerivation rec { 18 pname = "deepin-editor"; 19 + version = "6.5.2"; 20 21 src = fetchFromGitHub { 22 owner = "linuxdeepin"; 23 repo = pname; 24 rev = version; 25 + hash = "sha256-Z3fsnjo4Pcu1e8lKvWdWBhpoOFFy0dSrI2HehRYKJ0k="; 26 }; 27 28 nativeBuildInputs = [ 29 cmake 30 pkg-config 31 + libsForQt5.qttools 32 + libsForQt5.wrapQtAppsHook 33 ]; 34 35 buildInputs = [ 36 dtkwidget 37 qt5integration 38 qt5platform-plugins 39 + libsForQt5.qtbase 40 + libsForQt5.qtsvg 41 dde-qt-dbus-factory 42 + libsForQt5.kcodecs 43 + libsForQt5.syntax-highlighting 44 libchardet 45 libuchardet 46 libiconv

+16 -35

pkgs/desktops/deepin/core/dde-control-center/default.nix

··· 4 fetchFromGitHub, 5 cmake, 6 pkg-config, 7 - qttools, 8 doxygen, 9 - wrapQtAppsHook, 10 - wrapGAppsHook3, 11 wayland-scanner, 12 dtkwidget, 13 qt5integration, 14 qt5platform-plugins, 15 deepin-pw-check, 16 - qtbase, 17 - qtx11extras, 18 - qtmultimedia, 19 - polkit-qt, 20 libxcrypt, 21 - librsvg, 22 gtest, 23 runtimeShell, 24 - dbus, 25 }: 26 27 stdenv.mkDerivation rec { 28 pname = "dde-control-center"; 29 - version = "6.0.59"; 30 31 src = fetchFromGitHub { 32 owner = "linuxdeepin"; 33 repo = pname; 34 rev = version; 35 - hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag="; 36 }; 37 38 postPatch = '' ··· 43 nativeBuildInputs = [ 44 cmake 45 pkg-config 46 - qttools 47 doxygen 48 - wrapQtAppsHook 49 - wrapGAppsHook3 50 wayland-scanner 51 ]; 52 - dontWrapGApps = true; 53 54 buildInputs = [ 55 dtkwidget 56 qt5platform-plugins 57 deepin-pw-check 58 - qtbase 59 - qtx11extras 60 - qtmultimedia 61 - polkit-qt 62 libxcrypt 63 - librsvg 64 gtest 65 ]; 66 ··· 79 preConfigure = '' 80 # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" 81 # A workaround is to set QT_PLUGIN_PATH explicitly 82 - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} 83 - ''; 84 - 85 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 86 - qtWrapperArgs = [ 87 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 88 - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" 89 - ]; 90 - 91 - preFixup = '' 92 - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") 93 ''; 94 95 outputs = [ ··· 97 "dev" 98 ]; 99 100 - meta = with lib; { 101 description = "Control panel of Deepin Desktop Environment"; 102 mainProgram = "dde-control-center"; 103 homepage = "https://github.com/linuxdeepin/dde-control-center"; 104 - license = licenses.gpl3Plus; 105 - platforms = platforms.linux; 106 - maintainers = teams.deepin.members; 107 }; 108 }

··· 4 fetchFromGitHub, 5 cmake, 6 pkg-config, 7 doxygen, 8 wayland-scanner, 9 + wayland, 10 dtkwidget, 11 qt5integration, 12 qt5platform-plugins, 13 + libsForQt5, 14 deepin-pw-check, 15 libxcrypt, 16 gtest, 17 runtimeShell, 18 }: 19 20 stdenv.mkDerivation rec { 21 pname = "dde-control-center"; 22 + version = "6.0.65"; 23 24 src = fetchFromGitHub { 25 owner = "linuxdeepin"; 26 repo = pname; 27 rev = version; 28 + hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0="; 29 }; 30 31 postPatch = '' ··· 36 nativeBuildInputs = [ 37 cmake 38 pkg-config 39 + libsForQt5.qttools 40 doxygen 41 + libsForQt5.wrapQtAppsHook 42 wayland-scanner 43 ]; 44 45 buildInputs = [ 46 + wayland 47 dtkwidget 48 qt5platform-plugins 49 + qt5integration 50 deepin-pw-check 51 + libsForQt5.qtbase 52 + libsForQt5.qtmultimedia 53 + libsForQt5.polkit-qt 54 libxcrypt 55 gtest 56 ]; 57 ··· 70 preConfigure = '' 71 # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" 72 # A workaround is to set QT_PLUGIN_PATH explicitly 73 + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} 74 ''; 75 76 outputs = [ ··· 78 "dev" 79 ]; 80 81 + meta = { 82 description = "Control panel of Deepin Desktop Environment"; 83 mainProgram = "dde-control-center"; 84 homepage = "https://github.com/linuxdeepin/dde-control-center"; 85 + license = lib.licenses.gpl3Plus; 86 + platforms = lib.platforms.linux; 87 + maintainers = lib.teams.deepin.members; 88 }; 89 }

+6 -6

pkgs/desktops/deepin/core/dde-launchpad/default.nix

··· 13 14 stdenv.mkDerivation rec { 15 pname = "dde-launchpad"; 16 - version = "0.8.4"; 17 18 src = fetchFromGitHub { 19 owner = "linuxdeepin"; 20 repo = pname; 21 rev = version; 22 - hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po="; 23 }; 24 25 nativeBuildInputs = [ ··· 45 46 cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; 47 48 - meta = with lib; { 49 description = "'launcher' or 'start menu' component for DDE"; 50 mainProgram = "dde-launchpad"; 51 homepage = "https://github.com/linuxdeepin/dde-launchpad"; 52 - license = licenses.gpl3Plus; 53 - platforms = platforms.linux; 54 - maintainers = teams.deepin.members; 55 }; 56 }

··· 13 14 stdenv.mkDerivation rec { 15 pname = "dde-launchpad"; 16 + version = "1.0.2"; 17 18 src = fetchFromGitHub { 19 owner = "linuxdeepin"; 20 repo = pname; 21 rev = version; 22 + hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM="; 23 }; 24 25 nativeBuildInputs = [ ··· 45 46 cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; 47 48 + meta = { 49 description = "'launcher' or 'start menu' component for DDE"; 50 mainProgram = "dde-launchpad"; 51 homepage = "https://github.com/linuxdeepin/dde-launchpad"; 52 + license = lib.licenses.gpl3Plus; 53 + platforms = lib.platforms.linux; 54 + maintainers = lib.teams.deepin.members; 55 }; 56 }

+12 -16

pkgs/desktops/deepin/core/dde-network-core/default.nix

··· 3 lib, 4 fetchFromGitHub, 5 cmake, 6 - qttools, 7 pkg-config, 8 - wrapQtAppsHook, 9 - qtbase, 10 - qtsvg, 11 dtkwidget, 12 dde-control-center, 13 dde-session-shell, 14 - networkmanager-qt, 15 glib, 16 gtest, 17 }: 18 19 stdenv.mkDerivation rec { 20 pname = "dde-network-core"; 21 - version = "2.0.32"; 22 23 src = fetchFromGitHub { 24 owner = "linuxdeepin"; 25 repo = pname; 26 rev = version; 27 - hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA="; 28 }; 29 30 nativeBuildInputs = [ 31 cmake 32 - qttools 33 pkg-config 34 - wrapQtAppsHook 35 ]; 36 37 buildInputs = [ 38 - qtbase 39 - qtsvg 40 dtkwidget 41 dde-control-center 42 dde-session-shell 43 - networkmanager-qt 44 glib 45 gtest 46 ]; ··· 49 50 strictDeps = true; 51 52 - meta = with lib; { 53 description = "DDE network library framework"; 54 homepage = "https://github.com/linuxdeepin/dde-network-core"; 55 - license = licenses.gpl3Plus; 56 - platforms = platforms.linux; 57 - maintainers = teams.deepin.members; 58 }; 59 }

··· 3 lib, 4 fetchFromGitHub, 5 cmake, 6 pkg-config, 7 dtkwidget, 8 dde-control-center, 9 dde-session-shell, 10 + libsForQt5, 11 glib, 12 gtest, 13 }: 14 15 stdenv.mkDerivation rec { 16 pname = "dde-network-core"; 17 + version = "2.0.34"; 18 19 src = fetchFromGitHub { 20 owner = "linuxdeepin"; 21 repo = pname; 22 rev = version; 23 + hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI="; 24 }; 25 26 nativeBuildInputs = [ 27 cmake 28 + libsForQt5.qttools 29 pkg-config 30 + libsForQt5.wrapQtAppsHook 31 ]; 32 33 buildInputs = [ 34 + libsForQt5.qtbase 35 + libsForQt5.qtsvg 36 dtkwidget 37 dde-control-center 38 dde-session-shell 39 + libsForQt5.networkmanager-qt 40 glib 41 gtest 42 ]; ··· 45 46 strictDeps = true; 47 48 + meta = { 49 description = "DDE network library framework"; 50 homepage = "https://github.com/linuxdeepin/dde-network-core"; 51 + license = lib.licenses.gpl3Plus; 52 + platforms = lib.platforms.linux; 53 + maintainers = lib.teams.deepin.members; 54 }; 55 }

+2 -8

pkgs/desktops/deepin/core/dde-shell/default.nix

··· 2 stdenv, 3 lib, 4 fetchFromGitHub, 5 - fetchpatch, 6 cmake, 7 extra-cmake-modules, 8 pkg-config, ··· 23 24 stdenv.mkDerivation (finalAttrs: { 25 pname = "dde-shell"; 26 - version = "0.0.43"; 27 28 src = fetchFromGitHub { 29 owner = "linuxdeepin"; 30 repo = "dde-shell"; 31 rev = finalAttrs.version; 32 - hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0="; 33 }; 34 35 patches = [ 36 ./fix-path-for-nixos.diff 37 - (fetchpatch { 38 - name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff"; 39 - url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch"; 40 - hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w="; 41 - }) 42 ]; 43 44 postPatch = ''

··· 2 stdenv, 3 lib, 4 fetchFromGitHub, 5 cmake, 6 extra-cmake-modules, 7 pkg-config, ··· 22 23 stdenv.mkDerivation (finalAttrs: { 24 pname = "dde-shell"; 25 + version = "1.0.2"; 26 27 src = fetchFromGitHub { 28 owner = "linuxdeepin"; 29 repo = "dde-shell"; 30 rev = finalAttrs.version; 31 + hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo="; 32 }; 33 34 patches = [ 35 ./fix-path-for-nixos.diff 36 ]; 37 38 postPatch = ''

+5 -5

pkgs/desktops/deepin/core/dde-tray-loader/default.nix

··· 18 19 stdenv.mkDerivation (finalAttrs: { 20 pname = "dde-tray-loader"; 21 - version = "0.0.11"; 22 23 src = fetchFromGitHub { 24 owner = "linuxdeepin"; 25 repo = "dde-tray-loader"; 26 rev = finalAttrs.version; 27 - hash = "sha256-kz8+essf6O3ckeY5/5a/Z6539qNcfOnGbGTqSo5swhc="; 28 }; 29 30 patches = [ 31 (fetchpatch { 32 - name = "set-version-for-dde-dock_pc.patch"; 33 - url = "https://github.com/linuxdeepin/dde-tray-loader/commit/0f9b90a9aa8096a92c21c8f01d29b4785aaf04e5.patch"; 34 - hash = "sha256-A6k8XjyIDbA+XuUxYWd5yxFJ8yOWMOtUH5Vg10o//YM="; 35 }) 36 ]; 37

··· 18 19 stdenv.mkDerivation (finalAttrs: { 20 pname = "dde-tray-loader"; 21 + version = "1.0.1"; 22 23 src = fetchFromGitHub { 24 owner = "linuxdeepin"; 25 repo = "dde-tray-loader"; 26 rev = finalAttrs.version; 27 + hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE="; 28 }; 29 30 patches = [ 31 (fetchpatch { 32 + name = "remove-useless-function.patch"; 33 + url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch"; 34 + hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY="; 35 }) 36 ]; 37

+2 -2

pkgs/desktops/deepin/library/dtk6core/default.nix

··· 14 15 stdenv.mkDerivation (finalAttrs: { 16 pname = "dtk6core"; 17 - version = "6.0.18"; 18 19 src = fetchFromGitHub { 20 owner = "linuxdeepin"; 21 repo = "dtk6core"; 22 rev = finalAttrs.version; 23 - hash = "sha256-zyhqkxxWB5U37eBxINNxcbnF5NpImg+E7H1VhfJDz60="; 24 }; 25 26 patches = [

··· 14 15 stdenv.mkDerivation (finalAttrs: { 16 pname = "dtk6core"; 17 + version = "6.0.19"; 18 19 src = fetchFromGitHub { 20 owner = "linuxdeepin"; 21 repo = "dtk6core"; 22 rev = finalAttrs.version; 23 + hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; 24 }; 25 26 patches = [

+2 -2

pkgs/desktops/deepin/library/dtk6declarative/default.nix

··· 11 12 stdenv.mkDerivation (finalAttrs: { 13 pname = "dtk6declarative"; 14 - version = "6.0.18"; 15 16 src = fetchFromGitHub { 17 owner = "linuxdeepin"; 18 repo = "dtk6declarative"; 19 rev = finalAttrs.version; 20 - hash = "sha256-/bQGb87UbnIRWwR6Of67VrRUkrNk6dmY7bjgwDXc30Y"; 21 }; 22 23 patches = [

··· 11 12 stdenv.mkDerivation (finalAttrs: { 13 pname = "dtk6declarative"; 14 + version = "6.0.19"; 15 16 src = fetchFromGitHub { 17 owner = "linuxdeepin"; 18 repo = "dtk6declarative"; 19 rev = finalAttrs.version; 20 + hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg="; 21 }; 22 23 patches = [

+2 -2

pkgs/desktops/deepin/library/dtk6gui/default.nix

··· 12 13 stdenv.mkDerivation (finalAttrs: { 14 pname = "dtk6gui"; 15 - version = "6.0.18"; 16 17 src = fetchFromGitHub { 18 owner = "linuxdeepin"; 19 repo = "dtk6gui"; 20 rev = finalAttrs.version; 21 - hash = "sha256-w8tyc06v/juTP0YSsyWai1ONl4Aa7dzREIc5wLnI/vw="; 22 }; 23 24 patches = [

··· 12 13 stdenv.mkDerivation (finalAttrs: { 14 pname = "dtk6gui"; 15 + version = "6.0.19"; 16 17 src = fetchFromGitHub { 18 owner = "linuxdeepin"; 19 repo = "dtk6gui"; 20 rev = finalAttrs.version; 21 + hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A="; 22 }; 23 24 patches = [

+2 -2

pkgs/desktops/deepin/library/dtk6widget/default.nix

··· 13 14 stdenv.mkDerivation (finalAttrs: { 15 pname = "dtk6widget"; 16 - version = "6.0.18"; 17 18 src = fetchFromGitHub { 19 owner = "linuxdeepin"; 20 repo = "dtk6widget"; 21 rev = finalAttrs.version; 22 - hash = "sha256-6H3Dtdyq/adb3jz9lGaKmOguXqvhvZn1/G7+YajyF2k="; 23 }; 24 25 patches = [

··· 13 14 stdenv.mkDerivation (finalAttrs: { 15 pname = "dtk6widget"; 16 + version = "6.0.19"; 17 18 src = fetchFromGitHub { 19 owner = "linuxdeepin"; 20 repo = "dtk6widget"; 21 rev = finalAttrs.version; 22 + hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA="; 23 }; 24 25 patches = [

+2 -2

pkgs/desktops/deepin/library/qt6integration/default.nix

··· 11 12 stdenv.mkDerivation rec { 13 pname = "qt6integration"; 14 - version = "6.0.18"; 15 16 src = fetchFromGitHub { 17 owner = "linuxdeepin"; 18 repo = pname; 19 rev = version; 20 - hash = "sha256-7FGOnAAcwOonpMDDukj88s1b4WmLJNu7MZSW7f7P44g="; 21 }; 22 23 nativeBuildInputs = [

··· 11 12 stdenv.mkDerivation rec { 13 pname = "qt6integration"; 14 + version = "6.0.19"; 15 16 src = fetchFromGitHub { 17 owner = "linuxdeepin"; 18 repo = pname; 19 rev = version; 20 + hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8="; 21 }; 22 23 nativeBuildInputs = [

+2 -2

pkgs/desktops/deepin/library/qt6platform-plugins/default.nix

··· 12 13 stdenv.mkDerivation rec { 14 pname = "qt6platform-plugins"; 15 - version = "6.0.18"; 16 17 src = fetchFromGitHub { 18 owner = "linuxdeepin"; 19 repo = pname; 20 rev = version; 21 - hash = "sha256-O2wylkNKqN0JxKffwFNSfv7S1hPIFrVKwSsppSGTp6I="; 22 }; 23 24 postUnpack = ''

··· 12 13 stdenv.mkDerivation rec { 14 pname = "qt6platform-plugins"; 15 + version = "6.0.19"; 16 17 src = fetchFromGitHub { 18 owner = "linuxdeepin"; 19 repo = pname; 20 rev = version; 21 + hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ="; 22 }; 23 24 postUnpack = ''