From 2417a5e2b5eac5d6575add01fe974de4d2681c48 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 13:38:38 +0000 Subject: [PATCH 01/10] xfce.thunar-archive-plugin: 0.5.2 -> 0.5.3 https://gitlab.xfce.org/thunar-plugins/thunar-archive-plugin/-/compare/thunar-archive-plugin-0.5.2...thunar-archive-plugin-0.5.3 --- pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index bdcca89a918e..93340bdb623e 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -5,20 +5,18 @@ thunar, exo, libxfce4util, - intltool, gettext, }: mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-archive-plugin"; - version = "0.5.2"; + version = "0.5.3"; odd-unstable = false; - sha256 = "sha256-vbuFosj2qxDus7vu9WfRiFpLwnTRnmLVGCDa0tNQecU="; + sha256 = "sha256-9EjEQml/Xdj/jCtC4ZuGdmpeNnOqUWJOqoVzLuxzG6s="; nativeBuildInputs = [ - intltool gettext ]; From 978bbf27dabaac39d87a9e4ae8196833b7dd0bdb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 13:38:43 +0000 Subject: [PATCH 02/10] xfce.thunar-media-tags-plugin: 0.4.0 -> 0.5.0 https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/-/compare/thunar-media-tags-plugin-0.4.0...thunar-media-tags-plugin-0.5.0 --- pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix | 6 ++---- 1 file changed, 2 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 a69eb7cd1e86..586498da7dbd 100644 --- a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix @@ -5,7 +5,6 @@ gtk3, thunar, libxfce4util, - intltool, gettext, taglib, }: @@ -13,13 +12,12 @@ mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-media-tags-plugin"; - version = "0.4.0"; + version = "0.5.0"; odd-unstable = false; - sha256 = "sha256-2WA7EtDmNl8XP0wK00iyQcSqV3mnfHNJZTKhBJ/YWPQ="; + sha256 = "sha256-71YBA1deR8aV8hoZ4F0TP+Q5sdcVQAB9n3B+pcpJMSQ="; nativeBuildInputs = [ - intltool gettext ]; From d9615b137e42e42af22abc6d8ca343cac6a30d1b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 13:39:01 +0000 Subject: [PATCH 03/10] xfce.thunar: 4.20.0 -> 4.20.1 https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.20.0...thunar-4.20.1 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 74318b3622d3..23e6799845ca 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -23,9 +23,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.20.0"; + version = "4.20.1"; - sha256 = "sha256-TCroFesFD0IKGdfuootd1BwEsWVECE2XQfUovJqPEh0="; + sha256 = "sha256-+Iz9tkP8foEtor1HFBB1/fyMXdLm3mXCoP9j9bug8po="; nativeBuildInputs = [ docbook_xsl From bdb288a90d2c634c22e6c08a6c8004a0837e4d25 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 13:39:37 +0000 Subject: [PATCH 04/10] xfce.xfce4-notes-plugin: 1.11.0 -> 1.11.1 https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/compare/xfce4-notes-plugin-1.11.0...xfce4-notes-plugin-1.11.1 --- .../xfce/panel-plugins/xfce4-notes-plugin/default.nix | 6 ++++-- 1 file changed, 4 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 f9be9c3d68e8..654f6d7ebeba 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -4,6 +4,7 @@ vala, glib, gtk3, + gtksourceview4, libxfce4ui, libxfce4util, xfce4-panel, @@ -13,8 +14,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-notes-plugin"; - version = "1.11.0"; - sha256 = "sha256-hAGgJIZaUjrizuriW2yX4uOKqRxpZ6BiUhnj4u3BOBA="; + version = "1.11.1"; + sha256 = "sha256-LeKQCsnHVataTP0rYn09x0Ddx8lMtVC0WW/jje7yXag="; odd-unstable = false; nativeBuildInputs = [ @@ -24,6 +25,7 @@ mkXfceDerivation { buildInputs = [ glib gtk3 + gtksourceview4 libxfce4ui libxfce4util xfce4-panel From d3ebeea249dc4b82edd0cf734f714ea531b1e32a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 13:40:26 +0000 Subject: [PATCH 05/10] xfce.xfce4-windowck-plugin: 0.5.1 -> 0.5.2 https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/compare/xfce4-windowck-plugin-0.5.1...xfce4-windowck-plugin-0.5.2 --- .../xfce4-windowck-plugin/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 970ad85a4199..d3ee36b6effb 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -2,10 +2,13 @@ stdenv, lib, fetchurl, - intltool, + gettext, pkg-config, + glib, + gtk3, libwnck, libxfce4ui, + libxfce4util, xfce4-panel, xfconf, gitUpdater, @@ -13,22 +16,25 @@ stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; - version = "0.5.1"; + version = "0.5.2"; 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="; + sha256 = "sha256-3E7V3JS9Bd5UlUQfDKuyYKs+H2ziex+skuN/kJwM/go="; }; nativeBuildInputs = [ - intltool + gettext pkg-config ]; buildInputs = [ + glib + gtk3 libwnck libxfce4ui + libxfce4util xfce4-panel xfconf ]; From a2ce386e3e1857e0e61f5aa54703ec0fc6a35d28 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 13:40:33 +0000 Subject: [PATCH 06/10] xfce.xfce4-xkb-plugin: 0.8.3 -> 0.8.5 https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/compare/xfce4-xkb-plugin-0.8.3...xfce4-xkb-plugin-0.8.5 --- pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b4c33dad6701..3bbeeee710d3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -16,8 +16,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; - version = "0.8.3"; - sha256 = "sha256-qWxjULrBpueQS3gxwRg49cQ3ovlQ8iWvYZ6Z/THm+/s="; + version = "0.8.5"; + sha256 = "sha256-oG3+OudjJIXfGII16bYaIGy4QMno00HX3kX+8H0VUcU="; buildInputs = [ garcon From d9f318abd0f3dabd13f829c23c339bac8e2cd60a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 22:21:10 +0800 Subject: [PATCH 07/10] xfce.xfconf: Explicitly add perl This builds because xfce.xfce4-dev-tools propagates intltool, which propagates perl. But since Xfce is actively getting rid of intltool let's get ready for it. --- pkgs/desktops/xfce/core/xfconf/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index 82a33a4b458e..8ca8990c17b7 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,8 +1,11 @@ -{ lib -, mkXfceDerivation -, libxfce4util -, gobject-introspection -, vala +{ + lib, + mkXfceDerivation, + gobject-introspection, + perl, + vala, + libxfce4util, + glib, }: mkXfceDerivation { @@ -12,10 +15,16 @@ mkXfceDerivation { sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw="; - nativeBuildInputs = [ gobject-introspection vala ]; + nativeBuildInputs = [ + gobject-introspection + perl + vala + ]; buildInputs = [ libxfce4util ]; + propagatedBuildInputs = [ glib ]; + meta = with lib; { description = "Simple client-server configuration storage and query system for Xfce"; mainProgram = "xfconf-query"; From 267ff42cd70f34971bc1cf59efc2fa827faf00f9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 22:24:18 +0800 Subject: [PATCH 08/10] xfce.libxfce4ui: Explicitly add perl This builds because xfce.xfce4-dev-tools propagates intltool, which propagates perl. But since Xfce is actively getting rid of intltool let's get ready for it. --- pkgs/desktops/xfce/core/libxfce4ui/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 780c3ca990f8..12c2d2968159 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -2,6 +2,7 @@ mkXfceDerivation, lib, gobject-introspection, + perl, vala, libICE, libSM, @@ -23,6 +24,7 @@ mkXfceDerivation { nativeBuildInputs = [ gobject-introspection + perl vala ]; From 258d7b7f8b3b532bd2dd7adf9d4e0033659b83e7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 22:29:35 +0800 Subject: [PATCH 09/10] xfce.exo: Move perl to nativeBuildInputs * exo-compose-mail has been removed (both here and xfce4-settings). * Xfce is actively getting rid of intltool and to get ready for it, make-exo-alias.pl requires perl. --- pkgs/desktops/xfce/core/exo/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 8567100f076b..935d7fd23cf3 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -1,5 +1,14 @@ -{ lib, mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3 -, libxfce4ui, libxfce4util, perl }: +{ + lib, + mkXfceDerivation, + docbook_xsl, + glib, + libxslt, + gtk3, + libxfce4ui, + libxfce4util, + perl, +}: mkXfceDerivation { category = "xfce"; @@ -11,6 +20,7 @@ mkXfceDerivation { nativeBuildInputs = [ libxslt docbook_xsl + perl ]; buildInputs = [ @@ -18,7 +28,6 @@ mkXfceDerivation { glib libxfce4ui libxfce4util - (perl.withPackages(ps: with ps; [ URI ])) # for $out/lib/xfce4/exo/exo-compose-mail ]; meta = with lib; { From 19a2e43800aa2c833ba47376e71a50da44780623 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 31 Dec 2024 22:31:42 +0800 Subject: [PATCH 10/10] xfce.xfce4-panel: Explicitly add perl This builds because xfce.xfce4-dev-tools propagates intltool, which propagates perl. But since Xfce is actively getting rid of intltool let's get ready for it. --- pkgs/desktops/xfce/core/xfce4-panel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index cf664c9c6e7d..e3680e2da761 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -11,6 +11,7 @@ , libxfce4ui , libxfce4util , libxfce4windowing +, perl , tzdata , vala , wayland @@ -26,6 +27,7 @@ mkXfceDerivation { nativeBuildInputs = [ gobject-introspection + perl vala ];