Xfce updates 2025-05-26 (#411149)

pkgs/desktops/xfce/thunar-plugins/archive/default.nix

@@ -1,38 +1,53 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  meson,
+  ninja,
+  pkg-config,
+  glib,
   gtk3,
   thunar,
-  exo,
   libxfce4util,
   gettext,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "thunar-plugins";
+stdenv.mkDerivation (finalAttrs: {
   pname = "thunar-archive-plugin";
-  version = "0.5.3";
-  odd-unstable = false;
+  version = "0.6.0";
 
-  sha256 = "sha256-9EjEQml/Xdj/jCtC4ZuGdmpeNnOqUWJOqoVzLuxzG6s=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "thunar-plugins";
+    repo = "thunar-archive-plugin";
+    tag = "thunar-archive-plugin-${finalAttrs.version}";
+    hash = "sha256-/WLkEqzFAKpB7z8mWSgufo4Qbj6KP3Ax8MWVZxIwDs0=";
+  };
+
+  strictDeps = true;
 
   nativeBuildInputs = [
     gettext
+    meson
+    ninja
+    pkg-config
   ];
 
   buildInputs = [
     thunar
-    exo
+    glib
     gtk3
     libxfce4util
   ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  passthru.updateScript = gitUpdater { rev-prefix = "thunar-archive-plugin-"; };
 
-  meta = with lib; {
+  meta = {
     description = "Thunar plugin providing file context menus for archives";
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/thunar-plugins/thunar-archive-plugin";
+    license = lib.licenses.lgpl2Only;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix

@@ -1,24 +1,48 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  fetchpatch,
+  meson,
+  ninja,
+  pkg-config,
   glib,
   gtk3,
   thunar,
   libxfce4util,
   gettext,
   taglib,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "thunar-plugins";
+stdenv.mkDerivation (finalAttrs: {
   pname = "thunar-media-tags-plugin";
-  version = "0.5.0";
-  odd-unstable = false;
+  version = "0.6.0";
 
-  sha256 = "sha256-71YBA1deR8aV8hoZ4F0TP+Q5sdcVQAB9n3B+pcpJMSQ=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "thunar-plugins";
+    repo = "thunar-media-tags-plugin";
+    tag = "thunar-media-tags-plugin-${finalAttrs.version}";
+    hash = "sha256-qEoBga+JSxpByOjqhOspjYknF0p74oXZnpoDz2MSBOA=";
+  };
+
+  patches = [
+    # meson-build: Fix typo libxfce4ui -> libxfce4util
+    # https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/-/merge_requests/14
+    (fetchpatch {
+      url = "https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/-/commit/4e19a56deeeefa6d913f7b15a12b30a5d99119d4.patch";
+      hash = "sha256-ASVknxEiGOWbE82hVlgEAOqE+8TknAh/ULQg55mfs9o=";
+    })
+  ];
+
+  strictDeps = true;
 
   nativeBuildInputs = [
     gettext
+    meson
+    ninja
+    pkg-config
   ];
 
   buildInputs = [
@@ -29,9 +53,14 @@ mkXfceDerivation {
     taglib
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "thunar-media-tags-plugin-"; };
+
+  meta = {
     description = "Thunar plugin providing tagging and renaming features for media files";
-    maintainers = with maintainers; [ ncfavier ];
-    teams = [ teams.xfce ];
+    homepage = "https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ncfavier ];
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/desktops/xfce/thunar-plugins/vcs/default.nix

@@ -1,8 +1,15 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
   thunar,
   exo,
+  libxfce4ui,
   libxfce4util,
   gtk3,
   glib,
@@ -10,19 +17,36 @@
   apr,
   aprutil,
   withSubversion ? false,
+  gitUpdater,
 }:
-mkXfceDerivation {
-  category = "thunar-plugins";
-  pname = "thunar-vcs-plugin";
-  version = "0.3.0";
-  odd-unstable = false;
 
-  sha256 = "sha256-e9t6lIsvaV/2AAL/7I4Pbcokvy7Lp2+D9sJefTZqB1g=";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "thunar-vcs-plugin";
+  version = "0.4.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "thunar-plugins";
+    repo = "thunar-vcs-plugin";
+    tag = "thunar-vcs-plugin-${finalAttrs.version}";
+    hash = "sha256-VuTTao46/3JNzCHv7phCC8DCy9rjlEcMuGmGiIOSsMM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   buildInputs =
     [
       thunar
       exo
+      libxfce4ui
       libxfce4util
       gtk3
       glib
@@ -33,9 +57,18 @@ mkXfceDerivation {
       subversion
     ];
 
+  mesonFlags = [
+    (lib.mesonEnable "svn" withSubversion)
+  ];
+
+  passthru.updateScript = gitUpdater { rev-prefix = "thunar-vcs-plugin-"; };
+
   meta = {
     description = "Thunar plugin providing support for Subversion and Git";
+    homepage = "https://gitlab.xfce.org/thunar-plugins/thunar-vcs-plugin";
+    license = lib.licenses.lgpl2Only;
     maintainers = with lib.maintainers; [ lordmzte ];
     teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})