diff options
Diffstat (limited to 'pkgs/desktops')
164 files changed, 803 insertions, 461 deletions
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 05c5b96242cf..f068d1994ec4 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -66,7 +66,7 @@ meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Accerciser"; description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 8143532a5f29..05a1cdbc088e 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 8429b060bea6..c1901110b585 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 9e8dcf2a5470..1243d5fa5cb6 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index dd73f6b11ed8..c6b28e86ab83 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 4a3b6068c137..7de5ffc1add0 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "Hex editor for GNOME desktop environment"; platforms = platforms.unix; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 7449e22d69d6..23f5410e1eaa 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 448c352fe0d3..7432e8e96ed2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 396ce9aad934..3d6832316cdc 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -136,6 +136,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Boxes"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 5db617b76af7..213b4f616721 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index fa9a7b003c3c..987fa594ae52 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 3cd3c3146d9e..7494d66cc0d9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 5aa39e09cd6f..8d5501537a0f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 2e0b1593b91c..5d31a42301e4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://live.gnome.org/DocumentationProject"; description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c254c1d60603..7eda4a706cab 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 18251cad2420..b00c6f5dd4eb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Maps"; description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 2a4c5026ed29..9de452404ce0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -103,7 +103,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Music"; description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 37401af3ce60..88072912b663 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 5ae1ed1220b9..03edd5c9bfe9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { description = "Note editor designed to remain simple to use"; homepage = "https://wiki.gnome.org/Apps/Notes"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 141eb79e5f04..4a92052763ef 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://projects-old.gnome.org/gnome-power-manager/"; description = "View battery and power statistics provided by UPower"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 354fc75004e6..f4a72fdfb482 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple and modern sound recorder"; homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index a26f328b45f4..d837ce3968e4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "Personal task manager for GNOME"; homepage = "https://wiki.gnome.org/Apps/Todo"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 989521d95dcd..407f25165327 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 0f5326ea0055..394ee86d15a7 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 6789aded2e55..ec6791e32311 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 18e180305fca..e04238b4b16f 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Remote desktop viewer for GNOME"; homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 1fe5b6fb8971..6eafa874b836 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = with platforms; linux ++ darwin; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index a33a7cd55cc4..af39d3a3c053 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { description = "Graphical application to analyse disk usage in any GNOME environment"; homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index 5a44cac3fdf1..b9da1ab1c163 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { description = "An input assistive technology intended for switch and pointer users"; homepage = "https://wiki.gnome.org/Projects/Caribou"; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 45c3185bc297..ba8a85352fd0 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index fed6c747f199..83c1f5d4a56f 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Empathy"; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = [ licenses.gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 65fefbd23c32..d7a4b32f785c 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "GNOME image viewer"; homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 33fdb05172f8..5ede0184d219 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 40bee972fe5d..2852c816e4b5 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -128,6 +128,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers ++ [ maintainers.vcunat ]; + maintainers = teams.gnome.members ++ [ maintainers.vcunat ]; }; } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 1a511cc9d39f..f5d60ee917ce 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://wiki.gnome.org/Apps/Evolution"; license = licenses.lgpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 5ead4539ff18..58c898a5f0dd 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { description = "A program that manages graphical display servers and handles graphical user logins"; homepage = "https://wiki.gnome.org/Projects/GDM"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 518b86adf7f9..e8463c5b704e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 79c2505de7b7..ed647bb87d81 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 7705f43aae93..e14d8d136cd8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Calculator"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 341fd13bfa73..69655e2364d3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of graphical utilities for color management to be used in the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f2eb65e50bbf..fb0b0f875440 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index ac51b33fee85..97abd746e1b9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Contacts"; description = "GNOME’s integrated address book"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 00f5ff5cd7a6..e4efcae889a4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to configure the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 213cb890ef6d..3f84d0ccd559 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 5869adeca716..a19f0b6a276e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Dictionary"; description = "Dictionary is the GNOME application to look up definitions"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 13261aece483..a7f66e68eeff 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; description = "A udisks graphical front-end"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 0589dfe72854..d0ceef61c25a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 67d5c11ae9f9..e5277b07ad5c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -103,6 +103,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 49fba3cf6593..9ffd32e85f70 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index f238b695990e..ede2f2792483 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 42e029e72d43..a77aee4b890c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook -, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }: +, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; description = "GNOME Remote Desktop server"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 66dd5ad5effd..2eacfc2de777 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot"; description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 697919991eed..b25688ea5a9d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "GNOME session manager"; homepage = "https://wiki.gnome.org/Projects/SessionManagement"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c4b1ab867c7d..6ff33660dc2b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 319f684c4bda..c298d8b337fb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rmi6ccqfdisvmmzaiqr2r031r0f3h8qxgw5qwq62x859nbrzcmm"; + sha256 = "0fah7cc22g55w6w7ia3kr2wpdrc45h83xw4pimi54mhggmx9466y"; }; passthru = { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 4bde6c63745d..864dd45aad20 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -6,7 +6,9 @@ , accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon -, gnome-autoar, asciidoc-full }: +, gnome-autoar, asciidoc-full +, bash-completion +}: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1phkkkwrrigchz58xs324vf6snd1fm7mxa2iaqwwj526vh5c1s2q"; + sha256 = "0696qw6bmbga30qlvh1k6bkiajl7877j8yis4bwmi1wxkcmkh854"; }; LANG = "en_US.UTF-8"; @@ -48,17 +50,12 @@ in stdenv.mkDerivation rec { # not declared at build time, but typelib is needed at runtime libgweather libnma + + # for gnome-extension tool + bash-completion ]; patches = [ - # Fix dependencies. - # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1114 - (fetchpatch { - name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; - url = "https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016"; - sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; - }) - # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { src = ./fix-paths.patch; @@ -66,32 +63,23 @@ in stdenv.mkDerivation rec { gsettings = "${glib.bin}/bin/gsettings"; }) - # Fix ibus launching regression. - # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1080 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/94f6976ddd6337593203fdcdd2e3644774408dfa.patch"; - sha256 = "PGmFQhqqd3gK+3kp0dlmlYd2G5ZTIQpfE++Q03Ghkx0="; - }) + # Install bash-completions to correct prefix. + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 + ./fix-bash-completion.patch - # Fix typing regression with ibus. - # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1084 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/b18469427e5c19402111de5fe9888bceec0eaacd.patch"; - sha256 = "1M+3kjt7K61BFgk1Zf9XfK1ziilQGa60PD8xtVjnQec="; - }) + # Use absolute path for libshew installation to make our patched gobject-introspection + # aware of the location to hardcode in the generated GIR file. + ./shew-gir-path.patch - # Fix theming breakage after Shell restart on X11. - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2329 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/72c4f148ef88b4bffb2106b99434da5c05c0bb64.patch"; - sha256 = "RBA+JHz4ZvmbJZMnGNieD6D5LONRgFU4iOFIMQQ2kHQ="; - }) + # Make D-Bus services wrappable. + ./wrap-services.patch - # Fix Telepathy chat integration. - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2449 + # Fix greeter logo being too big. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/766288eec1bd3bd50dfc4ddf410c2b507187e603.patch"; - sha256 = "Cp6xLohCM0gmMxtyYjSukS2oV60Khmxf4iQd9EDAlIc="; + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/ffb8bd5fa7704ce70ce7d053e03549dd15dce5ae.patch"; + revert = true; + sha256 = "9DdzjEnDiBL+JmdfgKwjYPn1O2wJ/6n1sMDT1ylUB5I="; }) ]; @@ -112,6 +100,13 @@ in stdenv.mkDerivation rec { ) ''; + postFixup = '' + # The services need typelibs. + for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications; do + wrapGApp $out/share/gnome-shell/$svc + done + ''; + passthru = { mozillaPlugin = "/lib/mozilla/plugins"; updateScript = gnome3.updateScript { @@ -124,7 +119,7 @@ in stdenv.mkDerivation rec { description = "Core user interface for the GNOME 3 desktop"; homepage = "https://wiki.gnome.org/Projects/GnomeShell"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch new file mode 100644 index 000000000000..08f674c23773 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch @@ -0,0 +1,10 @@ +--- a/subprojects/extensions-tool/meson.build ++++ a/subprojects/extensions-tool/meson.build +@@ -39,6 +39,6 @@ subdir('src') + + if bash_completion.found() + install_data('completion/bash/gnome-extensions', +- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') ++ install_dir: bash_completion.get_pkgconfig_variable('completionsdir', define_variable: ['prefix', prefix]) + ) + endif diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch new file mode 100644 index 000000000000..2d7bdf303151 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch @@ -0,0 +1,11 @@ +--- a/subprojects/shew/src/meson.build ++++ b/subprojects/shew/src/meson.build +@@ -13,7 +13,7 @@ shew_sources = [ + libshew = library(full_name, + sources: shew_sources, + dependencies: [gtk_dep], +- install_dir: pkglibdir, ++ install_dir: get_option('prefix') / pkglibdir, + install: true, + ) + diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch new file mode 100644 index 000000000000..bc494caea9dd --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch @@ -0,0 +1,57 @@ +diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in +old mode 100644 +new mode 100755 +index 524166102..100b81a63 +--- a/js/dbusServices/dbus-service.in ++++ b/js/dbusServices/dbus-service.in +@@ -1,3 +1,9 @@ ++#!@gjs@ ++ ++// gjs determines the package name from argv[0], which is .*-wrapped ++// so we need to override it to the original one. ++imports.package._findEffectiveEntryPointName = () => '@service@' ++ + imports.package.start({ + name: '@PACKAGE_NAME@', + prefix: '@prefix@', +diff --git a/js/dbusServices/dbus-service.service.in b/js/dbusServices/dbus-service.service.in +index 3b0d09abe..4fd4bb66d 100644 +--- a/js/dbusServices/dbus-service.service.in ++++ b/js/dbusServices/dbus-service.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=@service@ +-Exec=@gjs@ @pkgdatadir@/@service@ ++Exec=@pkgdatadir@/@service@ +diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build +index c749f45dc..11bcb0c9e 100644 +--- a/js/dbusServices/meson.build ++++ b/js/dbusServices/meson.build +@@ -2,6 +2,7 @@ launcherconf = configuration_data() + launcherconf.set('PACKAGE_NAME', meson.project_name()) + launcherconf.set('prefix', prefix) + launcherconf.set('libdir', libdir) ++launcherconf.set('gjs', gjs.path()) + + dbus_services = { + 'org.gnome.Shell.Extensions': 'extensions', +@@ -11,16 +12,17 @@ dbus_services = { + config_dir = '@0@/..'.format(meson.current_build_dir()) + + foreach service, dir : dbus_services ++ svc_launcherconf = launcherconf ++ svc_launcherconf.set('service', service) + configure_file( + input: 'dbus-service.in', + output: service, +- configuration: launcherconf, ++ configuration: svc_launcherconf, + install_dir: pkgdatadir, + ) + + serviceconf = configuration_data() + serviceconf.set('service', service) +- serviceconf.set('gjs', gjs.path()) + serviceconf.set('pkgdatadir', pkgdatadir) + + configure_file( diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index acf6210d9162..46201629ce7a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "Software store that lets you install and update applications and system extensions"; homepage = "https://wiki.gnome.org/Apps/Software"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 63df741b9eb7..82ec3c9a9d76 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 720976091bde..6a90bb7657ac 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Terminal"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 5cd8f2494815..9cbac8c74277 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -27,6 +27,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 108ff9afca70..719e97647f7a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; description = "GNOME Greeter & Tour"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 9e7f5bb6319b..90acee076a34 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://help.gnome.org/users/gnome-user-share/3.8"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index b6e8b4c11c03..927d70345e77 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { description = "GNOME Character Map, based on the Unicode Character Database"; homepage = "https://wiki.gnome.org/Apps/Gucharmap"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 3c8a139d3e15..9edb36156d19 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.0"; + version = "3.36.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18lvj158w6gwc6xpvn699v8ykh1r5szry7sqascl6f1i8g628v2x"; + sha256 = "09fqs9805d07c60a2ibskqffsb5wn72l8grwzb9fic5sl574b0im"; }; mesonFlags = [ @@ -121,13 +121,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit zenity; }) - - # Fix crash when opening submenus from «always on visible workspace» windows - # https://gitlab.gnome.org/GNOME/mutter/issues/1083 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/7e32cc05ce2e5b3931ddcf46ce9ead603a0de39e.patch"; - sha256 = "5ZzOMizucfrSnHNYjHIUObLHCvAIjrE6fY/CxLp4c7k="; - }) ]; postPatch = '' @@ -149,7 +142,7 @@ stdenv.mkDerivation rec { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index db7460ce60dc..9914489ad257 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Files"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index f36bf5a6c28b..1ace6a5f7772 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; homepage = "https://wiki.gnome.org/Projects/Rygel"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 8af508470102..99e5975eb5de 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 2d6d398fb459..4bdc409d8166 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index efe11c967bb4..50ab50e58b2c 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 05699586f828..09019e6758c1 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 2c9f6e5a243d..1235447c032a 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "The help viewer in Gnome"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 16ef06d8d9df..5750fa0d001c 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 25a8ba6573ab..9d34fc0f40c6 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -18,8 +18,6 @@ lib.makeScope pkgs.newScope (self: with self; { in lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; - maintainers = lib.teams.gnome.members; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; @@ -358,5 +356,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 + maintainers = lib.teams.gnome.members; + mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; }) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 1a6acbd46136..fa53b05c44b6 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { description = "API documentation browser for GNOME"; homepage = "https://wiki.gnome.org/Apps/Devhelp"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 0bb1fbc79ffb..3a53e592b5fc 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/GNOME/gnome-devel-docs"; description = "Developer documentation for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.fdl12; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index edaced3579d2..1e3815705cd3 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. ''; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 5af3ae8fe193..d508222188b8 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { owner = "micheleg"; repo = "dash-to-dock"; # rev = "extensions.gnome.org-v" + version; - rev = "c58004802b2eedfde96966a4ec0151fea2a1bd98"; - sha256 = "IjunykPFP2CbGcd8XVqhPuNUOUOOgDAQFIytLaoyqRg="; + rev = "8c94a8d6db47ebc1273e690f4e0ba5e592f7f268"; + sha256 = "7nNfxAINqOIJCgYXYaPck2EJ1IOmzt6AkfDFknZ8GaI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index ff463b104e22..e4de15c79b29 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Aisleriot"; description = "A collection of patience games written in guile scheme"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 688aa0832cdd..28cc020b2d80 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { description = "Puzzle game where you move atoms to build a molecule"; homepage = "https://wiki.gnome.org/Apps/Atomix"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 9bb1286c8d92..ca69395eb235 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Five_or_more"; description = "Remove colored balls from the board by forming lines"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 66d174b25c4e..0d73e3b3744b 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; description = "Make lines of the same color to win"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index c1d9a137aaca..21348370579d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Chess"; description = "Play the classic two-player boardgame of chess"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index f46f4b98cb24..372c12022deb 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Klotski"; description = "Slide blocks to solve the puzzle"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index f20f4c5f2c00..701008f0c36d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Mahjongg"; description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 6e1354093596..f49634c6ada0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Mines"; description = "Clear hidden mines from a minefield"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index ddac0775fa8f..9dcc8744d2e2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Guide a worm around a maze"; homepage = "https://wiki.gnome.org/Apps/Nibbles"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 0f85e10511cb..2ba6d4e7044c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Robots"; description = "Avoid the robots and make them crash into each other"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 890fea6ad9be..0a84e1065f3a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Sudoku"; description = "Test your logic skills in this number grid puzzle"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 449b4ec71feb..f50969eb52e4 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Taquin"; description = "Move tiles so that they reach their places"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 5c98acf92290..4fe68a4f8a74 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index c0c9cac39061..8d1c9e3dd65b 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Hitori"; description = "GTK application to generate and let you play games of Hitori"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index d6d88b688d09..5db02c8dfa41 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 3ce928f2ce51..fd44bbece996 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Lightsoff"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 9c757cef85fd..474ee5823a7f 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Classic falling-block game, Tetris"; homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 85272c39de5e..4b12609d3f3d 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 6af84b59b9a5..62df1cd1e3da 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Tali"; description = "Sort of poker with dice and less money"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 748f55977972..bbde1fa36793 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Geary"; description = "Mail client for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index a212d4112c84..bc2afb519799 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { description = "Applets for use with the GNOME panel"; homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 8f1d193a6d36..baa43bdedb3e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; description = "Library to integrate compressed files management with GNOME"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 0920d2f2df3f..1fea28d24de0 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -191,7 +191,7 @@ let description = "GNOME 2.x-like session for GNOME 3"; homepage = "https://wiki.gnome.org/Projects/GnomeFlashback"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 5e8348ee0af1..63a651258823 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.freedesktop.org/software/PackageKit/"; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; description = "Tools for installing software on the GNOME desktop using PackageKit"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index 80e75561e3cb..d390a5b27a28 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; homepage = "https://wiki.gnome.org/Projects/GnomePanel"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 0cd8301e199c..0271992b6407 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 1ee9e5b933b6..b6a88e5864b4 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -5,7 +5,6 @@ , clutter , gjs , glib -, gnome3 , gobject-introspection , gtk3 , meson @@ -77,6 +76,6 @@ stdenv.mkDerivation rec { description = "Clipboard management system with GNOME 3 integration"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index a607a6eb6a07..9550de32fbea 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index dae6046c19e7..1f9afefd2e48 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; homepage = "https://wiki.gnome.org/Apps/Games"; license = licenses.lgpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index ed21f00878cd..e62c6fe7fee3 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { description = "Window manager used in Gnome Flashback"; homepage = "https://wiki.gnome.org/Projects/Metacity"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 96731e87cfd6..e8c523277e18 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Python bindings for the Nautilus Extension API"; homepage = "https://wiki.gnome.org/Projects/NautilusPython"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 8af63df0f865..c3da10d1cf39 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.7.0"; + version = "2.7.1"; repoName = "videos"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7"; + sha256 = "00arim4i9bv9mbms1irkp44grkgrfnmqzraswyn1xiz9nvl1bsb9"; }; passthru = { diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index ee3acb2af3cf..905e2cc9aadf 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1fhgdcykn0ykn8fp7inn2akygpglhdwfpdkpnih86kqmqj8siahv"; + sha256 = "1lky7pw47d5mdza3bhq0ahdhgdv159ixngdsc1ys6j1kszsfxc1f"; }; passthru = { diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 32486aab981f..251866528e64 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -3,9 +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/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index ea025fbb33c6..08b78ec40067 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -8,7 +8,7 @@ let in mkXfceDerivation { - category = "apps"; + category = "archive"; pname = "orage"; version = "4.12.1"; diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 20b899165f09..bfb865184487 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 08f2bd511a87..8aff25df4943 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 b2682080216c..7e582abc05f7 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 a991e8c81807..40d9c188fa3d 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 012486baac9b..8c0fa3e3edb6 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,9 +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 e3d8b4b87d94..9a923025c94d 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 3b9cd268d55a..56de8d3bfb83 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/xfce4-volumed/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix index 76e89a592b48..aec898161ffb 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, pkgconfig, makeWrapper , gstreamer, gtk2, gst-plugins-base, libnotify -, keybinder, xfconf +, keybinder, xfconf, xfce }: let + category = "apps"; + # The usual Gstreamer plugins package has a zillion dependencies # that we don't need for a simple mixer, so build a minimal package. gst_plugins_minimal = gst-plugins-base.override { @@ -13,15 +15,13 @@ let in stdenv.mkDerivation rec { - p_name = "xfce4-volumed"; - ver_maj = "0.1"; - ver_min = "13"; + pname = "xfce4-volumed"; + version = "0.1.13"; src = fetchurl { - url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1aa0a1sbf9yzi7bc78kw044m0xzg1li3y4w9kf20wqv5kfjs7v2c"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ gstreamer gst_plugins_minimal gtk2 @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; + meta = with stdenv.lib; { homepage = "https://www.xfce.org/projects/xfce4-volumed"; # referenced but inactive description = "A volume keys control daemon for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index a17c29f6723e..a9610125b5b5 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,10 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.7.5"; - rev = "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 4f35dff42ff3..e614bb1db921 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, xfce }: + +let + category = "art"; +in stdenv.mkDerivation rec { - p_name = "xfce4-icon-theme"; - ver_maj = "4.4"; - ver_min = "3"; + pname = "xfce4-icon-theme"; + version = "4.4.3"; src = fetchurl { - url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + gtk3 + ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { + meta = with stdenv.lib; { homepage = "https://www.xfce.org/"; description = "Icons for Xfce"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix index 1c40b7ec29b1..db0a1779a41b 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -1,15 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xfce }: + +let + category = "art"; +in stdenv.mkDerivation rec { - p_name = "xfwm4-themes"; - ver_maj = "4.10"; - ver_min = "0"; + pname = "xfwm4-themes"; + version = "4.10.0"; src = fetchurl { - url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; meta = with stdenv.lib; { homepage = "https://www.xfce.org/"; diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 59ab5823314e..ee58c76ea02b 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-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index fc6db0fcce4f..ecc26ccb8fea 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -9,6 +9,8 @@ mkXfceDerivation { sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0"; + odd-unstable = false; + meta = { description = "Thunar extension for automatic management of removable drives and media"; }; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 11220141d2a0..24df606e2466 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 b795007ca7c1..1a615b8f66a5 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 f4d86247c6cd..ffd42e4a2c5b 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 fb3f05b36646..9f9a552b8cc6 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 0ab362aa21d0..c7442a01957a 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 74ab96ed1bcd..9b263e5ee733 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 afcd0d19dc33..75e9fc8cb653 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 9f49299c03a8..579e863bf9c8 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -3,6 +3,14 @@ lib.makeScope pkgs.newScope (self: with self; { #### NixOS support + updateScript = pkgs.genericUpdater; + + gitLister = url: + "${pkgs.common-updater-scripts}/bin/list-git-tags ${url}"; + + archiveLister = category: name: + "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions https://archive.xfce.org/src/${category}/${name}"; + mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; @@ -109,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 { }; @@ -179,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; @@ -203,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/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index b7dc83225696..4c6edf99b611 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,6 +1,16 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }: - -{ category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args: +{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: + +{ category +, pname +, version +, attrPath ? "xfce.${pname}" +, rev-prefix ? "${pname}-" +, rev ? "${rev-prefix}${version}" +, sha256 +, odd-unstable ? true +, patchlevel-unstable ? true +, ... +} @ args: let inherit (builtins) filter getAttr head isList; @@ -12,7 +22,7 @@ let concatAttrLists = attrsets: zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; - template = { + template = rec { name = "${pname}-${version}"; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; @@ -27,6 +37,13 @@ let enableParallelBuilding = true; outputs = [ "out" "dev" ]; + pos = builtins.unsafeGetAttrPos "pname" args; + + passthru.updateScript = xfce.updateScript { + inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; + versionLister = xfce.gitLister src.url; + }; + meta = with stdenv.lib; { homepage = "https://git.xfce.org/${category}/${pname}/about"; license = licenses.gpl2; # some libraries are under LGPLv2+ 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 3966e256b160..0d047447e0c2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix @@ -1,11 +1,12 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-battery-plugin"; - version = "1.1.2"; - rev = version; - sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0"; + version = "1.1.3"; + rev-prefix = ""; + odd-unstable = false; + 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 bd1a3b5e5e35..2349b4bf3e8d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,11 +1,10 @@ { mkXfceDerivation, gtk3, libXtst, libxfce4ui, libxfce4util, xfce4-panel, xfconf, exo }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.4.3"; - rev = version; - 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 321e4792e4bc..38ad759e700c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,23 +1,46 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-cpugraph-plugin"; - ver_maj = "1.0"; - ver_min = "5"; + pname = "xfce4-cpugraph-plugin"; + version = "1.1.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1izl53q95m5xm2fiq7385vb1i9nwgjizxkmgpgh33zdckb40xnl5"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + 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-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 3cfb010b12da..15f528fd5fc7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -7,13 +7,12 @@ , gettext }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-datetime-plugin"; version = "0.8.0"; - rev = "datetime-${version}"; - + rev-prefix = "datetime-"; sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah"; nativeBuildInputs = [ 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 d5982ea3c12a..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: - -with stdenv.lib; -stdenv.mkDerivation rec { - p_name = "xfce4-dict-plugin"; - ver_maj = "0.3"; - ver_min = "0"; - - src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.gz"; - sha256 = "1x0imfnsdfq7fbhka8bc0yjjspkcljc1jafhrwzb08qi9bk2wbar"; - }; - name = "${p_name}-${ver_maj}.${ver_min}"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - 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-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index db74da2939de..673b0a24fb61 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -2,9 +2,10 @@ , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { + pname = "xfce4-dockbarx-plugin"; + version = "${ver}-${rev}"; ver = "0.5"; rev = "a2dcb66"; - name = "xfce4-dockbarx-plugin-${ver}-${rev}"; src = fetchFromGitHub { owner = "TiZ-EX1"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 94c26f9e1b2b..2b2027bcf4bc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,23 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: + +let + category = "panel-plugins"; +in with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-embed-plugin"; - ver_maj = "1.6"; - ver_min = "0"; + pname = "xfce4-embed-plugin"; + version = "1.6.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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}"; + versionLister = xfce.archiveLister category pname; + }; meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + 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 1932a9e9968e..220e25068582 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,25 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-eyes-plugin"; - ver_maj = "4.4"; - ver_min = "4"; + pname = "xfce4-eyes-plugin"; + version = "4.5.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1jh02hylvsvfpxrx0bq6fzgy6vnxf9qakgpbfvr63lfkd1dyh314"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Eyes following you!"; + meta = with stdenv.lib; { + 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 54bb4817d7e2..b67e63f5c644 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,25 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-fsguard-plugin"; - ver_maj = "1.0"; - ver_min = "2"; + pname = "xfce4-fsguard-plugin"; + version = "1.1.1"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1bj021h4q68bc03f32pkyqy4gfd1sz6s21nxdg7j6gdfhs9xbj52"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Filesystem monitor"; + meta = with stdenv.lib; { + 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 dd9827dcc5a9..417001fed53b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,25 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-genmon-plugin"; - ver_maj = "3.4"; - ver_min = "0"; + pname = "xfce4-genmon-plugin"; + version = "4.0.2"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "11q3g6lmgz3d5lyh6614mxkd9cblfdyf9jgki7f26mn895xk79dh"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Cyclically spawns a command and captures its output"; + meta = with stdenv.lib; { + 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 40810abfc079..d8775c4b7045 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2, - libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors + libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce }: stdenv.mkDerivation rec { @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + meta = with stdenv.lib; { + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 058f25917161..3d60d8b18f9a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,27 +1,45 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo, gnutls, libgcrypt }: + gtk2, exo, gnutls, libgcrypt, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-mailwatch-plugin"; - ver_maj = "1.2"; - ver_min = "0"; + pname = "xfce4-mailwatch-plugin"; + version = "1.2.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Mailwatch plugin for Xfce panel"; + meta = with stdenv.lib; { + 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 b936d2e441c0..bb56e875c865 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,27 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, + libxfce4ui, gtk3, exo, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-mpc-plugin"; - ver_maj = "0.4"; - ver_min = "5"; - name = "${p_name}-${ver_maj}.${ver_min}"; + pname = "xfce4-mpc-plugin"; + version = "0.5.2"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + 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}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + 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 d774649b5369..8d258220175b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -1,11 +1,12 @@ { mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-netload-plugin"; - version = "1.3.1"; - rev = "version-${version}"; - sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h"; + version = "1.3.2"; + rev-prefix = "version-"; + 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 516d86f56abb..d6910d367a63 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,25 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-notes-plugin"; - ver_maj = "1.7"; - ver_min = "7"; + pname = "xfce4-notes-plugin"; + version = "1.8.1"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "05sjbwgch1j93m3r23ksbjnpfk11sf7xjmbb9pm5vl3snc2s3fm7"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + 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 64916f92a6ff..10850974bb7d 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 56cad888168d..8b8dbf3e022c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui, - libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, + libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: +let + category = "panel-plugins"; +in + stdenv.mkDerivation rec { - name = "${pname}-${ver_maj}.${ver_min}"; pname = "xfce4-sensors-plugin"; - ver_maj = "1.2"; - ver_min = "6"; + version = "1.3.92"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${pname}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; }; nativeBuildInputs = [ @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 + gtk3 libxfce4ui libxfce4util xfce4-panel @@ -35,12 +37,18 @@ stdenv.mkDerivation rec { "--with-pathhddtemp=${hddtemp}/bin/hddtemp" "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + meta = with stdenv.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 = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 95fb9358f946..52da6a29ea42 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,23 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-systemload-plugin"; - ver_maj = "1.1"; - ver_min = "2"; + pname = "xfce4-systemload-plugin"; + version = "1.2.3"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0z4as6sxdz93d4jpgv0665dg4sykfvc5068mc689phlfl2rvcsdl"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + 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 4070156c2239..00b497c918d8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,31 +1,44 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel -, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: + +let + category = "panel-plugins"; +in -with stdenv.lib; stdenv.mkDerivation rec { - p_name = "xfce4-timer-plugin"; - ver_maj = "1.6"; - ver_min = "0"; + pname = "xfce4-timer-plugin"; + version = "1.7.0"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0z46gyw3ihcd1jf0m5z1dsc790xv1cpi8mk1dagj3i4v14gx5mrr"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - 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" ]; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - 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"; + meta = with stdenv.lib; { + 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 43e943f194ac..525bd6e5fd7d 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 ]; @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + }; + meta = with stdenv.lib; { description = "Global Menu applet for XFCE4"; license = licenses.lgpl3; 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 288aaddfb982..5a98173ea00c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -1,10 +1,10 @@ { lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-verve-plugin"; version = "2.0.0"; - rev = version; + rev-prefix = ""; sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz"; buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 0914c4cb7d97..cff2ef251ad4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,29 +1,48 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, + libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: + +let + category = "panel-plugins"; +in stdenv.mkDerivation rec { - name = "${p_name}-${ver_maj}.${ver_min}"; - p_name = "xfce4-weather-plugin"; - ver_maj = "0.8"; - ver_min = "10"; + pname = "xfce4-weather-plugin"; + version = "0.10.1"; src = fetchurl { - url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; + url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + 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; + + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister category pname; + }; - meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; + meta = with stdenv.lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } 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 884b8ee3a294..262093af69f1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,10 +1,10 @@ { mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; version = "2.4.3"; - rev = "v${version}"; + rev-prefix = "v"; sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index eba7be91ef9d..e629a08c5537 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -1,21 +1,34 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 -, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools }: +, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { - p_name = "xfce4-windowck-plugin"; - version = "0.4.4"; + pname = "xfce4-windowck-plugin"; + version = "0.4.6"; src = fetchFromGitHub { owner = "cedl38"; - repo = "xfce4-windowck-plugin"; + repo = pname; rev = "v${version}"; - sha256 = "0c6a1ibh39dpq9x0dha5lsg0vzmgaf051fgwz0nlky0s94nwzvgv"; + sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g"; }; - name = "${p_name}-${version}"; - 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 @@ -24,9 +37,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; - 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 ]; 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 4497a7b0e36a..a08621594890 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -1,10 +1,10 @@ { lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-xkb-plugin"; version = "0.8.1"; - rev = version; + rev-prefix = ""; sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky"; buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index e3c72d3b50e2..6b255dc72012 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,6 +1,5 @@ { stdenv , mkXfceDerivation -, fetchFromGitHub , gtk3 , thunar , exo @@ -9,7 +8,7 @@ , gettext }: -mkXfceDerivation rec { +mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-archive-plugin"; version = "0.4.0"; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 8674c586552c..61e9d94acc5d 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -5,6 +5,7 @@ , thunar , cmake , ninja +, xfce }: stdenv.mkDerivation rec { @@ -31,6 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.thunar-dropbox-plugin"; + versionLister = xfce.gitLister src.meta.homepage; + }; + meta = with stdenv.lib; { homepage = "https://github.com/Jeinzi/thunar-dropbox"; description = "A plugin that adds context-menu items for Dropbox to Thunar"; |