From 1f56c74b7878ee5bf29929e0e53b6ab36c0c6b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:16:01 +0300 Subject: [PATCH 01/24] xfce.libxfce4util: 4.16.0 -> 4.18.0 --- pkgs/desktops/xfce/core/libxfce4util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index 4262a0393035..a2bdee37eb69 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-q2vH4k1OiergjITOaA9+m92C3Q/sbPoKVrAFxG60Gtw="; + sha256 = "sha256-m4O/vTFqzkF6rzyGVw8xdwcX7S/SyOSJo8aCZjniXAw="; nativeBuildInputs = [ gobject-introspection vala ]; From 98952621219e1dbe39c0cfecdea4df8fd3e56204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:16:13 +0300 Subject: [PATCH 02/24] xfce.libxfce4ui: 4.16.1 -> 4.18.0 --- pkgs/desktops/xfce/core/libxfce4ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index fc3535127fa2..e664ae778827 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; + sha256 = "sha256-AYjnIi9l3l4g+wqGrPhS2AEsYNJwK1KMofCeyEz+VHs="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; From 9c6bd398106f69980707fb9658d39bb9f9df92e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:25:40 +0300 Subject: [PATCH 03/24] xfce.xfce4-dev-tools: 4.16.0 -> 4.18.0 --- pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 16c35e6002bf..25b3e6f80599 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-5r9dJfCgXosXoOAtNg1kaPWgFEAmyw/pWTtdG+K1h3A="; + sha256 = "sha256-VgQiTRMPD1VeUkUnFkX78C2VrsrXFWCdmupL8PQc7+c="; nativeBuildInputs = [ autoreconfHook From 3ba93dfa5c6c0e3802edf500231e69fe6e33402a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:27:31 +0300 Subject: [PATCH 04/24] xfce.xfce4-panel: 4.16.5 -> 4.18.0 --- 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 fed25720e336..d76523a94c3c 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -17,9 +17,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.5"; + version = "4.18.0"; - sha256 = "sha256-RK4sEir8CvB1aa2dZWJftA+2n4YPUEkhF9afOfOTA0Y="; + sha256 = "sha256-CnZk0Ca3IG6nmiwe7eIvPqpzJgRZHIyqeoTA5cPpU7s="; nativeBuildInputs = [ gobject-introspection From 39593bc0c3ce7f53dac4c464a686465d6b172194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:28:50 +0300 Subject: [PATCH 05/24] xfce.xfce4-power-manager: 4.16.0 -> 4.18.0 --- 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 107357d5a731..d14752fbab46 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.16.0"; + version = "4.18.0"; - sha256 = "sha256-Qk++1db+agiU99p+QW8/WNnNqFVejV/BcnmgvfoB3OU="; + sha256 = "sha256-vl0SfZyVGxZYnSa2nCnYlqT05Hm7PLzOxgAGzapkKVI="; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ]; From e3c321a0d26e4327caceb82d16f2eae508e2def8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:30:02 +0300 Subject: [PATCH 06/24] xfce.xfce4-session: 4.16.0 -> 4.18.0 --- 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 5ce96c1b02b6..f8dc8b92da30 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.16.0"; + version = "4.18.0"; - sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0="; + sha256 = "sha256-eSQXVMdwxr/yE806Tly8CLimmJso6k4muuTR7RHPU3U="; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; From 14724daacb288a689a8f5a143745a40de35941f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:31:18 +0300 Subject: [PATCH 07/24] xfce.xfce4-settings: 4.16.5 -> 4.18.0 --- 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 bf003fca5a47..6e0990e9098d 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.5"; + version = "4.18.0"; - sha256 = "sha256-ZVQw/oqN+jCOWj8O+1ldVCvbzY+QcebaQI5oFOdMOew="; + sha256 = "sha256-T0sPcsyGqa0hEXIb/mhxb29OnuLmHey6Tt/iB4nQvoM="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do From 7e968b1c1063058d83a587d121cdf534a7383714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:32:30 +0300 Subject: [PATCH 08/24] xfce.xfconf: 4.16.0 -> 4.18.0 --- pkgs/desktops/xfce/core/xfconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index c3946258292b..18bc54436b4a 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-w8wnHFj1KBX6lCnGbVLgWPEo2ul4SwfemUYVHioTlwE="; + sha256 = "sha256-8zl2EWV1DRHsH0QUNa13OKvfIVDVOhIO0FCMbU978Js="; nativeBuildInputs = [ gobject-introspection vala ]; From dd6c8302444d6e8178dcd0d7af95d31a5b34aab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:35:20 +0300 Subject: [PATCH 09/24] xfce.xfdesktop: 4.16.1 -> 4.18.0 --- pkgs/desktops/xfce/core/xfdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index bc3c714eb0a4..7d6774165799 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-JecuD0DJASHaxL6gwmL3hcmAEA7sVIyaM0ushrdq4/Y="; + sha256 = "sha256-HZVu5UVLKDCWaUpw1SV8E0JLGRG946w4QLlA51rg/Bo="; buildInputs = [ exo From d81262fb733698e2acc0dc2d569a6dca01dc4976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:36:18 +0300 Subject: [PATCH 10/24] xfce.xfwm4: 4.16.1 -> 4.18.0 --- pkgs/desktops/xfce/core/xfwm4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index efc12dd91eb9..abd08f5a6f3d 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-CwRJk+fqu3iC4Vb6fKGOIZZk2hxTqYF3sNvm6WKqHdI="; + sha256 = "sha256-nTPgxC0XMBJ48lPCeQgCvWWK1/2ZIoQOYsMeaxDpE1c="; nativeBuildInputs = [ exo librsvg ]; From 1b845e3e84c7153d0a154b59a7cfbf993931e3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:38:31 +0300 Subject: [PATCH 11/24] xfce.thunar: 4.16.11 -> 4.18.0 --- pkgs/desktops/xfce/core/thunar/default.nix | 10 ++-- .../thunar/thunarx_plugins_directory.patch | 48 ------------------- pkgs/desktops/xfce/core/thunar/wrapper.nix | 4 +- 3 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index dd8e8f980948..2a6878fbf76d 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.16.11"; + version = "4.18.0"; - sha256 = "sha256-xan0HuHYLVArx3dGzzxsCjQ8eWsXNk0LtZGAejA2iGI="; + sha256 = "sha256-vsc5vEdyYEtpKktBiIRayZl7MjHrxKzL7iwzvBCAqG0="; nativeBuildInputs = [ docbook_xsl @@ -44,9 +44,9 @@ let unwrapped = mkXfceDerivation { xfconf ]; - patches = [ - ./thunarx_plugins_directory.patch - ]; + configureFlags = [ "--with-custom-thunarx-dirs-enabled" ]; + + NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; # the desktop file … is in an insecure location» # which pops up when invoking desktop files that are diff --git a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch deleted file mode 100644 index 594a81c829ef..000000000000 --- a/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c -index 94b11545..1f66c982 100644 ---- a/thunarx/thunarx-provider-factory.c -+++ b/thunarx/thunarx-provider-factory.c -@@ -150,12 +150,19 @@ static GList* - thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) - { - ThunarxProviderModule *module; -+ const gchar *thunar_dir; - const gchar *name; - GList *modules = NULL; - GList *lp; - GDir *dp; - -- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL); -+ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); -+ if (NULL == thunar_dir) -+ { -+ thunar_dir = THUNARX_DIRECTORY; -+ } -+ -+ dp = g_dir_open (thunar_dir, 0, NULL); - if (G_LIKELY (dp != NULL)) - { - /* determine the types for all existing plugins */ -diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c -index 023ad2ae..b1d1be8f 100644 ---- a/thunarx/thunarx-provider-module.c -+++ b/thunarx/thunarx-provider-module.c -@@ -174,10 +174,17 @@ static gboolean - thunarx_provider_module_load (GTypeModule *type_module) - { - ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module); -+ const gchar *thunar_dir; - gchar *path; - -+ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); -+ if (NULL == thunar_dir) -+ { -+ thunar_dir = THUNARX_DIRECTORY; -+ } -+ - /* load the module using the runtime link editor */ -- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL); -+ path = g_build_filename (thunar_dir, type_module->name, NULL); - module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - g_free (path); - diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 584c356547b3..43531f201232 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -9,10 +9,10 @@ symlinkJoin { postBuild = '' wrapProgram "$out/bin/thunar" \ - --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" + --set "THUNARX_DIRS" "$out/lib/thunarx-3" wrapProgram "$out/bin/thunar-settings" \ - --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" + --set "THUNARX_DIRS" "$out/lib/thunarx-3" # NOTE: we need to remove the folder symlink itself and create # a new folder before trying to substitute any file below. From 44e238e2fdefcc14380cde5fdb08298c8419b9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:39:30 +0300 Subject: [PATCH 12/24] xfce.exo: 4.16.4 -> 4.18.0 --- pkgs/desktops/xfce/core/exo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 27a5041eac02..bb8a846c5009 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "4.16.4"; + version = "4.18.0"; - sha256 = "sha256-/BKgQYmDaiptzlTTFqDm2aHykTCHm4MIvWnjxKYi6Es="; + sha256 = "sha256-oWlKeUD1v2qqb8vY+2Cu9VJ1iThFPVboP12m/ob5KSQ="; nativeBuildInputs = [ libxslt From a58e63360fd1a4bec821355fe505a8ac355eb04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:42:38 +0300 Subject: [PATCH 13/24] xfce.garcon: 4.16.1 -> 4.18.0 --- pkgs/desktops/xfce/core/garcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index 740022550ebb..656ff4ba5e0b 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "garcon"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-KimO6w82lkUBSzJbBMI3W8w1eXPARE1oVyJEUk6olow="; + sha256 = "sha256-l1wGitD8MM1GrR4FyyPIxHSqK+AqKKyjTIN7VOaVzpM="; nativeBuildInputs = [ gobject-introspection ]; From 290c91f81d59a57368630842075ad45e4a1911d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:43:05 +0300 Subject: [PATCH 14/24] xfce.thunar-volman: 4.16.0 -> 4.18.0 --- pkgs/desktops/xfce/core/thunar-volman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index 3fe2df6f1b62..33b34e5beee8 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -3,11 +3,11 @@ mkXfceDerivation { category = "xfce"; pname = "thunar-volman"; - version = "4.16.0"; + version = "4.18.0"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "sha256-A9APQ5FLshb+MXQErCExegax6hqbHnlfI2hgtnWfVgA="; + sha256 = "sha256-NRVoakU8jTCJVe+iyJQwW1xPti2vjd/8n8CYrIYGII0="; odd-unstable = false; From e45c6aabec06293db734d09e13d81f15af40af05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:43:25 +0300 Subject: [PATCH 15/24] xfce.tumbler: 4.16.1 -> 4.18.0 --- pkgs/desktops/xfce/core/tumbler/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index ee5413fdda5a..9d47d1ec7a35 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -7,6 +7,7 @@ , libgsf , poppler , gst_all_1 +, libxfce4util }: # TODO: add libopenraw @@ -14,11 +15,12 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-f2pCItNHTB0ggovIddpwNWEhaohfxD2otN8x9VfwR4k="; + sha256 = "sha256-qxbS0PMhwVk2I3fbblJEeIuI72xSWVsQx5SslhOvg+c="; buildInputs = [ + libxfce4util ffmpegthumbnailer freetype gdk-pixbuf From 4467a1585fc80276eaf31194b9f0a5fc3c964b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 20:43:44 +0300 Subject: [PATCH 16/24] xfce.xfce4-appfinder: 4.16.1 -> 4.18.0 --- pkgs/desktops/xfce/core/xfce4-appfinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index d98353a070af..b479a574d97b 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.16.1"; + version = "4.18.0"; - sha256 = "sha256-Xr8iiCDQYmxiLR2+TeuJggV1dLM/U4b7u7kpvFWT+uQ="; + sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw="; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; From 2a79b49063d2bcaf1e1d17da0b9676e3ba72b8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 15 Dec 2022 21:24:02 +0300 Subject: [PATCH 17/24] xfce.xfce4-terminal: fix build --- pkgs/desktops/xfce/applications/xfce4-terminal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 1a63a62510c9..99c8741851fa 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; meta = with lib; { From 81c12cbec69310145425254d0cec70515a4fe796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 08:18:50 +0300 Subject: [PATCH 18/24] maintainers/teams: add muscaln to xfce --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index af6684a03f9e..b37d2d0a28a0 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -755,6 +755,7 @@ with lib.maintainers; { xfce = { members = [ romildo + muscaln ]; scope = "Maintain Xfce desktop environment and related packages."; shortName = "Xfce"; From 2c1b5c90eb2d00d22a84e53c39cc785baded1230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 14:20:43 +0300 Subject: [PATCH 19/24] xfce.xfce4-notifyd: 0.6.4 -> 0.6.5 --- pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 8a376862d9c9..2d3d9c5d4e01 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -12,9 +12,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.4"; + version = "0.6.5"; - sha256 = "sha256-H/qAfgwM0qaIxpVlSAUJJ4/Z3WtvYxJb2TtjKHK6AjE="; + sha256 = "sha256-NUEqQk9EcDl23twbo+DUt7QYZrPmWpsRzmi5wIdolqw="; buildInputs = [ gtk3 From 73cc73f41aba510ddb3a4f97e6a85c2fdfab4b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 14:24:59 +0300 Subject: [PATCH 20/24] xfce.xfce4-taskmanager: 1.4.2 -> 1.5.5 --- .../xfce/applications/xfce4-taskmanager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index ace9f16e4261..9bbc524eab0f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,14 +1,14 @@ -{ lib, mkXfceDerivation, exo, gtk3, libwnck, libXmu }: +{ lib, mkXfceDerivation, exo, gtk3, libxfce4ui, xfconf, libwnck, libXmu }: mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.4.2"; + version = "1.5.5"; - sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A="; + sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA="; nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 libwnck libXmu ]; + buildInputs = [ gtk3 libxfce4ui xfconf libwnck libXmu ]; meta = with lib; { description = "Easy to use task manager for Xfce"; From 1eb5c58c78914a0485b656c81262f0dd6c27b970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 16:51:21 +0300 Subject: [PATCH 21/24] xfce.xfce4-cpufreq-plugin: 1.2.7 -> 1.2.8 --- .../xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index fb070ed3652d..bba028bfe536 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.7"; - sha256 = "sha256-M+BehEYcHZlnuYwBlI7F0aPxPGwExTL5I9Jf6W5ugOY="; + version = "1.2.8"; + sha256 = "sha256-wEVv3zBS9PRLOMusFPzTnffVDvTaBnTCyGjstJRQRCo="; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; From 8c66de8bc64fcf102d8cd30d067a756e3bd1ab87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 16:53:38 +0300 Subject: [PATCH 22/24] xfce.xfce4-cpugraph-plugin : 1.2.6 -> 1.2.7 --- .../xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 8a2cd770944b..ad0110a56429 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -13,10 +13,10 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpugraph-plugin"; - version = "1.2.6"; + version = "1.2.7"; rev-prefix = "xfce4-cpugraph-plugin-"; odd-unstable = false; - sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY="; + sha256 = "sha256-IgxljHJAg9Bp/OFFZiQ6QwE5vtAtQ0WmYHs78NVsmCw="; buildInputs = [ exo From f6c0fe67d869b29c819bb1431f91496aa8ee93f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 16:56:25 +0300 Subject: [PATCH 23/24] xfce.xfce4-sensors-plugin: 1.4.3 -> 1.4.4 --- .../xfce/panel-plugins/xfce4-sensors-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 2e82deb2d3f1..fbc40f190255 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk="; + sha256 = "sha256-bBYFpzjl30DghNCKyT+WLNRFCTOW3h6b+tx6tFiMNrY="; }; nativeBuildInputs = [ From 47a8b1b2d6b49b49ffac56a89c35573086b88b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 16 Dec 2022 17:14:17 +0300 Subject: [PATCH 24/24] xfce.xfce4-volumed-pulse: fix build --- .../xfce/applications/xfce4-volumed-pulse/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 131181031847..3820cae101a8 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -7,6 +7,12 @@ mkXfceDerivation { sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc="; + # https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3 + postPatch = '' + substituteInPlace configure.ac.in \ + --replace "2.16" "2.26" + ''; + buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; meta = with lib; {