ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-09 03:50:57 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #206282 from muscaln/xfce-4.18

Browse Source 
Xfce 4.18
This commit is contained in:
José Romildo Malaquias 2022-12-21 09:07:38 -03:00 committed by GitHub
commit b3ad3a58fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 60 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/team-list.nix
View File

@ -755,6 +755,7 @@ with lib.maintainers; {
xfce = {
members = [
romildo
muscaln
];
scope = "Maintain Xfce desktop environment and related packages.";
shortName = "Xfce";

4
pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
View File

@ -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

8
pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
View File

@ -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";

2
pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
View File

@ -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; {

6
pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
View File

@ -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; {

4
pkgs/desktops/xfce/core/exo/default.nix
View File

@ -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

4
pkgs/desktops/xfce/core/garcon/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/libxfce4ui/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/libxfce4util/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/thunar-volman/default.nix
View File

@ -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;

10
pkgs/desktops/xfce/core/thunar/default.nix
View File

@ -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

48
pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
View File

@ -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);

4
pkgs/desktops/xfce/core/thunar/wrapper.nix
View File

@ -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.

6
pkgs/desktops/xfce/core/tumbler/default.nix
View File

@ -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

4
pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
View File

@ -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

4
pkgs/desktops/xfce/core/xfce4-panel/default.nix
View File

@ -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

4
pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/xfce4-session/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/xfce4-settings/default.nix
View File

@ -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

4
pkgs/desktops/xfce/core/xfconf/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/core/xfdesktop/default.nix
View File

@ -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

4
pkgs/desktops/xfce/core/xfwm4/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
View File

@ -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 ];

4
pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
View File

@ -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

4
pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
View File

@ -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 = [