diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 90f7a03d0dd..b012699a16b 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -9,7 +9,7 @@ , useGTK2 ? false , gtk2 , gtk3 # gtk3 seems better supported -, exo +, xfce4-dev-tools , at-spi2-core , librsvg , hicolor-icon-theme @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; }; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; - buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] + nativeBuildInputs = [ pkg-config intltool xfce4-dev-tools wrapGAppsHook ]; + buildInputs = [ lightdm librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically ] ++ lib.optional useGTK2 "--with-gtk2"; + postPatch = '' + # exo-csource has been dropped from exo, and replaced by xdt-csource from xfce4-dev-tools + for f in configure.ac src/Makefile.am; do + substituteInPlace $f --replace exo-csource xdt-csource + done + ''; + preConfigure = '' configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) ''; @@ -66,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://launchpad.net/lightdm-gtk-greeter"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index ebabcf196d5..830242667db 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; - broken = desktopSupport == "gnomeflashback"; + broken = desktopSupport == "gnomeflashback" || desktopSupport == "xfce4"; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 6a3123db4da..b9ff011f3be 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, gvfs, glib }: +{ lib, mkXfceDerivation, gtk3, gvfs, glib }: mkXfceDerivation { category = "apps"; @@ -8,10 +8,15 @@ mkXfceDerivation { sha256 = "8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY="; - nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 glib gvfs ]; + postPatch = '' + # exo-csource has been dropped from exo + substituteInPlace src/Makefile.am --replace exo-csource xdt-csource + ''; + meta = { description = "A frontend to easily manage connections to remote filesystems"; + license = with lib.licenses; [ gpl2Only ]; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch b/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch new file mode 100644 index 00000000000..aa797bf42cf --- /dev/null +++ b/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch @@ -0,0 +1,25 @@ +From 3b06d6129033ddaa8dc455a6a572077fd63a3816 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Mon, 1 Mar 2021 17:03:07 -0300 +Subject: [PATCH] Allow checking parent sources when looking up schema + +--- + mousepad/mousepad-settings-store.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c +index e5a848b..de989bd 100644 +--- a/mousepad/mousepad-settings-store.c ++++ b/mousepad/mousepad-settings-store.c +@@ -181,7 +181,7 @@ mousepad_settings_store_add_settings (MousepadSettingsStore *self, + const gchar *prefix; + + /* loop through keys in schema and store mapping of their setting name to GSettings */ +- schema = g_settings_schema_source_lookup (source, schema_id, FALSE); ++ schema = g_settings_schema_source_lookup (source, schema_id, TRUE); + keys = g_settings_schema_list_keys (schema); + prefix = schema_id + MOUSEPAD_ID_LEN + 1; + for (key = keys; key && *key; key++) +-- +2.30.0 + diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 3c84f5558a1..eaac32bb5e3 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,20 +1,20 @@ -{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }: +{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview3, xfconf }: mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.4.2"; + version = "0.5.3"; odd-unstable = false; - sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; + sha256 = "0ki5k5p24dpawkyq4k8am1fcq02njhnmhq5vf2ah1zqbc0iyl5yn"; - nativeBuildInputs = [ exo ]; - buildInputs = [ glib gtk3 gtksourceview3 xfconf ]; + nativeBuildInputs = [ gobject-introspection vala ]; - # See https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + buildInputs = [ gtk3 gtksourceview3 xfconf ]; + + patches = [ ./allow-checking-parent-sources-when-looking-up-schema.patch ]; meta = { - description = "A simple text editor for Xfce"; + description = "Simple text editor for Xfce"; }; } diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index bfb86518448..5c55a22ea74 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 = "1.0.5"; + version = "4.16.0"; - sha256 = "0qgis2gnkcvg7xwp76cbi0ihqdjprvvw2d66hk7klhrafp7c0v13"; + sha256 = "07hcnbcd56lq7z3gq1cnk71ppy98hwdvlfp5z3zlc55cqrry26zm"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 8766bd302ab..e439c3d055d 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif +{ mkXfceDerivation, gtk3, glib, libexif , libxfce4ui, libxfce4util, xfconf }: mkXfceDerivation { @@ -8,9 +8,13 @@ mkXfceDerivation { sha256 = "07h7wbq3xh2ac6q4kp2ai1incfn0zfxxngap7hzqx47a5xw2mrm8"; - nativeBuildInputs = [ exo ]; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; + postPatch = '' + # exo-csource has been dropped from exo + substituteInPlace src/Makefile.am --replace exo-csource xdt-csource + ''; + meta = { description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index 7e582abc05f..6761d2ed5cd 100644 --- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0p7k2ffknr23hh3j17dhh5q8adn736p2piwx0sg8f5dvvhhc5whz"; + sha256 = "0gm5gwqxhnv3qz9ggf8dj1sq5s72xcliidkyip9l91msx03hfjah"; patches = [ ./configure-gio.patch ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index c9a61488840..64ab34d2b6f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.1"; + version = "0.6.2"; - sha256 = "18d2q5b54df8j2281lash8gm0826c6apn39q4igfz2zfcyqjh1if"; + sha256 = "1q8n7dffyqbfyy6vpqlmnsfpavlc7iz6hhv1h27fkwzswy2rx28s"; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 8c0fa3e3edb..3098b9c756e 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.7"; + version = "1.9.8"; odd-unstable = false; - sha256 = "14vbd7iigaw57hl47rnixk873c20q5clqynzkm9zzpqc568dxixd"; + sha256 = "0pbzjcaxm8gk0s75s99kvzygmih4yghp7ngf2mxymjiywcxqr40d"; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index fd59b173a73..5a1510eaa8c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.3"; + version = "1.4.2"; - sha256 = "0818chns7vkvjqakgz8z790adkygcq4jlw59dv6kyzk17hxq6cxv"; + sha256 = "1l7k00y3d9j38g4hxjrcrh1y4s6s77sq4sjcadsbpzs6zdf05hld"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 libwnck3 libXmu ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 56de8d3bfb8..19d98f84e3a 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,11 +1,13 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2 }: +{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.9.2"; + version = "0.8.10"; - sha256 = "1vlpfsrdalqmsd86aj0kvvam5skzn6xngigjziwli6q6il6lb9fj"; + sha256 = "0v58qcrdpqpd2nbwlc4ra7j9nkvfzfhb1zcp1kggbn627q86i0ql"; + + nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index a9610125b5b..83736166948 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.7.7"; + version = "0.9.1"; rev-prefix = ""; odd-unstable = false; - sha256 = "0b9pl3k8wl7svwhb9knhvr86gjg2904n788l8cbczwy046ql7pyc"; + sha256 = "14k774wxbk3w0ci2mmm6bhq4i742qahd0j0dr40iwmld55473zgd"; buildInputs = [ clutter diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 569a18a796e..31623598d31 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.xfce.org/"; description = "Themes for Xfce"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.volth ]; }; diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 17da815534c..d9afdfe0d9c 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3 , libxfce4ui, libxfce4util, perl }: mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "0.12.11"; + version = "4.16.1"; - sha256 = "1db7w6jk3i501x4qw0hs0ydrm1fjdkxmahzbv5iag859wnnlg0pd"; + sha256 = "1220mq8gs5s8l0d1p92j6icldzqj6zaisp27ss5jm7hwkkcnms9n"; nativeBuildInputs = [ libxslt @@ -14,7 +14,6 @@ mkXfceDerivation { ]; buildInputs = [ - gtk2 # some xfce plugins still uses gtk2 gtk3 glib libxfce4ui diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index 69184f2afa8..56ce6ac8aa2 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -1,15 +1,18 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }: +{ lib, mkXfceDerivation, gobject-introspection, gtk3, libxfce4ui, libxfce4util }: mkXfceDerivation { category = "xfce"; pname = "garcon"; - version = "0.6.4"; + version = "4.16.1"; - sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv"; + sha256 = "134nm1754i12axl4si60fdwkbk2v6z108nrj9c0lb5in1zmqwa9a"; + + nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; meta = { description = "Xfce menu support library"; + license = with lib.licenses; [ lgpl2Only fdl11Only ]; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 79c8ec74b62..e17880f1b1b 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -1,15 +1,15 @@ -{ lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM -, libstartup_notification, libxfce4util, xfconf }: +{ lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM +, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }: mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.14.1"; + version = "4.16.0"; - sha256 = "0fnncf30s51qhgixn57z4d021pjjhzgsg2x69w4dy68vff2347qy"; + sha256 = "0a9wfdpsv83giwv6kcidvpd6c665aa7sv6f2l1q6qcq214vb0rk2"; - nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ gtk2 gtk3 libstartup_notification xfconf ]; + nativeBuildInputs = [ gobject-introspection vala ]; + buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; configureFlags = [ @@ -18,6 +18,6 @@ mkXfceDerivation { meta = with lib; { description = "Widgets library for Xfce"; - license = licenses.lgpl2Plus; + license = with licenses; [ lgpl2Plus lgpl21Plus ]; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index 4540d235251..69c39212850 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -1,13 +1,13 @@ -{ lib, mkXfceDerivation, gobject-introspection }: +{ lib, mkXfceDerivation, gobject-introspection, vala }: mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; - version = "4.14.0"; + version = "4.16.0"; - sha256 = "0vq16bzmnykiikg4dhiaj0qbyj76nkdd54j6k6n568h3dc9ix6q4"; + sha256 = "1p0snipc81dhaq5glv7c1zfq5pcvgq7nikl4ikhfm2af9picfsxb"; - nativeBuildInputs = [ gobject-introspection ]; + nativeBuildInputs = [ gobject-introspection vala ]; meta = with lib; { description = "Extension library for Xfce"; diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index ecc26ccb8fe..6ceca34b1bd 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 = "0.9.5"; + version = "4.16.0"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0"; + sha256 = "002nkxsvcq384dgpj7lv3bmb21ks64hsq13l67z1dcjbj51hzl03"; odd-unstable = false; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 00da58f6628..cc94683ddde 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 = "1.8.15"; + version = "4.16.6"; - sha256 = "1y9d88i0kwl7ak4d65gy3qf4bpkiyaqxd4g6px3v1ykf274k8al8"; + sha256 = "12zqwazsqdmghy4h2c4fwxha069l07d46i512395y22h7n6655rn"; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index cb6f90e5b96..510d30ae63f 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -5,7 +5,6 @@ , freetype , libgsf , poppler -, libjpeg , gst_all_1 }: @@ -14,9 +13,9 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "0.2.9"; + version = "4.16.0"; - sha256 = "0b3mli40msv35qn67c1m9rn5bigj6ls10l08qk7fa3fwvzl49hmw"; + sha256 = "1z4q858afj3yksim4lc96wylgvymv4cv6iw41qdxl5xd6ii2ddr4"; buildInputs = [ ffmpegthumbnailer diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index cbb444c6c76..01cc70e3b9a 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.14.0"; + version = "4.16.1"; - sha256 = "04h7jxfm3wkxnxfy8149dckay7i160vvk4p9lnq6xny22r4x20h8"; + sha256 = "1r7sjdavqadrpgxqclrznds7a1c2i7mlvghx5mi6qqnh42425gsy"; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 38fe82ffb01..9b3f443ba38 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -1,14 +1,27 @@ -{ mkXfceDerivation, autoreconfHook, autoconf, automake -, glib, gtk-doc, intltool, libtool }: +{ mkXfceDerivation +, autoreconfHook +, libxslt +, docbook_xsl +, autoconf +, automake +, glib +, gtk-doc +, intltool +, libtool +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.14.0"; + version = "4.16.0"; - sha256 = "10hcj88784faqrk08xb538355cla26vdk9ckx158hqdqv38sb42f"; + sha256 = "0w47npi1np9vb7lhzjr680aa1xb8ch6kcbg0l0bqnpm0y0jmvgz6"; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + libxslt + docbook_xsl + ]; propagatedBuildInputs = [ autoconf @@ -19,11 +32,6 @@ mkXfceDerivation { libtool ]; - preAutoreconf = '' - substitute configure.ac.in configure.ac \ - --subst-var-by REVISION UNKNOWN - ''; - setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh index 600bf47fd87..3abf3172ea6 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh @@ -1,5 +1,5 @@ xdtEnvHook() { - addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros + addToSearchPath ACLOCAL_PATH $1/share/aclocal } envHooks+=(xdtEnvHook) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index b7bede9e27b..0a08d388238 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,17 +1,48 @@ -{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }: +{ mkXfceDerivation +, exo +, garcon +, gettext +, glib +, gobject-introspection +, gtk3 +, libdbusmenu-gtk3 +, libwnck3 +, libxfce4ui +, libxfce4util +, tzdata +, vala +, xfconf +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.4"; + version = "4.16.2"; - sha256 = "1srzgb9vsvfrbhym74zkz9hdhxcrvbffxpfgv5vprhlwxw3vk3fq"; + sha256 = "0wy66viwjnp1c0lgf90fp3vyqy0f1m1kbfdym8a0yrv2b6sn3958"; - nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; + nativeBuildInputs = [ + gobject-introspection + vala + ]; + + buildInputs = [ + exo + garcon + libdbusmenu-gtk3 + libxfce4ui + libwnck3 + xfconf + tzdata + ]; + + propagatedBuildInputs = [ + glib + gtk3 + libxfce4util + ]; patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = [ "-p1" ]; postPatch = '' for f in $(find . -name \*.sh); do @@ -21,9 +52,10 @@ mkXfceDerivation { --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - configureFlags = [ "--enable-gtk3" ]; + # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = { + meta = { description = "Xfce's panel"; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 9f9a552b8cc..709b6a2a0cb 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 = "1.6.6"; + version = "4.16.0"; - sha256 = "0lyp3dp4ijbpf21vanrvgm6rmfp8v0zyqxibdj5gxnadmvcq38iy"; + sha256 = "1rfw07xbv83rfb0mz3ayanlcvnaq7xpl2znsyya0hspysvavwks2"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index c7442a01957..0d4c0615898 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -1,11 +1,11 @@ -{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }: +{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xfce4-session }: mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.14.2"; + version = "4.16.0"; - sha256 = "1gr6j96l792v33lbh7rqpbdjmy8m68hy14bsndx6bykv10zvmgx2"; + sha256 = "0b8vkcqn2arjp6qdwmzr0f84n8fjgy2kbf9h4gq03400ar1l111c"; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 9b263e5ee73..71645cd1f98 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -1,16 +1,16 @@ -{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3, glib +{ mkXfceDerivation, exo, garcon, gtk3, glib , libnotify, libxfce4ui, libxfce4util, libxklavier , upower, xfconf, xf86inputlibinput }: mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.14.3"; + version = "4.16.0"; - sha256 = "1zzngdj7mp2r6rcs8gvda1218zlz5gpnc6gsp20z32l69psp3yld"; + sha256 = "0iha3jm7vmgk6hq7z4l2r7w9qm5jraka0z580i8i83704kfx9g0y"; postPatch = '' - for f in $(find . -name \*.c); do + for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do substituteInPlace $f --replace \"libinput-properties.h\" '' done ''; diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index 357f4b23410..41af53c9cc2 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,11 +1,13 @@ -{ mkXfceDerivation, libxfce4util }: +{ mkXfceDerivation, libxfce4util, gobject-introspection, vala }: mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.14.3"; + version = "4.16.0"; - sha256 = "0yxpdcyz81di7w9493jzps09bgrlgianjj5abnzahqmkpmpvb0rh"; + sha256 = "00cp2cm1w5a6k7g0fjvqx7d2iwaqw196vii9jkx1aa7mb0f2gk63"; + + nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ libxfce4util ]; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 75e9fc8cb65..a9e461a4e64 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.14.2"; + version = "4.16.0"; - sha256 = "04fhm1pf9290sy3ymrmnfnm2x6fq5ldzvj5bjd9kz6zkx0nsq1za"; + sha256 = "1znbccr25wvizmzzgdcf719y3qc9gqdi1g4rasgrmi95427lvwn3"; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index df46a80c4b7..f8cfc551545 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.14.6"; + version = "4.16.1"; - sha256 = "1ml5b4nn8laqhjihfqqsbjn66525abhin5d32bplh1k9yfxw4xi4"; + sha256 = "1lhxm9ifkrnvn1vq3aak3kd695i1ishpryjnw617ifzawy9lj10b"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 5c47dc7f85d..a9f30ebfab5 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -48,7 +48,7 @@ let meta = with lib; { homepage = "https://gitlab.xfce.org/${category}/${pname}/about"; - license = licenses.gpl2; # some libraries are under LGPLv2+ + license = licenses.gpl2Plus; # some libraries are under LGPLv2+ platforms = platforms.linux; }; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 2349b4bf3e8..1f79e0ffb29 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libXtst, libxfce4ui, libxfce4util, xfce4-panel, xfconf, exo }: +{ mkXfceDerivation, libXtst, libxfce4ui, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -6,7 +6,12 @@ mkXfceDerivation { version = "1.6.1"; sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; - buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; + + postPatch = '' + # exo-csource has been dropped from exo + substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource + ''; meta = { description = "Clipboard manager for Xfce panel"; 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 3798edbf89d..f776e6c1693 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.1"; - sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv"; + version = "1.2.5"; + sha256 = "1isqlfhz1ijl1h3hfvi0n4misdjsrhd7pc9h5rkaqm4vh543ggxg"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; 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 e80d0bbc9ac..991da9928ff 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -20,11 +20,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "YVrfmr2RQXpEMZ2OTa3GAS+iKjd48vN5cXUS3Lfvkko="; + sha256 = "13302psv0fzg2dsgadr8j6mb06k1bsa4zw6hxmb644vqlvcwq37v"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 304b9d9076d..44d255c5fa6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -3,17 +3,16 @@ , intltool , libxfce4ui , xfce4-panel -, gtk3 , gettext }: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-datetime-plugin"; - version = "0.8.0"; + version = "0.8.1"; - rev-prefix = "datetime-"; - sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah"; + rev-prefix = "xfce4-datetime-plugin-"; + sha256 = "06h13bmh2sni4qbr3kfnqaa5dq5f48h4xkywrm9pa6h2nyvn4rma"; nativeBuildInputs = [ gettext @@ -21,7 +20,6 @@ mkXfceDerivation { ]; buildInputs = [ - gtk3 libxfce4ui xfce4-panel ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index e64d6fbae51..2c83abe6575 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -1,30 +1,30 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, bash, vala_0_48 , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { pname = "xfce4-dockbarx-plugin"; version = "${ver}-${rev}"; - ver = "0.5"; - rev = "a2dcb66"; + ver = "0.6"; + rev = "5213876"; src = fetchFromGitHub { - owner = "TiZ-EX1"; + owner = "xuzhen"; repo = "xfce4-dockbarx-plugin"; rev = rev; - sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx"; + sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn"; }; pythonPath = [ dockbarx ]; nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] + buildInputs = [ python3 vala_0_48 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; postPatch = '' substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/" substituteInPlace src/dockbarx.vala --replace /usr/share/ $out/share/ - substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash + substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python3' ${bash}/bin/bash ''; postFixup = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"; + homepage = "https://github.com/xuzhen/xfce4-dockbarx-plugin"; description = "A plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index cf383f840d5..7c48e4a2a9f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { description = "Embed arbitrary app windows on Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; + broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix index 8afff65696d..3a01e806387 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; + broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index df31ea3b9b5..b9f4481be32 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, - gtk2, exo, gnutls, libgcrypt, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, xfce4-panel, libxfce4ui, + exo, gnutls, libgcrypt, xfce }: let category = "panel-plugins"; @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-mailwatch-plugin"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; + sha256 = "0bmykjhd3gs1737fl3zn5gg6f3vlncak2xqz89zv5018znz1xy90"; }; nativeBuildInputs = [ @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libxfce4util libxfce4ui xfce4-panel - gtk2 - exo # needs exo with gtk2 support + exo gnutls libgcrypt ]; @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; description = "Mail watcher plugin for Xfce panel"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 407f349d9bf..ec57a7260f6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' - for f in src/preferences.vala src/namebar.vala; do - substituteInPlace $f --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" - done + substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" + substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" ''; passthru.updateScript = xfce.updateScript { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 7442e30ed69..79519b85876 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -1,15 +1,11 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , intltool -, libxfce4util , xfce4-panel , libxfce4ui , xfconf -, gtk2 -, libunique , xfce }: @@ -30,16 +26,11 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libxfce4util libxfce4ui xfce4-panel xfconf - gtk2 - libunique ]; - hardeningDisable = [ "format" ]; - passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; 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 845f1b22e33..dbefda4e5ee 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.3.92"; + version = "1.3.95"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; + sha256 = "0v44qwrwb95jrlsni1gdlc0zhymlm62w42zs3jbr5mcdc7j4mil3"; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 13bce97fe33..3c35297897b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -3,10 +3,9 @@ , fetchurl , pkg-config , intltool -, libxfce4util , xfce4-panel , libxfce4ui -, gtk3 +, xfconf , xfce }: @@ -14,11 +13,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "BTG435I8ujvo0GTLi2OLlU33SRXlpEciiZlReEd4mDU="; + sha256 = "0lknh5l30qs5c69wwjcblbyhczvdbxs59fqkb8mpqbfm05w01lan"; }; nativeBuildInputs = [ @@ -27,10 +26,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libxfce4util libxfce4ui xfce4-panel - gtk3 + xfconf ]; passthru.updateScript = xfce.updateScript { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 7c2fb69dc5c..3731d3937bd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; description = "Simple countdown and alarm plugin for the Xfce panel"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 94b467fd682..209e25bc9e3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -5,7 +5,6 @@ , pcre , libxfce4util , xfce4-panel -, xfconf }: mkXfceDerivation { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 18639946ce8..5992bf343ed 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxml2, libsoup, upower, - libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower, + libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-weather-plugin"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; + sha256 = "1z2k24d599mxf5gqa35i3xmc3gk2yvqs80hxxpyw06yma6ljw973"; }; nativeBuildInputs = [ @@ -20,13 +20,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 libxml2 libsoup upower libxfce4ui - libxfce4util xfce4-panel + xfconf hicolor-icon-theme ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ef269d64e04..123376b0f2b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.6"; + version = "2.5.3"; rev-prefix = "v"; odd-unstable = false; - sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; + sha256 = "15kcph35pji3l1y81snrmpqzhhpdc9h4nk6cjsjyla51a1s2y3hz"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index ec6ef0e7b62..281003db92a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, gtk2 -, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck3, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; - version = "0.4.6"; + version = "0.4.10"; src = fetchFromGitHub { - owner = "cedl38"; + owner = "invidian"; repo = pname; rev = "v${version}"; - sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g"; + sha256 = "0l066a174v2c7ly125v9x1fgbg5bnpwdwnjh69v9kp4plp791q4n"; }; nativeBuildInputs = [ @@ -20,11 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ python3 imagemagick - libwnck - gtk2 - exo + libwnck3 libxfce4ui - libxfce4util xfce4-panel xfconf xfce4-dev-tools diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index b632fde2df2..d43c56c7288 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/Jeinzi/thunar-dropbox"; description = "A plugin that adds context-menu items for Dropbox to Thunar"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0696c2e7a2..70def32057c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25535,7 +25535,7 @@ in }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { - inherit (xfce) exo; + inherit (xfce) xfce4-dev-tools; }; lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };