diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2020-04-19 20:57:54 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-19 20:57:54 -0300 |
commit | 76f2f29de6932eb661559355383c3d9dfe736eb5 (patch) | |
tree | c210bbfe824b09743aac165767c3a8f92928a5fa /pkgs | |
parent | 07d622284d15969b7b7bbb9a8cecad102907c259 (diff) | |
parent | c5d8f23febe2578df9f43e29af3bb9a17b3fd414 (diff) | |
download | nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.tar nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.tar.gz nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.tar.bz2 nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.tar.lz nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.tar.xz nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.tar.zst nixpkgs-76f2f29de6932eb661559355383c3d9dfe736eb5.zip |
Merge pull request #85318 from romildo/upd.xfce
xfce: update most packages
Diffstat (limited to 'pkgs')
40 files changed, 300 insertions, 187 deletions
diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index 8e8153d9a33..e54363a1dda 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -5,8 +5,8 @@ , attrPath ? pname , versionLister , rev-prefix ? "" -, odd-unstable ? true -, patchlevel-unstable ? true +, odd-unstable ? false +, patchlevel-unstable ? false }: let diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 7b643bd0dc8..251866528e6 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "gigolo"; - version = "0.5.0"; + version = "0.5.1"; odd-unstable = false; - sha256 = "1lqsxb0d5i8p9vbzx8s4p3rga7va5h1q146xgmsa41j5v40wrlw6"; + sha256 = "11a35z5apr26nl6fpmbsvvv3xf5w61sgzcb505plavrchpfbdxjn"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 glib gvfs ]; diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 20b899165f0..bfb86518448 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.4"; + version = "1.0.5"; - sha256 = "18j4bmny37crryh4pvxcjjvj99mln6ljq2vy69awxhvrjx9ljv13"; + sha256 = "0qgis2gnkcvg7xwp76cbi0ihqdjprvvw2d66hk7klhrafp7c0v13"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index 08f2bd511a8..8aff25df494 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.6.1"; + version = "0.6.2"; - sha256 = "0a1ly79x7j5pgr3vbsabb4i0jd5rryaigj9z8iqzr8p9miypx20v"; + sha256 = "02axhsbbsvd31jb0xs1d2qxr614qb29pajv0sm2p1n1c2cv2fjh1"; nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index b2682080216..7e582abc05f 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.2"; + version = "0.8.3"; - sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7"; + sha256 = "0p7k2ffknr23hh3j17dhh5q8adn736p2piwx0sg8f5dvvhhc5whz"; 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 a991e8c8180..40d9c188fa3 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.4.4"; + version = "0.6.0"; - sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai"; + sha256 = "03lw7zil6pwvx537ibqrynxjz7d6iq6in7vdskrnnn16kfg6hjg2"; 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 1db6fb016a1..8c0fa3e3edb 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.5"; + version = "1.9.7"; odd-unstable = false; - sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; + sha256 = "14vbd7iigaw57hl47rnixk873c20q5clqynzkm9zzpqc568dxixd"; 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 e3d8b4b87d9..9a923025c94 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.2"; + version = "1.2.3"; - sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc"; + sha256 = "0818chns7vkvjqakgz8z790adkygcq4jlw59dv6kyzk17hxq6cxv"; 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 3b9cd268d55..56de8d3bfb8 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.8"; + version = "0.8.9.2"; - sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; + sha256 = "1vlpfsrdalqmsd86aj0kvvam5skzn6xngigjziwli6q6il6lb9fj"; 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 f3db9c2446b..a9610125b5b 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.5"; + version = "0.7.7"; rev-prefix = ""; odd-unstable = false; - sha256 = "0d0kg90h3li41bs75z3xldljsglkz220pba39c54qznnzb8v8a2i"; + sha256 = "0b9pl3k8wl7svwhb9knhvr86gjg2904n788l8cbczwy046ql7pyc"; buildInputs = [ clutter diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 089b7cc27f8..e614bb1db92 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, xfce }: let category = "art"; @@ -13,9 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 ]; - + nativeBuildInputs = [ + pkgconfig + intltool + gtk3 + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -25,6 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.xfce.org/"; description = "Icons for Xfce"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 59ab5823314..ee58c76ea02 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -1,15 +1,26 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk2, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "0.12.8"; + version = "0.12.11"; - sha256 = "013am7q4pwfncf4hk2a3hv7yx2vxgzb5xm8qsi9mxkj29xdhrvs5"; + sha256 = "1db7w6jk3i501x4qw0hs0ydrm1fjdkxmahzbv5iag859wnnlg0pd"; - nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ]; - buildInputs = [ gtk3 glib libxfce4ui libxfce4util ]; + nativeBuildInputs = [ + libxslt + perlPackages.URI + docbook_xsl + ]; + + buildInputs = [ + gtk2 # some xfce plugins still uses gtk2 + gtk3 + glib + libxfce4ui + libxfce4util + ]; # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 11220141d2a..24df606e246 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.9"; + version = "1.8.14"; - sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w"; + sha256 = "1ph9bcqfm2nccliagl8zdl1dizh62qnr8m5hacri3cs2jhc0jjpy"; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index b795007ca7c..1a615b8f66a 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "0.2.7"; + version = "0.2.8"; - sha256 = "14ql3fcxyz81qr9s0vcwh6j2ks5fl8jf9scwnkilv5jy0ii9l0ry"; + sha256 = "1y9sphaz3izal96v53lps692xxzp5pad1d09kxsmmpm7pic4n1r2"; buildInputs = [ ffmpegthumbnailer diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index f4d86247c6c..ffd42e4a2c5 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.0"; + version = "4.14.3"; - sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15"; + sha256 = "0h8cqs2bghmyp0jihjm2wc7j14k271j178vllin271xrl7kzmvzv"; nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index fb3f05b3664..9f9a552b8cc 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.5"; + version = "1.6.6"; - sha256 = "0zazm2cgkz5xj7rvy9gbh4kaay2anfcmawg4gj38pnq3a8zcwwd5"; + sha256 = "0lyp3dp4ijbpf21vanrvgm6rmfp8v0zyqxibdj5gxnadmvcq38iy"; 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 0ab362aa21d..c7442a01957 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.14.0"; + version = "4.14.2"; - sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104"; + sha256 = "1gr6j96l792v33lbh7rqpbdjmy8m68hy14bsndx6bykv10zvmgx2"; 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 74ab96ed1bc..9b263e5ee73 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.14.0"; + version = "4.14.3"; - sha256 = "13gmxd4sfgd6wky7s03bar58w9vl4i6jv2wncd6iajww791y5akn"; + sha256 = "1zzngdj7mp2r6rcs8gvda1218zlz5gpnc6gsp20z32l69psp3yld"; postPatch = '' for f in $(find . -name \*.c); do diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index afcd0d19dc3..75e9fc8cb65 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.1"; + version = "4.14.2"; - sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g"; + sha256 = "04fhm1pf9290sy3ymrmnfnm2x6fq5ldzvj5bjd9kz6zkx0nsq1za"; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 0eb66b170aa..579e863bf9c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -117,8 +117,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; @@ -187,7 +185,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_cpufreq_plugin = xfce4-cpufreq-plugin; xfce4_cpugraph_plugin = xfce4-cpugraph-plugin; xfce4_datetime_plugin = xfce4-datetime-plugin; - xfce4_dict_plugin = xfce4-dict-plugin; xfce4_dockbarx_plugin = xfce4-dockbarx-plugin; xfce4_embed_plugin = xfce4-embed-plugin; xfce4_eyes_plugin = xfce4-eyes-plugin; @@ -211,6 +208,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 + xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19 # added 2019-11-04 libxfce4ui_gtk3 = libxfce4ui; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix index 0120cea0886..0d047447e0c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-battery-plugin"; - version = "1.1.2"; + version = "1.1.3"; rev-prefix = ""; odd-unstable = false; - sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0"; + sha256 = "0ligdiasrfc3170kd7sif2ml6lvlpp11lbxz3xdvklqkv7p3323y"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; 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 f814850561a..2349b4bf3e8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.4.3"; - sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq"; + version = "1.6.1"; + sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 22a019e56bc..38ad759e700 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -6,16 +6,31 @@ in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1izl53q95m5xm2fiq7385vb1i9nwgjizxkmgpgh33zdckb40xnl5"; + sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + glib + exo + libXtst + xorgproto + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + hicolor-icon-theme + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -23,8 +38,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; description = "CPU graph show for Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix deleted file mode 100644 index ae6141bd662..00000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: - -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { - pname = "xfce4-dict-plugin"; - version = "0.3.0"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1x0imfnsdfq7fbhka8bc0yjjspkcljc1jafhrwzb08qi9bk2wbar"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; - - meta =with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Dictionary plugin for Xfce panel"; - platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; - broken = true; # see https://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 3cd84714663..2b2027bcf4b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: let category = "panel-plugins"; @@ -14,9 +14,18 @@ stdenv.mkDerivation rec { sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk2 + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -24,8 +33,9 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; description = "Embed arbitrary app windows on Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 687bcf59859..220e2506858 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -6,15 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1jh02hylvsvfpxrx0bq6fzgy6vnxf9qakgpbfvr63lfkd1dyh314"; + sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + ]; passthru.updateScript = xfce.updateScript { inherit pname version; @@ -23,10 +33,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Eyes following you!"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; + description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index adab2f033ac..b67e63f5c64 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -6,15 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-fsguard-plugin"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1bj021h4q68bc03f32pkyqy4gfd1sz6s21nxdg7j6gdfhs9xbj52"; + sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + ]; passthru.updateScript = xfce.updateScript { inherit pname version; @@ -23,10 +33,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Filesystem monitor"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; + description = "Filesystem usage monitor plugin for the Xfce panel"; + license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 65dc61a4b39..417001fed53 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -6,15 +6,24 @@ in stdenv.mkDerivation rec { pname = "xfce4-genmon-plugin"; - version = "3.4.0"; + version = "4.0.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "11q3g6lmgz3d5lyh6614mxkd9cblfdyf9jgki7f26mn895xk79dh"; + sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + ]; passthru.updateScript = xfce.updateScript { inherit pname version; @@ -23,10 +32,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Cyclically spawns a command and captures its output"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; + description = "Generic monitor plugin for the Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 83084b62661..d8775c4b704 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index b63224f8708..3d60d8b18f9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo, gnutls, libgcrypt, xfce }: + gtk2, exo, gnutls, libgcrypt, xfce }: let category = "panel-plugins"; @@ -14,10 +14,21 @@ stdenv.mkDerivation rec { sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel - xfconf gtk2 exo gnutls libgcrypt ]; - + nativeBuildInputs = [ + intltool + pkgconfig + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk2 + exo # needs exo with gtk2 support + gnutls + libgcrypt + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -25,10 +36,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Mailwatch plugin for Xfce panel"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; + description = "Mail watcher plugin for Xfce panel"; + license = licenses.gpl2; platforms = platforms.linux; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 7d7b1981c52..bb56e875c86 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, + libxfce4ui, gtk3, exo, xfce }: let category = "panel-plugins"; @@ -7,17 +7,26 @@ in stdenv.mkDerivation rec { pname = "xfce4-mpc-plugin"; - version = "0.4.5"; + version = "0.5.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7"; + sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel - xfconf gtk2 exo ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + exo + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -25,10 +34,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; + license = licenses.bsd2; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 09e686a9536..8d258220175 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-netload-plugin"; - version = "1.3.1"; + version = "1.3.2"; rev-prefix = "version-"; - sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h"; + odd-unstable = false; + sha256 = "1py1l4z5ah4nlq8l2912k47ffsa5z7p1gbvlk7nw6b9r1x4ykdfl"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 1b7e66936fa..d6910d367a6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: let category = "panel-plugins"; @@ -6,16 +6,29 @@ in stdenv.mkDerivation rec { pname = "xfce4-notes-plugin"; - version = "1.7.7"; + version = "1.8.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05sjbwgch1j93m3r23ksbjnpfk11sf7xjmbb9pm5vl3snc2s3fm7"; + sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk2 + libunique + ]; + + hardeningDisable = [ "format" ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -23,10 +36,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; description = "Sticky notes plugin for Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 64916f92a6f..10850974bb7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -2,6 +2,7 @@ , automakeAddFlags , dbus-glib , dbus +, exo , gtk3 , libpulseaudio , libnotify @@ -16,8 +17,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.2"; - sha256 = "1s996mcniskq42vv7cb9i165pmrfp9c95p5f9rx14hqq8in9mvc5"; + version = "0.4.3"; + sha256 = "1rfw2w8gl95iawiy57qlvz958dqjc8bmxnc3dma4rqzm6g46jkgq"; nativeBuildInputs = [ automakeAddFlags @@ -30,6 +31,7 @@ mkXfceDerivation { ''; buildInputs = [ + exo glib gtk3 keybinder3 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 14cab3d932e..8b8dbf3e022 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui, +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.2.6"; + version = "1.3.92"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3"; + sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 + gtk3 libxfce4ui libxfce4util xfce4-panel @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + 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; platforms = platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 1ff0bc2efba..52da6a29ea4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -6,16 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.1.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0z4as6sxdz93d4jpgv0665dg4sykfvc5068mc689phlfl2rvcsdl"; + sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -23,8 +32,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; description = "System load plugin for Xfce panel"; + license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index ae08fd3aeae..00b497c918d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel -, libxfce4ui, xfconf, gtk2, hicolor-icon-theme, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -7,17 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-timer-plugin"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0z46gyw3ihcd1jf0m5z1dsc790xv1cpi8mk1dagj3i4v14gx5mrr"; + sha256 = "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"; }; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf - gtk2 hicolor-icon-theme ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + hicolor-icon-theme + ]; hardeningDisable = [ "format" ]; @@ -28,11 +35,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; + 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; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index bd0db543cf6..525bd6e5fd7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "xfce4-vala-panel-appmenu-plugin"; - version = "0.6.94"; + version = "0.7.3"; src = fetchFromGitHub { owner = "rilian-la-te"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { rev = version; fetchSubmodules = true; - sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; + sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; }; nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index f32efb01edd..cff2ef251ad 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower, +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: let @@ -7,17 +7,28 @@ in stdenv.mkDerivation rec { pname = "xfce4-weather-plugin"; - version = "0.8.10"; + version = "0.10.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; + sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; - buildInputs = [ gtk2 libxml2 libsoup upower libxfce4ui libxfce4util - xfce4-panel hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libxml2 + libsoup + upower + libxfce4ui + libxfce4util + xfce4-panel + hicolor-icon-theme + ]; enableParallelBuilding = true; @@ -28,7 +39,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index ceeac724cf3..e629a08c553 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -3,18 +3,32 @@ stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "cedl38"; repo = pname; rev = "v${version}"; - sha256 = "0c6a1ibh39dpq9x0dha5lsg0vzmgaf051fgwz0nlky0s94nwzvgv"; + sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool python3 imagemagick libwnck gtk2 - exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + python3 + imagemagick + libwnck + gtk2 + exo + libxfce4ui + libxfce4util + xfce4-panel + xfconf + xfce4-dev-tools + ]; preConfigure = '' ./autogen.sh @@ -31,8 +45,8 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Set of two plugins which allows you to put the maximized window title and windows buttons on the panel"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin"; + description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.volth ]; |