From de6338094bd078019a0da89f74581c9fed198404 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:24:40 +0800 Subject: [PATCH 01/13] xfce.libxfce4ui: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/xfce/libxfce4ui/-/compare/libxfce4ui-4.18.1...libxfce4ui-4.18.2 Also don't quote NixOS in configureFlags since it is escaped and the about xfce window is showing this unnessary quote. --- pkgs/desktops/xfce/core/libxfce4ui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 56172917df7..668d626f60b 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,16 +4,16 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-1kzvFr/WeTl3HpVMJZRBgsvmG8VtYkdEbIQSniJIaHA="; + sha256 = "sha256-h9D0boBCCC4txnSRc6VcdNbrm8D21LwE63Q/LsExFNE="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; configureFlags = [ - "--with-vendor-info='NixOS'" + "--with-vendor-info=NixOS" ]; meta = with lib; { From bfde45b1df70fc5fff69ad2103d69b4e428b8414 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 06:25:56 +0000 Subject: [PATCH 02/13] xfce.mousepad: 0.5.10 -> 0.6.0 https://gitlab.xfce.org/apps/mousepad/-/compare/mousepad-0.5.10...mousepad-0.6.0 --- pkgs/desktops/xfce/applications/mousepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 884fffb35fd..6bc0079a670 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.10"; + version = "0.6.0"; odd-unstable = false; - sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM="; + sha256 = "sha256-VmpCjR8/3rsCGkVGhT+IdC6kaQkGz8G2ktFhJk32DeQ="; nativeBuildInputs = [ gobject-introspection ]; From 45e991cfb55e2293618ed92c664016e998ede7bf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:38:44 +0800 Subject: [PATCH 03/13] xfce.orage: 4.16.0 -> 4.18.0 https://gitlab.xfce.org/apps/orage/-/compare/orage-4.16.0...orage-4.18.0 The panel plugin has been removed. --- .../xfce/applications/orage/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index 102f8e9c212..00c2d5f85d9 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,44 +1,31 @@ { lib , mkXfceDerivation -, dbus-glib , gtk3 , libical , libnotify , libxfce4ui , popt , tzdata -, xfce4-panel -, withPanelPlugin ? true }: mkXfceDerivation { category = "apps"; pname = "orage"; - version = "4.16.0"; - odd-unstable = false; - sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw="; + version = "4.18.0"; + + sha256 = "sha256-vL9zexPbQKPqIzK5UqUIxkE9I7hEupkDOJehMgj2Leo="; buildInputs = [ - dbus-glib gtk3 libical libnotify libxfce4ui popt - ] - ++ lib.optionals withPanelPlugin [ - xfce4-panel ]; postPatch = '' substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; - - postConfigure = '' - # ensure pkgs.libical is used instead of one included in the orage sources - rm -rf libical ''; meta = with lib; { From 188962a0d0e8fe9a370b2d8c3aa91ada5b3cd271 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:42:24 +0800 Subject: [PATCH 04/13] xfce.parole: 4.16.0 -> 4.18.0 https://gitlab.xfce.org/apps/parole/-/compare/parole-4.16.0...parole-4.18.0 --- pkgs/desktops/xfce/applications/parole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 70d287dcdf4..070ea4f7d0c 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -7,9 +7,9 @@ mkXfceDerivation { category = "apps"; pname = "parole"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-9Rvhc8asFEb/+OU6uhuHKPl7w5mWBfzGP5ia0tiyDB4="; + sha256 = "sha256-TLH9ZUggjclJlbBg3EBVgbcrdiMZ8n+cGDgfNgYNiPI="; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ From 2a3a0d46d4c6cdc60b1be956963325662b80d660 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:50:02 +0800 Subject: [PATCH 05/13] xfce.ristretto: 0.12.4 -> 0.13.0 https://gitlab.xfce.org/apps/ristretto/-/compare/ristretto-0.12.4...ristretto-0.13.0 --- pkgs/desktops/xfce/applications/ristretto/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 10a75af99a3..11add14332d 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -11,9 +11,10 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.4"; + version = "0.13.0"; + odd-unstable = false; - sha256 = "sha256-pspS9zRvDOMz4+Ud43uT4gsDQhB51bwmaXPXcGlOhsY="; + sha256 = "sha256-K1cC5NnRv/C5ZiwMAmaQ8qxvlxHRsJ4F1TgR9CN8Qgc="; buildInputs = [ glib From 406e7ad9fb57872667616f5d463c476af73b4482 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:52:38 +0800 Subject: [PATCH 06/13] xfce.thunar: 4.18.3 -> 4.18.4 https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.18.3...thunar-4.18.4 --- 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 f4dfebb422f..d5ff7b99f4d 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.3"; + version = "4.18.4"; - sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc="; + sha256 = "sha256-tdk0sWUzTmYXk+dOPVOpjmODpqmhzQc9jAOCk2+yNKM="; nativeBuildInputs = [ docbook_xsl From 28de836c95c7292b703bb20c8300946371a2a9d2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:00:21 +0800 Subject: [PATCH 07/13] xfce.xfburn: 0.6.2 -> 0.7.0 https://gitlab.xfce.org/apps/xfburn/-/compare/xfburn-0.6.2...xfburn-0.7.0 --- pkgs/desktops/xfce/applications/xfburn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index e9fbd88894b..3bd58caee9c 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.6.2"; + version = "0.7.0"; + odd-unstable = false; - sha256 = "sha256-AUonNhMs2HBF1WBLdZNYmASTOxYt6A6WDKNtvZaGXQk="; + sha256 = "sha256-/CuV2tqja5fa2H2mmU9BP6tZHoCZZML5d2LL/CG3rno="; nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; From 351f24b3e0ec16432cb569b60379c08fe8ac961d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:04:11 +0800 Subject: [PATCH 08/13] xfce.xfce4-notifyd: 0.6.5 -> 0.8.2 https://gitlab.xfce.org/apps/xfce4-notifyd/-/compare/xfce4-notifyd-0.6.5...xfce4-notifyd-0.8.2 --- .../desktops/xfce/applications/xfce4-notifyd/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index b579e070076..8d75389b079 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -2,9 +2,11 @@ , mkXfceDerivation , glib , gtk3 +, libcanberra-gtk3 , libnotify , libxfce4ui , libxfce4util +, sqlite , xfce4-panel , xfconf }: @@ -12,16 +14,18 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.5"; + version = "0.8.2"; - sha256 = "sha256-NUEqQk9EcDl23twbo+DUt7QYZrPmWpsRzmi5wIdolqw="; + sha256 = "sha256-M8L2HWTuQDl/prD7s6uptkW4XDscpk6fc+epoxjFNS8="; buildInputs = [ gtk3 glib + libcanberra-gtk3 libnotify libxfce4ui libxfce4util + sqlite xfce4-panel xfconf ]; @@ -30,6 +34,7 @@ mkXfceDerivation { configureFlags = [ "--enable-dbus-start-daemon" + "--enable-sound" ]; meta = with lib; { From 291f20b5cb436f5ed9222637b2bbbca6246ca4cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:21:48 +0800 Subject: [PATCH 09/13] xfce.xfce4-panel: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/xfce/xfce4-panel/-/compare/xfce4-panel-4.18.1...xfce4-panel-4.18.2 --- pkgs/desktops/xfce/core/xfce4-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 155e3124207..c5489cc8802 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-5GJO8buOTnRGnm3+kesrZjTprCY1qiyookpW6dzI2AE="; + sha256 = "sha256-kqc+5pClmAPEkyNWKj4uPgwFFKBDWrwFHqRDWjYrwa4="; nativeBuildInputs = [ gobject-introspection From f1a9f5302bc7f8e68849b6deb42f6a0c67829451 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:26:42 +0800 Subject: [PATCH 10/13] xfce.xfce4-power-manager: 4.18.0 -> 4.18.1 https://gitlab.xfce.org/xfce/xfce4-power-manager/-/compare/xfce4-power-manager-4.18.0...xfce4-power-manager-4.18.1 --- pkgs/desktops/xfce/core/xfce4-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index d14752fbab4..3a4285b33b7 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-vl0SfZyVGxZYnSa2nCnYlqT05Hm7PLzOxgAGzapkKVI="; + sha256 = "sha256-H9tu94ZQLLQhXIDtIWL3qZJo/ux2xC2Y9m7uwwey8M8="; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ]; From 4acaba28d3625ad6018cd13d74788eca586c4b15 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:28:54 +0800 Subject: [PATCH 11/13] xfce.xfce4-session: 4.18.0 -> 4.18.1 https://gitlab.xfce.org/xfce/xfce4-session/-/compare/xfce4-session-4.18.0...xfce4-session-4.18.1 --- pkgs/desktops/xfce/core/xfce4-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index ab30dc49c5f..116d4d574ac 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-eSQXVMdwxr/yE806Tly8CLimmJso6k4muuTR7RHPU3U="; + sha256 = "sha256-mG+tyQ319fvQpitT6sb46R+8AF+3gxqPHMiGMAaqnSo="; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; From e5fdb2fce869bc2e337d2d8018ed96a9f451a195 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:36:18 +0800 Subject: [PATCH 12/13] xfce.xfce4-settings: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/xfce/xfce4-settings/-/compare/xfce4-settings-4.18.1...xfce4-settings-4.18.2 --- pkgs/desktops/xfce/core/xfce4-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 2c51baf4df7..3e0a43624cb 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-Uy5dObnMV+fpt8RdyFOsYVPN8Dyx1zzOu0pDak01ipQ="; + sha256 = "sha256-u8xto4tP9fsaPaY6dzv4Bj/C6qvltT5wXJlV+TzP5uE="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do From 49ca01bf9d93907ef7255289ced1b99797eea79c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 16:37:31 +0800 Subject: [PATCH 13/13] nixosTests.xfce: silence a deprecation warning trace: warning: Module argument `nodes.machine.config` is deprecated. Use `nodes.machine` instead. --- nixos/tests/xfce.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 31f00f77c40..3758ccbccf4 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' machine.wait_for_x() machine.wait_for_file("${user.home}/.Xauthority")