Unverified Commit 0daec784 authored by rewine's avatar rewine Committed by GitHub
Browse files

deepin desktop environment: 2024.09 update (#338402)

parents 4bbea8e8 29d62536

nixos/modules/services/x11/desktop-managers/deepin.nix

+4 −2
Original line number Diff line number Diff line
@@ -155,8 +155,6 @@ 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
@@ -177,6 +175,8 @@ in 
            dde-application-manager

            deepin-service-manager

            dde-grand-search

            dde-api-proxy

            dde-tray-loader

          ];

          optionalPackages = [

            onboard # dde-dock plugin
@@ -216,6 +216,7 @@ in 
        dde-application-manager

        deepin-service-manager

        dde-grand-search

        dde-api-proxy

      ];



      systemd.packages = with pkgs.deepin; [
@@ -230,6 +231,7 @@ in 
        dde-session

        dde-application-manager

        deepin-service-manager

        dde-api-proxy

      ];

    };

}

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

+6 −9
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ 
  libchardet,

  libuchardet,

  libiconv,

  gitUpdater,

}:



stdenv.mkDerivation rec {

  pname = "deepin-editor";

  version = "6.0.16";

  version = "6.5.0";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = pname;

    rev = version;

    hash = "sha256-55hRXHP02MJWt+JUDCDKv4Boq0IwNW1itGw9rtCZrao=";

    hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8=";

  };



  nativeBuildInputs = [
@@ -56,13 +55,11 @@ stdenv.mkDerivation rec { 


  cmakeFlags = [ "-DVERSION=${version}" ];



  passthru.updateScript = gitUpdater { };



  meta = with lib; {

  meta = {

    description = "Desktop text editor that supports common text editing features";

    homepage = "https://github.com/linuxdeepin/deepin-editor";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = teams.deepin.members;

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.linux;

    maintainers = lib.teams.deepin.members;

  };

}

pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  qtsvg,

  qtx11extras,

  dde-qt-dbus-factory,

  dde-dock,

  dde-tray-loader,

  gsettings-qt,

  polkit-qt,

  procps,
@@ -29,13 +29,13 @@ 


stdenv.mkDerivation rec {

  pname = "deepin-system-monitor";

  version = "6.0.23";

  version = "6.5.0";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = pname;

    rev = version;

    hash = "sha256-LcXc8yI81YslVjof74TvOm6eWiN4UaHgUFU+HSCNZxQ=";

    hash = "sha256-UOF0/RBceuRX6AtI1p5qqHhbRDAhA7i0+seOrkAFFgI=";

  };



  postPatch = ''
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec { 
    qtsvg

    qtx11extras

    dde-qt-dbus-factory

    dde-dock

    dde-tray-loader

    gsettings-qt

    polkit-qt

    procps

pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 


stdenvNoCC.mkDerivation rec {

  pname = "deepin-icon-theme";

  version = "2024.07.19";

  version = "2024.07.31";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = pname;

    rev = version;

    hash = "sha256-eUL0V9pGYzvAdVZpnrWXDO/YeCBETCOGvcMqDTwTgoU=";

    hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s=";

  };



  makeFlags = [ "PREFIX=${placeholder "out"}" ];

pkgs/desktops/deepin/core/dde-api-proxy/default.nix

0 → 100644
+50 −0
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchFromGitHub,

  cmake,

  pkg-config,

  libsForQt5,

  dtkcore,

  coreutils,

}:



stdenv.mkDerivation rec {

  pname = "dde-api-proxy";

  version = "1.0.16";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = "dde-api-proxy";

    rev = version;

    hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU=";

  };



  postPatch = ''

    for file in $(grep -rl "/usr/bin/false"); do

      substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false"

    done

    for file in $(grep -rl "/usr/lib/dde-api-proxy"); do

      substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy"

    done

  '';



  nativeBuildInputs = [

    cmake

    pkg-config

    libsForQt5.wrapQtAppsHook

  ];



  buildInputs = [

    dtkcore

    libsForQt5.qtbase

  ];



  meta = {

    description = "Proxy service for dde";

    homepage = "https://github.com/linuxdeepin/dde-api-proxy";

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.linux;

    maintainers = lib.teams.deepin.members;

  };

}