From 3fc0e6bf2afa74c4db0b859736a243b9b822606c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 28 May 2025 15:26:31 +0000 Subject: [PATCH 1/4] xfce.catfish: 4.20.0 -> 4.20.1 https://gitlab.xfce.org/apps/catfish/-/compare/catfish-4.20.0...catfish-4.20.1 --- pkgs/desktops/xfce/applications/catfish/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 23b20da18793..0102a1241999 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - desktop-file-utils, gobject-introspection, meson, ninja, @@ -19,18 +18,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "catfish"; - version = "4.20.0"; + version = "4.20.1"; src = fetchFromGitLab { domain = "gitlab.xfce.org"; owner = "apps"; repo = "catfish"; rev = "catfish-${finalAttrs.version}"; - hash = "sha256-7ERE6R714OuqTjeNZw3K6HvQTA8OIglG6+8Kiawwzu8="; + hash = "sha256-mTAunc1GJLkSu+3oWD5+2sCQemWdVsUURlP09UkbVyw="; }; nativeBuildInputs = [ - desktop-file-utils gobject-introspection meson ninja From 1b0cc31e5342807165d03f0e016f7698f9f4355b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 28 May 2025 23:31:04 +0800 Subject: [PATCH 2/4] xfce.gigolo: 0.5.4 -> 0.6.0 https://gitlab.xfce.org/apps/gigolo/-/compare/gigolo-0.5.4...gigolo-0.6.0 --- .../xfce/applications/gigolo/default.nix | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 26159f534861..18ea497cbfb7 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -1,27 +1,51 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + meson, + ninja, + pkg-config, + wrapGAppsHook3, gtk3, glib, + gitUpdater, }: -mkXfceDerivation { - category = "apps"; +stdenv.mkDerivation (finalAttrs: { pname = "gigolo"; - version = "0.5.4"; - odd-unstable = false; + version = "0.6.0"; - sha256 = "sha256-gRv1ZQLgwwzFERnco2Dm2PkT/BNDIZU6fX+HdhiRCJk="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = "gigolo"; + tag = "gigolo-${finalAttrs.version}"; + hash = "sha256-tyFjVvtDE25y6rnmlESdl8s/GdyHGqbn2Dn/ymIIgWs="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + glib # glib-compile-resources + meson + ninja + pkg-config + wrapGAppsHook3 + ]; buildInputs = [ gtk3 glib ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "gigolo-"; }; + + meta = { description = "Frontend to easily manage connections to remote filesystems"; + homepage = "https://gitlab.xfce.org/apps/gigolo"; + license = lib.licenses.gpl2Plus; mainProgram = "gigolo"; - license = with licenses; [ gpl2Only ]; - teams = [ teams.xfce ]; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) From 910eb26adcb45bf94330fcf8da4e6abebe0c0d2c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 28 May 2025 23:38:20 +0800 Subject: [PATCH 3/4] xfce.parole: 4.18.2 -> 4.20.0 https://gitlab.xfce.org/apps/parole/-/compare/parole-4.18.2...parole-4.20.0 --- .../xfce/applications/parole/default.nix | 57 ++++++++++++++----- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 59f753cfecf2..f3a5c0de09ae 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -1,9 +1,15 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + meson, + ninja, + pkg-config, + wrapGAppsHook3, dbus, dbus-glib, gst_all_1, + glib, gtk3, libnotify, libX11, @@ -11,24 +17,40 @@ libxfce4util, taglib, xfconf, + gitUpdater, }: -# Doesn't seem to find H.264 codec even though built with gst-plugins-bad. - -mkXfceDerivation { - category = "apps"; +stdenv.mkDerivation (finalAttrs: { pname = "parole"; - version = "4.18.2"; + version = "4.20.0"; - sha256 = "sha256-C4dGiMYn51YuASsQeQs3Cbc+KkPqcOrsCMS+dYfP+Ps="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = "parole"; + tag = "parole-${finalAttrs.version}"; + hash = "sha256-I1wZsuZ/NM5bH6QTJpwd5WL9cIGNtkAxA2j5vhhdaTE="; + }; - buildInputs = with gst_all_1; [ + strictDeps = true; + + nativeBuildInputs = [ + dbus-glib # dbus-binding-tool + glib # glib-genmarshal + meson + ninja + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ dbus dbus-glib - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + glib gtk3 libnotify libX11 @@ -38,9 +60,14 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "parole-"; }; + + meta = { description = "Modern simple media player"; + homepage = "https://gitlab.xfce.org/apps/parole"; + license = lib.licenses.gpl2Plus; mainProgram = "parole"; - teams = [ teams.xfce ]; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) From 6a3ce221e24e9302fa2bfe1a51ae34551c7aac46 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 28 May 2025 23:53:04 +0800 Subject: [PATCH 4/4] xfce.xfce4-panel-profiles: 1.0.15 -> 1.1.1 https://gitlab.xfce.org/apps/xfce4-panel-profiles/-/compare/xfce4-panel-profiles-1.0.15...xfce4-panel-profiles-1.1.1 --- .../xfce4-panel-profiles/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix index 02a0bb707455..88d2741a52f5 100644 --- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix @@ -4,10 +4,14 @@ fetchFromGitLab, gettext, gobject-introspection, + meson, + ninja, + pkg-config, wrapGAppsHook3, glib, gtk3, libxfce4ui, + libxfce4util, python3, gitUpdater, }: @@ -20,19 +24,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "xfce4-panel-profiles"; - version = "1.0.15"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.xfce.org"; owner = "apps"; repo = "xfce4-panel-profiles"; rev = "xfce4-panel-profiles-${finalAttrs.version}"; - sha256 = "sha256-UxXxj0lxJhaMv5cQoyz+glJiLwvIFfpPu27TCNDhoL0="; + hash = "sha256-4sUNlabWp6WpBlePVFHejq/+TXiJYSQTnZFp5B258Wc="; }; nativeBuildInputs = [ gettext gobject-introspection + meson + ninja + pkg-config wrapGAppsHook3 ]; @@ -40,15 +47,13 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 libxfce4ui + libxfce4util pythonEnv ]; - configurePhase = '' - runHook preConfigure - # This is just a handcrafted script and does not accept additional arguments. - ./configure --prefix=$out - runHook postConfigure - ''; + mesonFlags = [ + "-Dpython-path=${lib.getExe pythonEnv}" + ]; passthru.updateScript = gitUpdater { rev-prefix = "xfce4-panel-profiles-"; };