From 39ee9df4329fc7cd49ea41ccb08d71f9c5460e29 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 20:57:03 +0800 Subject: [PATCH 1/6] xfce.xfce4-screensaver: 4.16.0 -> 4.18.0 https://gitlab.xfce.org/apps/xfce4-screensaver/-/compare/xfce4-screensaver-4.16.0...xfce4-screensaver-4.18.0 --- .../xfce/applications/xfce4-screensaver/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix index 4ac72b02da1a..2fa9766f8d52 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix @@ -8,6 +8,7 @@ , libXrandr , libwnck , libxfce4ui +, libxfce4util , libxklavier , pam , systemd @@ -18,9 +19,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screensaver"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "1vblqhhzhv85yd5bz1xg14yli82ys5qrjdcabg3l53glbk61n99p"; + sha256 = "sha256-W9rEssR6jHMBM2m1lCBvj7YMOGOTaqBAOP7grQ01880="; buildInputs = [ dbus-glib @@ -32,6 +33,7 @@ mkXfceDerivation { libXrandr libwnck libxfce4ui + libxfce4util libxklavier pam systemd From 7461adb605437c8cc4d0cf0e42eb1aeb968daa06 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 20:59:33 +0800 Subject: [PATCH 2/6] xfce.thunar-archive-plugin: 0.4.0 -> 0.5.0 https://gitlab.xfce.org/thunar-plugins/thunar-archive-plugin/-/compare/thunar-archive-plugin-0.4.0...thunar-archive-plugin-0.5.0 --- pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index ef1271bcba82..dfe6824375bb 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -11,9 +11,10 @@ mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-archive-plugin"; - version = "0.4.0"; + version = "0.5.0"; + odd-unstable = false; - sha256 = "sha256-aEAErm87K2k8TAz2ZtMQEhmzhOeR2hkJjcoBUFn8I50="; + sha256 = "sha256-3a42chfv4UQYkvWKCX0FShAcEwt9icJARTHGEgs6/8M="; nativeBuildInputs = [ intltool From 802ed4b27a7dcb3784eb35c04724931872cf619a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 21:06:55 +0800 Subject: [PATCH 3/6] xfce.thunar-media-tags-plugin: 0.3.0 -> 0.4.0 https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/-/compare/thunar-media-tags-plugin-0.3.0...thunar-media-tags-plugin-0.4.0 --- pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix index 65f9942b3a53..570f0aeafcfe 100644 --- a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix @@ -1,8 +1,8 @@ { lib , mkXfceDerivation +, glib , gtk3 , thunar -, exo , libxfce4util , intltool , gettext @@ -12,10 +12,10 @@ mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-media-tags-plugin"; - version = "0.3.0"; + version = "0.4.0"; odd-unstable = false; - sha256 = "sha256-jtgcHH5U5GOvzDVUwPEreMtTdk5DT6sXvFPDbzbF684="; + sha256 = "sha256-2WA7EtDmNl8XP0wK00iyQcSqV3mnfHNJZTKhBJ/YWPQ="; nativeBuildInputs = [ intltool @@ -24,7 +24,7 @@ mkXfceDerivation { buildInputs = [ thunar - exo + glib gtk3 libxfce4util taglib From 58bcff71bb1fbafa3471d2f386d19e19bb6df7a9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 21:31:04 +0800 Subject: [PATCH 4/6] xfce.xfce4-notes-plugin: 1.9.0 -> 1.10.0 https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/compare/xfce4-notes-plugin-1.9.0...xfce4-notes-plugin-1.10.0 --- .../xfce/panel-plugins/xfce4-notes-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0d6782dc821e..4c5a726f2f1d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -13,11 +13,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-notes-plugin"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg="; + sha256 = "sha256-LuRAYELt01KpHhZsg7YNEyIO8E3OP6a54OsTY21jaSk="; }; nativeBuildInputs = [ From fb05346f21b23f0dcaf26756ec6d67e7fde45653 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 21:45:37 +0800 Subject: [PATCH 5/6] xfce.xfce4-windowck-plugin: 0.5.0 -> 0.5.1 https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/compare/v0.5.0...xfce4-windowck-plugin-0.5.1 --- .../xfce4-windowck-plugin/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 53c154bdeecc..6c0a7bafe39e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,37 +1,47 @@ -{ lib -, mkXfceDerivation -, imagemagick +{ stdenv +, lib +, fetchurl +, intltool +, pkg-config , libwnck , libxfce4ui -, python3 , xfce4-panel , xfconf +, gitUpdater }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; - version = "0.5.0"; - rev-prefix = "v"; - odd-unstable = false; - sha256 = "sha256-MhNSgI74VLdoS5yL6nfRrVrPvv7+0P5meO4zQheYFzo="; + version = "0.5.1"; + + src = fetchurl { + # Use dist tarballs to avoid pulling extra deps and generating images ourselves. + url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2"; + sha256 = "sha256-p4FEi3gemE072lmw2qsNGE1M7CJSMW9zcKxKmO/kgfQ="; + }; + + nativeBuildInputs = [ + intltool + pkg-config + ]; buildInputs = [ - imagemagick libwnck libxfce4ui - python3 xfce4-panel xfconf ]; - postPatch = '' - patchShebangs themes/windowck{,-dark}/{xfwm4,unity}/generator.py - ''; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin"; + rev-prefix = "xfce4-windowck-plugin-"; + }; meta = with lib; { description = "Xfce panel plugin for displaying window title and buttons"; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin"; license = licenses.gpl3Plus; + platforms = platforms.linux; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } From b4744bf28bac0c7609e694a0b6adaa7c9770bb14 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Mar 2023 21:53:45 +0800 Subject: [PATCH 6/6] xfce.xfce4-xkb-plugin: 0.8.2 -> 0.8.3 https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/compare/0.8.2...xfce4-xkb-plugin-0.8.3 --- .../xfce/panel-plugins/xfce4-xkb-plugin/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index 97332cf36e98..40ac161879b7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,6 +1,7 @@ { lib , mkXfceDerivation , gtk3 +, libnotify , librsvg , libwnck , libxklavier @@ -14,13 +15,13 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; - version = "0.8.2"; - rev-prefix = ""; - sha256 = "sha256-xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg="; + version = "0.8.3"; + sha256 = "sha256-qWxjULrBpueQS3gxwRg49cQ3ovlQ8iWvYZ6Z/THm+/s="; buildInputs = [ garcon gtk3 + libnotify # optional notification support librsvg libxfce4ui libxfce4util