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 fd379a3e2d9d..8d8f64079a5a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -3,31 +3,32 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, libxfce4util, xfce4-panel, libxfce4ui, glib, gtk3, - hicolor-icon-theme, gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-timer-plugin"; - version = "1.7.3"; + version = "1.8.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-rPTIYa+IYIuegCp2pLBYRr0wGJ4AhegmaAzBebbfTNM="; + url = "mirror://xfce/src/panel-plugins/xfce4-timer-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-timer-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-HTrDqixDRUAMAlZCd452Q6q0EEdiK6+c3AC7rHjon5k="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; @@ -37,21 +38,18 @@ stdenv.mkDerivation rec { xfce4-panel glib gtk3 - hicolor-icon-theme ]; - hardeningDisable = [ "format" ]; - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin"; + rev-prefix = "xfce4-timer-plugin-"; }; - meta = with lib; { + meta = { 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.gpl2Plus; - teams = [ teams.xfce ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; }; -} +}) 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 e14c710b2edc..eb046b9fd660 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,19 +1,40 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, glib, gtk3, libxfce4ui, libxfce4util, pcre2, xfce4-panel, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-verve-plugin"; - version = "2.0.4"; - sha256 = "sha256-j0uKYj9PeLEVaocHRw87Dz+YFqDr1BImejEpDPYObQg="; + version = "2.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-verve-plugin"; + tag = "xfce4-verve-plugin-${finalAttrs.version}"; + hash = "sha256-mxSjYBeBc2HjdTFVdZSVdspAQTEyS+uQA6K17lJoLlc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; buildInputs = [ glib @@ -24,8 +45,13 @@ mkXfceDerivation { xfce4-panel ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-verve-plugin-"; }; + + meta = { description = "Command-line plugin"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) 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 5c1e2de1533c..78fbe1ed57fc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -4,8 +4,9 @@ fetchurl, fetchpatch, gettext, + meson, + ninja, pkg-config, - xfce4-dev-tools, glib, gtk3, json_c, @@ -19,36 +20,32 @@ gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-weather-plugin"; - version = "0.11.3"; + version = "0.12.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc="; + url = "mirror://xfce/src/panel-plugins/xfce4-weather-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-weather-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-XdkLAywG70tkuBgCMVTvlGOixpSgKQ5X80EilsdUX/Y="; }; patches = [ - # Port to libsoup-3.0 - # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/28 + # meson-build: Add missing HAVE_UPOWER_GLIB definition + # https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/37 (fetchpatch { - url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/c0653a903c6f2cecdf41ac9eaeba4f4617656ffe.patch"; - hash = "sha256-wAowm4ppBSKvYwOowZbbs5pnTh9EQ9XX05lA81wtsRM="; - }) - (fetchpatch { - url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/279c975dc1f95bd1ce9152eee1d19122e7deb9a8.patch"; - hash = "sha256-gVfyXkE0bjBfvcQU9fDp+Gm59bD3VbAam04Jak8i31k="; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/1d8e5e5dbbc4d53e4b810f9b01a460197cd47b64.patch"; + hash = "sha256-g9AIp1iBcA3AxD1tpnv32PvxxulXYjFvQh3EqD1gmHg="; }) ]; + strictDeps = true; + nativeBuildInputs = [ gettext + glib # glib-compile-resources + meson + ninja pkg-config - xfce4-dev-tools ]; buildInputs = [ @@ -64,20 +61,16 @@ stdenv.mkDerivation rec { xfconf ]; - configureFlags = [ "--enable-maintainer-mode" ]; - - enableParallelBuilding = true; - passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin"; + rev-prefix = "xfce4-weather-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + teams = [ lib.teams.xfce ]; }; -} +}) 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 7491f8cf28e3..ca30bb25da43 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,11 +1,15 @@ { - mkXfceDerivation, + stdenv, lib, - cmake, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, + wrapGAppsHook3, accountsservice, exo, garcon, - gettext, glib, gtk-layer-shell, gtk3, @@ -13,25 +17,35 @@ libxfce4util, xfce4-panel, xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-whiskermenu-plugin"; - version = "2.9.2"; - rev-prefix = "v"; - odd-unstable = false; - sha256 = "sha256-M9eraJwArCrASrLz+URUOmYtulWPNxR39Sn+alfWoy4="; + version = "2.10.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-whiskermenu-plugin"; + tag = "xfce4-whiskermenu-plugin-${finalAttrs.version}"; + hash = "sha256-2FACsP6mKx0k91xG3DaVS6hdvdLrjLu9Y9rVOW6PZ3M="; + }; + + strictDeps = true; nativeBuildInputs = [ - cmake + gettext + meson + ninja + pkg-config + wrapGAppsHook3 ]; buildInputs = [ accountsservice exo garcon - gettext glib gtk-layer-shell gtk3 @@ -41,9 +55,14 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-whiskermenu-plugin-"; }; + + meta = { description = "Alternate application launcher for Xfce"; mainProgram = "xfce4-popup-whiskermenu"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) 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 54a32c99b5b3..409f196e9b34 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -3,7 +3,10 @@ lib, fetchurl, gettext, + meson, + ninja, pkg-config, + python3, glib, gtk3, libwnck, @@ -14,19 +17,24 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-windowck-plugin"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - # Use dist tarballs to avoid pulling extra deps and generating images ourselves. - url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2"; - sha256 = "sha256-3E7V3JS9Bd5UlUQfDKuyYKs+H2ziex+skuN/kJwM/go="; + url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-windowck-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-dJeSszth86ICe2VHBW5JOYqNajPgeg66hYOvnF9hdj8="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + glib # glib-compile-resources + meson + ninja pkg-config + python3 ]; buildInputs = [ @@ -44,11 +52,11 @@ stdenv.mkDerivation rec { rev-prefix = "xfce4-windowck-plugin-"; }; - meta = with lib; { + meta = { description = "Xfce panel plugin for displaying window title and buttons"; homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index 036f9c1eadcd..e10dc5a10631 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,6 +1,12 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + meson, + ninja, + pkg-config, + glib, gtk3, libnotify, librsvg, @@ -11,18 +17,35 @@ libxfce4util, xfce4-panel, xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-xkb-plugin"; - version = "0.8.5"; - sha256 = "sha256-oG3+OudjJIXfGII16bYaIGy4QMno00HX3kX+8H0VUcU="; + version = "0.9.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-xkb-plugin"; + tag = "xfce4-xkb-plugin-${finalAttrs.version}"; + hash = "sha256-yLlUKp7X8bylJs7ioQJ36mfqFlsiZXOgFXa0ZP7AG1E="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; buildInputs = [ garcon + glib gtk3 - libnotify # optional notification support + libnotify librsvg libxfce4ui libxfce4util @@ -32,8 +55,13 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-xkb-plugin-"; }; + + meta = { description = "Allows you to setup and use multiple keyboard layouts"; - teams = [ teams.xfce ]; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin"; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +})