From 49a720663dbc43f4b453199f69a437258b3423e9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 23:13:37 +0800 Subject: [PATCH 1/6] xfce.xfce4-mpc-plugin: Enable strictDeps --- pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 14bc1ffdbeb2..38ef33ee1a0a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3uW8wFZrotyVucO0yt1eizuyeYpUoqjYZScIkV/kXVA="; }; + strictDeps = true; + nativeBuildInputs = [ gettext meson From 38ef6d1f8d16d67268d33186d879a4ee8ae80123 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 22:49:35 +0800 Subject: [PATCH 2/6] xfce.xfce4-netload-plugin: 1.4.2 -> 1.5.0 https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/compare/xfce4-netload-plugin-1.4.2...xfce4-netload-plugin-1.5.0 --- .../xfce4-netload-plugin/default.nix | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 3cd0e2c76456..43d64ea5672a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -1,20 +1,39 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, glib, gtk3, libxfce4ui, libxfce4util, xfce4-panel, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-netload-plugin"; - version = "1.4.2"; - rev-prefix = "xfce4-netload-plugin-"; - odd-unstable = false; - sha256 = "sha256-g4pkNzggVjC0AuUnJeleR3RQCrneetjDyv8eCXmrYzI="; + version = "1.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-netload-plugin"; + tag = "xfce4-netload-plugin-${finalAttrs.version}"; + hash = "sha256-iZnfPCOHg0+eo8ubfIsweH2T/DSLeL2Q+giWK/Vkpko="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; buildInputs = [ glib @@ -24,8 +43,13 @@ mkXfceDerivation { xfce4-panel ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-netload-plugin-"; }; + + meta = { description = "Internet load speed plugin for Xfce4 panel"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) From c65dff6ae1a38a3b18104271c4be96734eb2c5f9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 22:52:36 +0800 Subject: [PATCH 3/6] xfce.xfce4-notes-plugin: 1.11.2 -> 1.12.0 https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/compare/xfce4-notes-plugin-1.11.2...xfce4-notes-plugin-1.12.0 --- .../xfce4-notes-plugin/default.nix | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index cf2159727058..61dedff5b9a1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -1,7 +1,13 @@ { - mkXfceDerivation, + stdenv, lib, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, vala, + wrapGAppsHook3, glib, gtk3, gtksourceview4, @@ -9,17 +15,30 @@ libxfce4util, xfce4-panel, xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-notes-plugin"; - version = "1.11.2"; - sha256 = "sha256-qORKaqpLVPIB5t1JtClP3Ey8yBTKY46YsMIc/fGV688="; - odd-unstable = false; + version = "1.12.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-notes-plugin"; + tag = "xfce4-notes-plugin-${finalAttrs.version}"; + hash = "sha256-q8XQSLhnD7rnRfmNEunc4rKpFSWg9Ja4W7fs5lrnhZ0="; + }; + + strictDeps = true; nativeBuildInputs = [ + gettext + meson + ninja + pkg-config vala + wrapGAppsHook3 ]; buildInputs = [ @@ -32,11 +51,13 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-notes-plugin-"; }; + + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; description = "Sticky notes plugin for Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) From 9e0f4552d8f4f8311ee753e7a71fbdf7cdc1acc8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 23:01:00 +0800 Subject: [PATCH 4/6] xfce.xfce4-sensors-plugin: 1.4.5 -> 1.5.0 https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/compare/xfce4-sensors-plugin-1.4.5...xfce4-sensors-plugin-1.5.0 --- .../xfce4-sensors-plugin/default.nix | 59 +++++++++---------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 92b00ce574f8..34d58203d0c2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -3,73 +3,70 @@ lib, fetchurl, gettext, + meson, + ninja, pkg-config, + wrapGAppsHook3, + glib, gtk3, + libX11, + libXext, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, - hddtemp, - netcat-gnu, libXNVCtrl, nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl, gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-sensors-plugin"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-9p/febf3bSqBckgoEkpvznaAOpEipMgt6PPfo++7F5o="; + url = "mirror://xfce/src/panel-plugins/xfce4-sensors-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-sensors-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-hARCuH/d3NhZW9n4Pqi4H3cf4pa7nSq/Dhl54ghyeuk="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config + wrapGAppsHook3 ]; buildInputs = [ + glib gtk3 + libX11 + libXext libxfce4ui libxfce4util xfce4-panel libnotify lm_sensors - hddtemp - netcat-gnu ] ++ lib.optionals nvidiaSupport [ libXNVCtrl ]; - enableParallelBuilding = true; - - configureFlags = - [ - "--with-pathhddtemp=${hddtemp}/bin/hddtemp" - "--with-pathnetcat=${netcat-gnu}/bin/netcat" - ] - ++ lib.optionals nvidiaSupport [ - # Have to be explicitly enabled since this tries to figure out the default - # based on the existence of a hardcoded `/usr/include/NVCtrl` path. - "--enable-xnvctrl" - ]; + mesonFlags = [ + (lib.mesonEnable "xnvctrl" nvidiaSupport) + ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin"; + rev-prefix = "xfce4-sensors-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "Panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; mainProgram = "xfce4-sensors"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + teams = [ lib.teams.xfce ]; }; -} +}) From 003cedf55dbb548680389420eaeaf3c1463a3b53 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 23:11:10 +0800 Subject: [PATCH 5/6] xfce.xfce4-systemload-plugin: 1.3.3 -> 1.4.0 https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/compare/xfce4-systemload-plugin-1.3.3...xfce4-systemload-plugin-1.4.0 --- .../xfce4-systemload-plugin/default.nix | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 17d0c25af8bb..c3a0f7668dc8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -3,50 +3,59 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, xfce4-panel, + glib, + gtk3, libgtop, libxfce4ui, + libxfce4util, upower, xfconf, gitUpdater, }: -let - category = "panel-plugins"; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-systemload-plugin"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-aFLV2cmnTQ4NtYLG9f5zkOvkii61aSF3rhLhxMzG78k="; + url = "mirror://xfce/src/panel-plugins/xfce4-systemload-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-systemload-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-bjY7z4RbuIMptShY1loexuANtRIa6SRuRusDE12VacY="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; buildInputs = [ + glib + gtk3 libgtop libxfce4ui + libxfce4util upower xfce4-panel xfconf ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin"; + rev-prefix = "xfce4-systemload-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; description = "System load plugin for Xfce panel"; - license = licenses.bsd2; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) From f9be3dc20664a055810f034c8e8c59ea26b9f2c7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 23:19:37 +0800 Subject: [PATCH 6/6] xfce.xfce4-time-out-plugin: 1.1.4 -> 1.2.0 https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/compare/xfce4-time-out-plugin-1.1.4...xfce4-time-out-plugin-1.2.0 --- .../xfce4-time-out-plugin/default.nix | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix index 9a263b13cf0c..317edc3bb139 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix @@ -1,34 +1,57 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, glib, gtk3, + libX11, libxfce4ui, libxfce4util, xfce4-panel, - xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-time-out-plugin"; - version = "1.1.4"; - rev-prefix = "xfce4-time-out-plugin-"; - odd-unstable = false; - sha256 = "sha256-FYcmeOBSBxcPSm/4j294DSi8XZBTKHvAwTBdj0yCY7o="; + version = "1.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-time-out-plugin"; + tag = "xfce4-time-out-plugin-${finalAttrs.version}"; + hash = "sha256-hyeqSnynsjAeD67oPjQs0ZeLKreXFMZXmvu38zweqrE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; buildInputs = [ glib gtk3 + libX11 libxfce4ui libxfce4util xfce4-panel - xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-time-out-plugin-"; }; + + meta = { description = "Panel plug-in to take periodical breaks from the computer"; - license = licenses.gpl2Plus; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +})