deepin: update packages and add desktop module

nixos/modules/services/desktops/deepin/deepin.nix

@@ -22,6 +22,8 @@
       that helps to launch applications faster.
     ";
 
+    programs.dde-calendar.enable = lib.mkEnableOption "Deepin calendar";
+
   };
 
 
@@ -30,12 +32,18 @@
   config = lib.mkMerge [
 
     (lib.mkIf config.services.deepin.core.enable {
+
+      programs.dconf.enable = true;
+
+      services.gvfs.enable = true;
+
+      services.udisks2.enable = true;
+
       environment.systemPackages = [
         pkgs.deepin.dde-api
-        pkgs.deepin.dde-calendar
         pkgs.deepin.dde-control-center
         pkgs.deepin.dde-daemon
-        pkgs.deepin.dde-dock
+        (pkgs.deepin.dde-dock.override { plugins = [ pkgs.deepin.dde-file-manager ]; })
         pkgs.deepin.dde-launcher
         pkgs.deepin.dde-file-manager
         pkgs.deepin.dde-session-ui
@@ -45,10 +53,9 @@
 
       services.dbus.packages = [
         pkgs.deepin.dde-api
-        pkgs.deepin.dde-calendar
         pkgs.deepin.dde-control-center
         pkgs.deepin.dde-daemon
-        pkgs.deepin.dde-dock
+        (pkgs.deepin.dde-dock.override { plugins = [ pkgs.deepin.dde-file-manager ]; })
         pkgs.deepin.dde-launcher
         pkgs.deepin.dde-file-manager
         pkgs.deepin.dde-session-ui
@@ -107,6 +114,7 @@
 
       services.deepin.deepin-menu.enable = true;
       services.deepin.deepin-turbo.enable = true;
+      programs.dde-calendar.enable = true;
     })
 
     (lib.mkIf config.services.deepin.deepin-menu.enable {
@@ -118,6 +126,11 @@
       systemd.packages = [ pkgs.deepin.deepin-turbo ];
     })
 
+    (lib.mkIf config.programs.dde-calendar.enable {
+      environment.systemPackages = [ pkgs.deepin.dde-calendar ];
+      services.dbus.packages = [ pkgs.deepin.dde-calendar ];
+    })
+
   ];
 
 }

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

@@ -0,0 +1,86 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.deepin;
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.deepin.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable the Deepin Desktop Environment";
+    };
+
+  };
+
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    services.xserver.displayManager.sessionPackages = [ pkgs.deepin.startdde ];
+    services.xserver.displayManager.defaultSession = mkForce "deepin";
+
+    hardware.bluetooth.enable = mkDefault true;
+    hardware.pulseaudio.enable = mkDefault true;
+    security.polkit.enable = true;
+    services.accounts-daemon.enable = true;
+    services.bamf.enable = true;
+    services.deepin.core.enable = true;
+    services.gnome3.at-spi2-core.enable = true;
+    services.gnome3.glib-networking.enable = true;
+    services.gnome3.gnome-keyring.enable = true;
+    services.gvfs.enable = true;
+    services.udisks2.enable = true;
+    services.upower.enable = config.powerManagement.enable;
+    services.xserver.libinput.enable = mkDefault true;
+    services.xserver.updateDbusEnvironment = true;
+
+    networking.networkmanager.enable = true;
+
+    fonts.fonts = with pkgs; [ noto-fonts ];
+
+    environment.systemPackages = with pkgs; [
+      deepin.dde-calendar
+      deepin.dde-daemon
+      (deepin.dde-dock.override { plugins = [ deepin.dde-file-manager ]; })
+      deepin.dde-kwin
+      deepin.dde-file-manager
+      deepin.dde-launcher
+      deepin.dde-polkit-agent
+      deepin.dde-session-shell
+      deepin.dde-session-ui
+      deepin.deepin-desktop-base
+      deepin.deepin-gtk-theme
+      deepin.deepin-icon-theme
+      deepin.deepin-image-viewer
+      deepin.deepin-movie-reborn
+      deepin.deepin-screen-recorder
+      deepin.deepin-shortcut-viewer
+      deepin.deepin-sound-theme
+      deepin.deepin-terminal
+      deepin.deepin-wallpapers
+      deepin.dpa-ext-gnomekeyring
+      deepin.qt5integration
+      deepin.qt5platform-plugins
+      deepin.startdde
+    ];
+
+    environment.variables.DDE_POLKIT_PLUGINS_DIRS = [ "${config.system.path}/lib/polkit-1-dde/plugins" ];
+
+    environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = [
+      "${pkgs.deepin.deepin-desktop-schemas}/share/gsettings-schemas/${pkgs.deepin.deepin-desktop-schemas.name}/glib-2.0/schemas"
+    ];
+
+    # Link some extra directories in /run/current-system/sw/share
+    environment.pathsToLink = [
+      "/lib/polkit-1-dde/plugins"
+      "/share"
+    ];
+  };
+}

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

@@ -20,7 +20,7 @@ in
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
-    ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
+    ./mate.nix ./pantheon.nix ./deepin.nix ./surf-display.nix ./cde.nix
   ];
 
   options = {

nixos/tests/deepin.nix

@@ -0,0 +1,98 @@
+import ./make-test-python.nix ({ pkgs, ...} :
+{
+  name = "deepin";
+
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ romildo ];
+  };
+
+  machine = { ... }:
+  {
+    imports = [ ./common/user-account.nix ];
+    services.xserver.enable = true;
+    services.xserver.desktopManager.deepin.enable = true;
+    services.xserver.displayManager.lightdm = {
+      enable = true;
+      autoLogin = {
+        enable = true;
+        user = "alice";
+      };
+    };
+    hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
+    virtualisation.diskSize = 1024;
+    virtualisation.memorySize = 1024;
+    environment.systemPackages = [ pkgs.xdotool ];
+    services.acpid.enable = true;
+    networking.useNetworkd = true;
+  };
+
+  enableOCR = true;
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.config.users.users.alice;
+  in ''
+    with subtest("Ensure X starts"):
+        machine.wait_for_x()
+        machine.wait_for_file("${user.home}/.Xauthority")
+        machine.succeed("xauth merge ${user.home}/.Xauthority")
+
+    with subtest("Check that logging in has given the user ownership of devices"):
+        machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+
+    with subtest("Effect mode"):
+        # geeqie: image viewer which shows coordinate of pixels
+        machine.wait_for_text("Friendly Reminder")  # Effect/Normal mode
+        machine.screenshot("deepin1")
+        machine.succeed("xdotool mousemove 512 480 click 1")  # Normal mode
+
+    with subtest("Open Deepin Terminal"):
+        machine.screenshot("deepin2a")
+        machine.sleep(60)
+        machine.screenshot("deepin2b")
+        machine.sleep(60)
+        machine.screenshot("deepin2c")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2d")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2e")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2f")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2g")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2h")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2i")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2j")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2k")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2l")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2m")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2n")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2o")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2p")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2q")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2r")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2s")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2t")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2u")
+        # machine.sleep(60)
+        # machine.screenshot("deepin2v")
+        machine.succeed("deepin-terminal &")
+        machine.sleep(20)
+        machine.send_chars("ls --color -alF\n")
+        machine.sleep(20)
+        machine.screenshot("deepin3")
+  '';
+})

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

@@ -1,14 +1,16 @@
 { stdenv
 , buildGoPackage
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , alsaLib
 , bc
 , blur-effect
 , coreutils
+, dbus
 , deepin
 , deepin-gettext-tools
 , fontconfig
+, gdk-pixbuf-xlib
 , go
 , go-dbus-factory
 , go-gir-generator
@@ -26,41 +28,42 @@
 
 buildGoPackage rec {
   pname = "dde-api";
-  version = "5.0.0";
+  version = "5.3.0.4";
 
   goPackagePath = "pkg.deepin.io/dde/api";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "0iv4krj6dqdknwvmax7aj40k1h96259kqcfnljadrwpl7cvsvp5p";
+    sha256 = "1fh2g4alskd8h80d19r7h9hi26dz8cl7hmy2l75x95ni22z180zf";
   };
 
   goDeps = ./deps.nix;
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
+    go-dbus-factory
+    go-gir-generator
+    go-lib
     deepin-gettext-tools # build
     deepin.setupHook
 
     # TODO: using $PATH to find run time executable does not work with cross compiling
     bc          # run (to adjust grub theme?)
     blur-effect # run (is it really needed?)
-    coreutils   # run (is it really needed?)
     fontconfig  # run (is it really needed?)
     rfkill      # run
     xcur2png    # run
     grub2       # run (is it really needed?)
   ];
 
   buildInputs = [
-    go-dbus-factory      # needed
-    go-gir-generator     # needed
-    go-lib               # build
-
     alsaLib     # needed
+    coreutils
+    dbus
     #glib        # ? arch
+    gdk-pixbuf-xlib  # needed
     gtk3        # build run
     libcanberra # build run
     libgudev    # needed
@@ -85,8 +88,19 @@ buildGoPackage rec {
       misc/systemd/system/deepin-shutdown-sound.service \
       theme_thumb/gtk/gtk.go \
       thumbnails/gtk/gtk.go
-    fixPath $out /boot/grub Makefile     # TODO: confirm where to install grub themes
-    fixPath $out /var Makefile
+
+    fixPath $out /usr/share/dde-api \
+      adjust-grub-theme/main.go \
+      language_support/lang_support.go \
+      lunar-calendar/huangli.go
+
+    fixPath $out /boot/grub adjust-grub-theme/main.go  # TODO: confirm where to install grub themes
+
+    fixPath ${dbus} /usr/bin/dbus-send misc/systemd/system/deepin-login-sound.service
+    fixPath ${coreutils} /usr/bin/true misc/systemd/system/deepin-shutdown-sound.service
+
+    # TODO: consider XDG_DATA_DIRS and XDG_DATA_HOME
+    substituteInPlace themes/theme.go --replace /usr/share /run/current-system/sw/share
 
     # This package wants to install polkit local authority files into
     # /var/lib. Nix does not allow a package to install files into /var/lib
@@ -96,12 +110,17 @@ buildGoPackage rec {
     # /var/lib/polkit-1 (with /etc having priority over /var/lib). An
     # work around is to install them to $out/etc and simlnk them to
     # /etc in the deepin module.
-
-    sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
+    #
+    sed -i -e "s,/var/lib/polkit-1,$out/etc/polkit-1," Makefile
   '';
 
   buildPhase = ''
+    export GOPATH="$GOPATH:${go-dbus-factory}/share/go"
+    export GOPATH="$GOPATH:${go-lib}/share/go"
+    export GOPATH="$GOPATH:${go-gir-generator}/share/go"
+
     export GOCACHE="$TMPDIR/go-cache";
+
     make -C go/src/${goPackagePath}
   '';
 
@@ -123,6 +142,5 @@ buildGoPackage rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
-    broken = true; # 2020-08-22 https://hydra.nixos.org/build/125354866/nixlog/2
   };
 }