Xfce updates 2025-05-20 (#409074)

pkgs/desktops/xfce/default.nix

@@ -119,8 +119,6 @@ makeScopeWithSplicing' {
 
       xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { };
 
-      xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
-
       xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
 
       xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { };
@@ -173,6 +171,11 @@ makeScopeWithSplicing' {
 
       thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
 
+      xfce4-datetime-plugin = throw ''
+        xfce4-datetime-plugin has been removed: this plugin has been merged into the xfce4-panel's built-in clock
+        plugin and thus no longer maintained upstream, see https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/563.
+      ''; # Added 2025-05-20
+
       xfce4-embed-plugin = throw "xfce4-embed-plugin has been removed, as it was broken"; # Added 2024-07-15
 
       xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15

pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix

@@ -1,21 +1,40 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
   glib,
   gtk3,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
   xfconf,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
+stdenv.mkDerivation (finalAttrs: {
-  category = "panel-plugins";
   pname = "xfce4-battery-plugin";
-  version = "1.1.6";
+  version = "1.2.0";
-  rev-prefix = "xfce4-battery-plugin-";
+
-  odd-unstable = false;
+  src = fetchFromGitLab {
-  sha256 = "sha256-tbI4zg6BFsPzREbh/tdFiEbZVXkAsblxzcZdIaQIqa0=";
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-battery-plugin";
+    tag = "xfce4-battery-plugin-${finalAttrs.version}";
+    hash = "sha256-I4x2QRYp6H5mR4J7nQ+VZ/T3r/dj4r4M9JbgN+oZHWQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     glib
@@ -26,8 +45,13 @@ mkXfceDerivation {
     xfconf
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-battery-plugin-"; };
+
+  meta = {
     description = "Battery plugin for Xfce panel";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix

@@ -1,7 +1,13 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
   wayland-scanner,
+  wrapGAppsHook3,
   glib,
   gtk3,
   libX11,
@@ -13,16 +19,34 @@
   xfconf,
   wayland,
   wlr-protocols,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
+stdenv.mkDerivation (finalAttrs: {
-  category = "panel-plugins";
   pname = "xfce4-clipman-plugin";
-  version = "1.6.7";
+  version = "1.7.0";
-  sha256 = "sha256-kbcA1X5LBnk1FcrhVqpCENp5bleJga2jnCh1RltN72o=";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-clipman-plugin";
+    tag = "xfce4-clipman-plugin-${finalAttrs.version}";
+    hash = "sha256-w9axHJJnTQrkN9s3RQyvkOcK0FOqsvWpoJ+UCDntnZk=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
 
   nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
     wayland-scanner
+    wrapGAppsHook3
   ];
 
   buildInputs = [
@@ -39,8 +63,13 @@ mkXfceDerivation {
     wlr-protocols
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-clipman-plugin-"; };
+
+  meta = {
     description = "Clipboard manager for Xfce panel";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix

@@ -1,20 +1,43 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  glib,
   gtk3,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
   xfconf,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
+stdenv.mkDerivation (finalAttrs: {
-  category = "panel-plugins";
   pname = "xfce4-cpufreq-plugin";
-  version = "1.2.9";
+  version = "1.3.0";
-  sha256 = "sha256-WC419ZRQAnV+yNbdWH5lMt4RGvQb7zv2dqQdTE2kIFU=";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-cpufreq-plugin";
+    tag = "xfce4-cpufreq-plugin-${finalAttrs.version}";
+    hash = "sha256-IJ0gOzMs2JBS8KIlD5NHyUOf53PtTytm8J/j+5AEh5E=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
+    glib
     gtk3
     libxfce4ui
     libxfce4util
@@ -22,8 +45,13 @@ mkXfceDerivation {
     xfconf
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-cpufreq-plugin-"; };
+
+  meta = {
     description = "CPU Freq load plugin for Xfce panel";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix

@@ -1,39 +1,57 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
-  exo,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
   glib,
   gtk3,
-  libXtst,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
   xfconf,
-  xorgproto,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
+stdenv.mkDerivation (finalAttrs: {
-  category = "panel-plugins";
   pname = "xfce4-cpugraph-plugin";
-  version = "1.2.11";
+  version = "1.3.0";
-  rev-prefix = "xfce4-cpugraph-plugin-";
+
-  odd-unstable = false;
+  src = fetchFromGitLab {
-  sha256 = "sha256-Q+H6riGF5sEcyrVFoDfudwVw4QORa2atE6NTb+xde/w=";
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-cpugraph-plugin";
+    tag = "xfce4-cpugraph-plugin-${finalAttrs.version}";
+    hash = "sha256-IXAoxMzKZhABiiZYhL4UGkzqFNGMJicGQqSIfy2DEfc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
-    exo
     glib
     gtk3
-    libXtst
     libxfce4ui
     libxfce4util
     xfce4-panel
     xfconf
-    xorgproto
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-cpugraph-plugin-"; };
+
+  meta = {
     description = "CPU graph show for Xfce panel";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix

@@ -1,32 +0,0 @@
-{
-  mkXfceDerivation,
-  lib,
-  intltool,
-  libxfce4ui,
-  xfce4-panel,
-  gettext,
-}:
-
-mkXfceDerivation {
-  category = "panel-plugins";
-  pname = "xfce4-datetime-plugin";
-  version = "0.8.3";
-
-  rev-prefix = "xfce4-datetime-plugin-";
-  sha256 = "sha256-dpN5ZN7VjgO1GQ6v8NXuBKACyIwIosaiVGtmLEb6auI=";
-
-  nativeBuildInputs = [
-    gettext
-    intltool
-  ];
-
-  buildInputs = [
-    libxfce4ui
-    xfce4-panel
-  ];
-
-  meta = with lib; {
-    description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
-    teams = [ teams.xfce ];
-  };
-}

pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix

@@ -1,22 +1,49 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
   cairo,
   glib,
   gtk3,
   gtk-layer-shell,
   libX11,
+  libXi,
   libxfce4ui,
   libxfce4util,
-  xfce4-panel,
   libxfce4windowing,
+  xfce4-panel,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
+stdenv.mkDerivation (finalAttrs: {
-  category = "panel-plugins";
   pname = "xfce4-docklike-plugin";
-  version = "0.4.3";
+  version = "0.5.0";
-  sha256 = "sha256-cQ9B/sIzp1sq3GXPMtbb8xrfFhWiBS+FDe7/qlWVPdA=";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "panel-plugins";
+    repo = "xfce4-docklike-plugin";
+    tag = "xfce4-docklike-plugin-${finalAttrs.version}";
+    hash = "sha256-1R9qQKqn/CIV36GYmyg54t3xiY23qUs5EMLxvAIavK8=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    gettext
+    glib # glib-compile-resources
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     cairo
@@ -24,17 +51,20 @@ mkXfceDerivation {
     gtk3
     gtk-layer-shell
     libX11
+    libXi
     libxfce4ui
     libxfce4util
-    xfce4-panel
     libxfce4windowing
+    xfce4-panel
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-docklike-plugin-"; };
+
+  meta = {
     homepage = "https://docs.xfce.org/panel-plugins/xfce4-docklike-plugin/start";
     description = "Modern, minimalist taskbar for Xfce";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
-    platforms = platforms.linux;
+    teams = [ lib.teams.xfce ];
-    teams = [ teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})