diff options
126 files changed, 178 insertions, 181 deletions
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 03b5bb53197..34e6ab4b24d 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -24,8 +24,8 @@ <para> Apart from high-level options, it’s possible to tweak a package in almost arbitrary ways, such as changing or disabling dependencies of a package. For - instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2. - If you want to build it against GTK+ 3, you can specify that as follows: + instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. + If you want to build it against GTK 3, you can specify that as follows: <programlisting> <xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; </programlisting> @@ -33,7 +33,7 @@ function that produces Emacs, with the original arguments amended by the set of arguments specified by you. So here the function argument <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing - Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix, + Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, <xref linkend="opt-environment.systemPackages"/> would be a list with two elements.) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 86f4a1ccfb7..14b31b232e9 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -730,7 +730,7 @@ in </listitem> <listitem> <para> - <literal>jre</literal> now defaults to GTK+ UI by default. This improves + <literal>jre</literal> now defaults to GTK UI by default. This improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless workloads it's recommended to use diff --git a/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixos/modules/config/gtk/gtk-icon-cache.nix index 9c5d993b9c5..86a6bfb5af4 100644 --- a/nixos/modules/config/gtk/gtk-icon-cache.nix +++ b/nixos/modules/config/gtk/gtk-icon-cache.nix @@ -7,7 +7,7 @@ with lib; type = types.bool; default = config.services.xserver.enable; description = '' - Whether to build icon theme caches for GTK+ applications. + Whether to build icon theme caches for GTK applications. ''; }; }; diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix index 065e72d6c37..e3549c79588 100644 --- a/nixos/modules/programs/plotinus.nix +++ b/nixos/modules/programs/plotinus.nix @@ -18,7 +18,7 @@ in enable = mkOption { default = false; description = '' - Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a + Whether to enable the Plotinus GTK 3 plugin. Plotinus provides a popup (triggered by Ctrl-Shift-P) to search the menus of a compatible application. ''; diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index 902cd89e0c4..8fc8c22c6d7 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -13,10 +13,10 @@ <link xlink:href="https://github.com/p-e-w/plotinus"/> </para> <para> - Plotinus is a searchable command palette in every modern GTK+ application. + Plotinus is a searchable command palette in every modern GTK application. </para> <para> - When in a GTK+3 application and Plotinus is enabled, you can press + When in a GTK 3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application. </para> diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 8ced302bad1..03483f69fa2 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -59,7 +59,7 @@ <para> The latest stable version of Emacs 25 using the <link - xlink:href="http://www.gtk.org">GTK+ 2</link> + xlink:href="http://www.gtk.org">GTK 2</link> widget toolkit. </para> </listitem> @@ -321,7 +321,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides <para> If you want, you can tweak the Emacs package itself from your <filename>emacs.nix</filename>. For example, if you want to have a - GTK+3-based Emacs instead of the default GTK+2-based binary and remove the + GTK 3-based Emacs instead of the default GTK 2-based binary and remove the automatically generated <filename>emacs.desktop</filename> (useful is you only use <command>emacsclient</command>), you can change your file <filename>emacs.nix</filename> in this way: @@ -349,7 +349,7 @@ in [...] <para> After building this file as shown in <xref linkend="ex-emacsNix" />, you - will get an GTK3-based Emacs binary pre-loaded with your favorite packages. + will get an GTK 3-based Emacs binary pre-loaded with your favorite packages. </para> </section> </section> diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 527e4b18045..9914b668709 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -31,7 +31,7 @@ in e.efl e.enlightenment e.terminology e.econnman pkgs.xorg.xauth # used by kdesu - pkgs.gtk2 # To get GTK+'s themes. + pkgs.gtk2 # To get GTK's themes. pkgs.tango-icon-theme pkgs.gnome2.gnome_icon_theme @@ -48,7 +48,7 @@ in services.xserver.desktopManager.session = [ { name = "Enlightenment"; start = '' - # Set GTK_DATA_PREFIX so that GTK+ can find the themes + # Set GTK_DATA_PREFIX so that GTK can find the themes export GTK_DATA_PREFIX=${config.system.path} # find theme engines export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index e1084b0053c..e3fbfc390cd 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -48,7 +48,7 @@ in name = "mate"; bgSupport = true; start = '' - # Set GTK_DATA_PREFIX so that GTK+ can find the themes + # Set GTK_DATA_PREFIX so that GTK can find the themes export GTK_DATA_PREFIX=${config.system.path} # Find theme engines diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 1102f73d1ac..e3249aef50c 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -48,7 +48,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs.xfce // pkgs; [ - # Get GTK+ themes and gtk-update-icon-cache + # Get GTK themes and gtk-update-icon-cache gtk2.out # Supplies some abstract icons such as: @@ -107,10 +107,10 @@ in start = '' ${cfg.extraSessionCommands} - # Set GTK_PATH so that GTK+ can find the theme engines. + # Set GTK_PATH so that GTK can find the theme engines. export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes. export GTK_DATA_PREFIX=${config.system.path} ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} & diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 16329c093f9..55c88223e78 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -114,10 +114,10 @@ in name = "xfce4-14"; bgSupport = true; start = '' - # Set GTK_PATH so that GTK+ can find the theme engines. + # Set GTK_PATH so that GTK can find the theme engines. export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0" - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. + # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes. export GTK_DATA_PREFIX=${config.system.path} ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} & diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 0c4ad90b4eb..1ec17586d49 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -137,7 +137,7 @@ in networking.timeServers = [ "169.254.169.123" ]; # udisks has become too bloated to have in a headless system - # (e.g. it depends on GTK+). + # (e.g. it depends on GTK). services.udisks2.enable = false; }; } diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index f9a53f59e4d..865bc130db9 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - description = "A modern audio book player for Linux using GTK+ 3"; + description = "A modern audio book player for Linux using GTK 3"; homepage = https://cozy.geigi.de/; maintainers = [ maintainers.makefu ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 0cff6c419a0..fee86cb5bca 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "PulseAudio Volume Control"; longDescription = '' - PulseAudio Volume Control (pavucontrol) provides a GTK+ + PulseAudio Volume Control (pavucontrol) provides a GTK graphical user interface to connect to a PulseAudio server and easily control the volume of all clients, sinks, etc. ''; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 8db837105f8..c874bdd40d2 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -46,11 +46,11 @@ python3.pkgs.buildPythonApplication rec { preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; meta = with stdenv.lib; { - description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; + description = "GTK-based audio player written in Python, using the Mutagen tagging library"; license = licenses.gpl2Plus; longDescription = '' - Quod Libet is a GTK+-based audio player written in Python, using + Quod Libet is a GTK-based audio player written in Python, using the Mutagen tagging library. It's designed around the idea that you know how to organize your music better than we do. It lets you make playlists based on regular expressions (don't worry, diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index d5985f097e9..ce2a4e9d2c8 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -41,7 +41,7 @@ in buildPythonApplication rec { longDescription = '' Sonata is an elegant client for the Music Player Daemon. - Written in Python and using the GTK+ 3 widget set, its features + Written in Python and using the GTK 3 widget set, its features include: - Expanded and collapsed views diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 795342fba5d..508d2329edc 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A notepad clone for GTK+ 2.0"; + description = "A notepad clone for GTK 2.0"; homepage = http://tarot.freeshell.org/leafpad; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 103f40fc9c7..2762748bc1a 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ++ (with perlPackages; [ perl XMLParser ]); meta = { - description = "Simple GTK+2 color selector"; + description = "Simple GTK 2 color selector"; homepage = http://gcolor2.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 62e2ebfa4b1..4275c6f0dcf 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Lightweight GTK+ based image viewer"; + description = "Lightweight GTK based image viewer"; longDescription = '' - Geeqie is a lightweight GTK+ based image viewer for Unix like + Geeqie is a lightweight GTK based image viewer for Unix like operating systems. It features: EXIF, IPTC and XMP metadata browsing and editing interoperability; easy integration with other software; geeqie works on files and directories, there is no need to diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index eea0e501cb8..7ae5286f762 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -19,7 +19,7 @@ python27Packages.buildPythonApplication rec { MComix is an user-friendly, customizable image viewer. It is specifically designed to handle comic books, but also serves as a generic viewer. It reads images in ZIP, RAR, 7Zip or tar archives as well as plain image - files. It is written in Python and uses GTK+ through the PyGTK bindings, + files. It is written in Python and uses GTK through the PyGTK bindings, and runs on both Linux and Windows. MComix is a fork of the Comix project, and aims to add bug fixes and diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 8a2a218d989..7274bdacd9d 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A simple GTK+1/2 painting program"; + description = "A simple GTK painting program"; longDescription = '' - mtPaint is a simple GTK+1/2 painting program designed for + mtPaint is a simple GTK painting program designed for creating icons and pixel based artwork. It can edit indexed palette or 24 bit RGB images and offers basic painting and palette manipulation tools. It also has several other more powerful features such as channels, diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 693ce84c97a..7a4e25560c7 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { - description = "Lightweight GTK+ Clipboard Manager"; + description = "Lightweight GTK Clipboard Manager"; homepage = "http://clipit.rspwn.com"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 1a87b7f5c8b..de922bb3990 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://packages.debian.org/wheezy/epdfview; - description = "A lightweight PDF document viewer using Poppler and GTK+"; + description = "A lightweight PDF document viewer using Poppler and GTK"; longDescription = '' - ePDFView is a free lightweight PDF document viewer using Poppler and - GTK+ libraries. The aim of ePDFView is to make a simple PDF document - viewer, in the lines of Evince but without using the Gnome libraries. + ePDFView is a free lightweight PDF document viewer using Poppler and + GTK libraries. The aim of ePDFView is to make a simple PDF document + viewer, in the lines of Evince but without using the Gnome libraries. ''; license = licenses.gpl2; maintainers = [ maintainers.astsmtl ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index f0da4e88351..5df34c84f09 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://fontmanager.github.io/; - description = "Simple font management for GTK+ desktop environments"; + description = "Simple font management for GTK desktop environments"; longDescription = '' Font Manager is intended to provide a way for average users to easily manage desktop fonts, without having to resort to command line tools or editing configuration files by hand. While designed primarily with the Gnome Desktop Environment in mind, it should - work well with other Gtk+ desktop environments. + work well with other GTK desktop environments. Font Manager is NOT a professional-grade font management solution. ''; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4d990c69b4a..c2b7487cd72 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' - girara is a library that implements a GTK+ based VIM-like user interface + girara is a library that implements a GTK based VIM-like user interface that focuses on simplicity and minimalism. ''; license = licenses.zlib; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index b5d008579ac..4a806cbb183 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A graphical frontend for libgksu"; longDescription = '' - GKSu is a library that provides a Gtk+ frontend to su and sudo. + GKSu is a library that provides a GTK frontend to su and sudo. It supports login shells and preserving environment when acting as a su frontend. It is useful to menu items or other graphical programs that need to ask a user's password to run another program diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 8a54cefaab0..50dda9510b9 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. - It uses GTK+ interface. + It uses GTK interface. Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index cb407fca66c..7f2057b2947 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - description = "GTK+-based audio CD player/ripper"; + description = "GTK-based audio CD player/ripper"; homepage = http://nostatic.org/grip; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 204624f2439..9b8d6a7f976 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with stdenv.lib; { - description = "A font selection program for X11 using the GTK2 toolkit"; + description = "A font selection program for X11 using the GTK 2 toolkit"; longDescription = '' - Font selection tool similar to xfontsel implemented using GTK+ 2. + Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; homepage = http://gtk2fontsel.sourceforge.net/; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 332c696d8da..1a8d5b76fe3 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { access to the graphical desktop via speech and refreshable braille. It works with applications and toolkits that support the Assistive Technology Service Provider Interface (AT-SPI). That includes the GNOME - Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and + GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 633c1d82159..c6cd118aea8 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.gpl2Plus; - description = "File manager with GTK+ interface"; + description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 482ac7ad066..17253173a5e 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://pcman.ptt.cc; license = licenses.gpl2; - description = "Telnet BBS browser with GTK+ interface"; + description = "Telnet BBS browser with GTK interface"; maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index 1fc96e551ac..74f9fc7c58c 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -27,10 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple wrapper around the VTE terminal emulator widget for GTK+"; - longDescription = '' - Simple wrapper around the VTE terminal emulator widget for GTK+ - ''; + description = "Simple wrapper around the VTE terminal emulator widget for GTK"; homepage = https://github.com/esmil/stupidterm; license = licenses.lgpl3Plus; maintainers = [ maintainers.etu ]; diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 975c6e4a468..88e4a904393 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -21,7 +21,7 @@ in symlinkJoin { description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the - poppler rendering library and the gtk+ toolkit. The idea behind zathura + poppler rendering library and the GTK toolkit. The idea behind zathura is an application that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction. ''; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index fd21d9222d3..a0bc0c743e4 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Lightweight WebKitGTK+ web browser"; + description = "Lightweight WebKitGTK web browser"; homepage = https://www.midori-browser.org/; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index a4979d3bcf2..d9d4fda1aed 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - description = "A simple web browser based on WebKit/GTK+"; + description = "A simple web browser based on WebKit/GTK"; longDescription = '' - Surf is a simple web browser based on WebKit/GTK+. It is able to display + Surf is a simple web browser based on WebKit/GTK. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 6dbc6954ef5..73c0e234945 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Native Gtk+ Twitter client for the Linux desktop"; + description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Corebird is a modern, easy and fun Twitter client."; homepage = https://corebird.baedert.org/; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index c333ae7ddcb..54783518af1 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Modern Jabber/XMPP Client using GTK+/Vala"; + description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = https://github.com/dino/dino; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 23bed01907e..7d62aa43888 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; - description = "GTK+ frontend to the notmuch mail system"; + description = "GTK frontend to the notmuch mail system"; maintainers = with maintainers; [ bdimcheff SuprDewd ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 6dcc35f44d3..bfd177cda7a 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more"; longDescription = '' - A simple GTK+ based GUI compatible with Modem manager, Wader and oFono + A simple GTK based GUI compatible with Modem manager, Wader and oFono system services able to control EDGE/3G/4G broadband modem specific functions. You can check balance of your SIM card, send or receive SMS messages, control mobile traffic consumption and more. diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 34ebf4364ce..3f90f65476e 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "A GTK+-based Usenet newsreader good at both text and binaries"; + description = "A GTK-based Usenet newsreader good at both text and binaries"; homepage = http://pan.rebelbase.com/; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index b94864a0b40..8af94b2609f 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { on top of a cross-platform back-end. Feature spotlight: * Uses fewer resources than other clients - * Native Mac, GTK+ and Qt GUI clients + * Native Mac, GTK and Qt GUI clients * Daemon ideal for servers, embedded systems, and headless use * All these can be remote controlled by Web and Terminal clients * Bluetack (PeerGuardian) blocklists with automatic updates diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index fb577f09120..f60d43f3616 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { license = licenses.gpl2; homepage = https://gitlab.com/Remmina/Remmina; - description = "Remote desktop client written in GTK+"; + description = "Remote desktop client written in GTK"; maintainers = with maintainers; [ melsigl ryantm ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 41cc3d94016..687b83948cd 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation { Its goal is to be an easy-to-use no-nonsense cross-platform project management application. - Planner is a GTK+ application written in C and licensed under the + Planner is a GTK application written in C and licensed under the GPLv2 or any later version. It can store its data in either xml files or in a postgresql database. Projects can also be printed to PDF or exported to HTML for easy viewing from any web browser. diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index ff273ab8e95..f36431beac1 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { description = "Real time satellite tracking and orbit prediction"; longDescription = '' Gpredict is a real time satellite tracking and orbit prediction program - written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio + written using the GTK widgets. Gpredict is targetted mainly towards ham radio operators but others interested in satellite tracking may find it useful as well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index a0917d03ce1..983a5153ee2 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -56,7 +56,7 @@ pythonPackages.buildPythonApplication rec { description = "A handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is - intentionally lightweight and simple, using only GTK+3. + intentionally lightweight and simple, using only GTK 3. You can configure it to your needs by using several command line options. ''; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index d1a9b64d711..47a82470137 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "Simple GTK+ frontend for the mpv video player"; + description = "Simple GTK frontend for the mpv video player"; longDescription = '' GNOME MPV interacts with mpv via the client API exported by libmpv, allowing access to mpv's powerful playback capabilities through an diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index aa2407134f3..a15a4cd5999 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { and containers. Very versatile and customizable. Package provides: CLI - `HandbrakeCLI` - GTK+ GUI - `ghb` + GTK GUI - `ghb` ''; license = licenses.gpl2; maintainers = with maintainers; [ Anton-Latukha wmertens ]; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 03fc1f5399a..3f0042c1362 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-debug" ]; meta = { - description = "GTK+3 application to edit video subtitles"; + description = "GTK 3 application to edit video subtitles"; longDescription = '' - Subtitle Editor is a GTK+3 tool to edit subtitles for GNU/Linux/*BSD. It + Subtitle Editor is a GTK 3 tool to edit subtitles for GNU/Linux/*BSD. It can be used for new subtitles or as a tool to transform, edit, correct and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index f276b573019..5a566bef6ef 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Elementary icons for Xfce and other GTK+ desktops like GNOME"; + description = "Elementary icons for Xfce and other GTK desktops like GNOME"; homepage = https://github.com/shimmerproject/elementary-xfce; license = licenses.gpl2; # darwin cannot deal with file names differing only in case diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix index 40190d65d5e..1cb7ac53432 100644 --- a/pkgs/data/themes/adementary/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; + description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; homepage = https://github.com/hrdwrrsk/adementary-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index d573603ce90..1c5a631a48c 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Grey and blue theme from the Shimmer Project for GTK+-based environments"; + description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = https://github.com/shimmerproject/Greybird; license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 platforms = platforms.linux; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 9e69d78933b..02c1b91a3eb 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Material Design theme for GNOME/GTK+ based desktop environments"; + description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index cf2eb5447f7..d026e06e39d 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Gtk+ theme based on Material Design Refresh"; + description = "A GTK theme based on Material Design Refresh"; homepage = https://gitlab.com/tista500/plata-theme; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index c774468852e..606ba93d3fc 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -45,10 +45,10 @@ in stdenv.mkDerivation rec { meta = { homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; + description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is + GTK, and a minimal sample application (vte) using that. Vte is mainly used in gnome-terminal, but can also be used to embed a console/terminal in games, editors, IDEs, etc. VTE supports Unicode and character set conversion, as well as emulating any terminal known to diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 369880c4fc1..27caaa70634 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; - description = "GtkGLExt, an OpenGL extension to GTK+"; - longDescription = - '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK - objects which support OpenGL rendering in GTK+ and GtkWidget API - add-ons to make GTK+ widgets OpenGL-capable. In contrast to Janne - Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables - OpenGL drawing for standard and custom GTK+ widgets. - ''; + description = "GtkGLExt, an OpenGL extension to GTK"; + longDescription = '' + GtkGLExt is an OpenGL extension to GTK. It provides additional GDK + objects which support OpenGL rendering in GTK and GtkWidget API + add-ons to make GTK widgets OpenGL-capable. In contrast to Janne + Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables + OpenGL drawing for standard and custom GTK widgets. + ''; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 92b38ed5eee..84d1a8a76ba 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; + description = "User interface designer for GTK applications"; maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 657bf4a7639..8e53a937a5e 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -58,7 +58,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"; + description = "GTK application to generate and let you play games of Hitori"; maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index 104ab20835f..0646078d825 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { with all xfce4 dependencies removed, some bugs fixed, and some improvement of UI. Although being part of LXDE, the Lightweight X11 Desktop Environment, it's totally desktop independent and only - requires pure gtk+. + requires pure GTK. ''; homepage = https://wiki.lxde.org/en/LXTask; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 7fba9610db0..521d22d2335 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "An extension to GTK+ used by elementary OS"; + description = "An extension to GTK used by elementary OS"; longDescription = '' - Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions + Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary OS. ''; homepage = https://github.com/elementary/granite; diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index bb319e6fc6c..567d3b80387 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.xfce.org/; - description = "GTK+ theme engine for Xfce"; + description = "GTK theme engine for Xfce"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index e5182a12d43..20d5175fed6 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -20,7 +20,7 @@ lib.makeScope pkgs.newScope (self: with self; { garcon = callPackage ./core/garcon.nix { }; - # When built with GTK+3, it was breaking GTK+3 app layout + # When built with GTK 3, it was breaking GTK 3 app layout gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; }; libxfce4ui = callPackage ./core/libxfce4ui.nix { }; @@ -151,7 +151,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; - #### GTK+3 (deprecated, see NixOS/nixpkgs#32763) + #### GTK3 (deprecated, see NixOS/nixpkgs#32763) libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index f67ba7af8aa..39393dd39e9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Port of the Unity GTK+ Module"; + description = "Port of the Unity GTK Module"; license = licenses.lgpl3; maintainers = with maintainers; [ jD91mZM2 ]; }; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 8fba9be4901..06c2aa838c5 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -162,7 +162,7 @@ let version = "4.8.5"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -341,7 +341,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 3ce5ea1f64c..ebcf20d4e09 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -170,7 +170,7 @@ let version = "4.9.4"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -354,7 +354,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e6115b10481..0adedb6f842 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -157,7 +157,7 @@ let version = "5.5.0"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -359,7 +359,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 7644f4d3f62..959b5e62381 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -156,7 +156,7 @@ let version = "6.5.0"; in -# We need all these X libraries when building AWT with GTK+. +# We need all these X libraries when building AWT with GTK. assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ @@ -366,7 +366,7 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor + # Note: When building the Java AWT GTK peer, the build system doesn't honor # `--with-gmp' et al., e.g., when building # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add # them to $CPATH and $LIBRARY_PATH in this case. diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 80ce29799a8..17f03f67cef 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { longDescription = '' GNU guile-gnome brings the power of Scheme to your graphical application. guile-gnome modules support the entire Gnome library stack: from Pango to - GnomeCanvas, Gtk+ to GStreamer, Glade to GtkSourceView, you will find in + GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in guile-gnome a comprehensive environment for developing modern applications. ''; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index cb22c9ee790..e8ecd0c0f1e 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Amtk; - description = "Actions, Menus and Toolbars Kit for GTK+ applications"; + description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = [ maintainers.manveru ]; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index a14c40e6d87..a18bdb17744 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A Glib/GTK+ set of document centric objects and utilities"; + description = "A Glib/GTK set of document centric objects and utilities"; longDescription = '' There are common operations for document centric applications that are diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index c7556276dc3..1440d3f6aa0 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; meta = with stdenv.lib; { - description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = https://wiki.gnome.org/Projects/GooCanvas; license = licenses.lgpl2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 435c1f30bac..024ac363af1 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 776125a7537..fd6b12ccaac 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "A spell-checking library for GTK+ applications"; + description = "A spell-checking library for GTK applications"; homepage = https://wiki.gnome.org/Projects/gspell; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 886f0aefafb..f1a53390467 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation rec { platforms = platforms.all; longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating + GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, + compatibility and an easy to use API. GTK it is written in C, but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed + such as C++, Python and C# among others. GTK is licensed under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or + proprietary software with GTK without any license fees or royalties. ''; }; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 40be17fcac7..aee97d9bad0 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -181,13 +181,13 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating + GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, + compatibility and an easy to use API. GTK it is written in C, but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed + such as C++, Python and C# among others. GTK is licensed under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or + proprietary software with GTK without any license fees or royalties. ''; homepage = https://www.gtk.org/; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 26d0b5c3595..daaf0399cbc 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Provides integration for Gtk+ applications into the Mac desktop"; + description = "Provides integration for GTK applications into the Mac desktop"; license = licenses.lgpl21; - homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Integration; + homepage = https://wiki.gnome.org/Projects/GTK/OSX/Integration; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 1e3b7d45edd..065dc2ac077 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + description = "Binds some API from GTK that isn't in GTK# 2.12.x"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d26cc969259..31a3242cdef 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { installFlags = "prefix=$(out)"; meta = with stdenv.lib; { - description = "D binding and OO wrapper for GTK+"; + description = "D binding and OO wrapper for GTK"; homepage = https://gtkd.org; license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 1caac3914a5..54054270c3c 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk2 ]; meta = { - description = "Gtk+ widget for displaying large amounts of numerical data"; + description = "GTK widget for displaying large amounts of numerical data"; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index d6d32c26a50..babcaa99334 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wiki.gnome.org/Projects/GTK%2B/GtkImageView"; - description = "Image viewer widget for GTK+"; + description = "Image viewer widget for GTK"; longDescription = - '' GtkImageView is a simple image viewer widget for GTK+. Similar to + '' GtkImageView is a simple image viewer widget for GTK. Similar to the image viewer panes in gThumb or Eye of Gnome. It makes writing image viewing and editing applications easy. Among its features are: mouse and keyboard zooming; scrolling and dragging; adjustable diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 69fd3f30e92..523c5b50d28 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "C++ interface to the GTK+ graphical user interface library"; + description = "C++ interface to the GTK graphical user interface library"; longDescription = '' gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a + GTK. Highlights include typesafe callbacks, and a comprehensive set of widgets that are easily extensible via inheritance. You can create user interfaces either in code or with the Glade User Interface designer, using libglademm. diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 1a5b0fe6287..f977af046ca 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "C++ interface to the GTK+ graphical user interface library"; + description = "C++ interface to the GTK graphical user interface library"; longDescription = '' gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a + GTK. Highlights include typesafe callbacks, and a comprehensive set of widgets that are easily extensible via inheritance. You can create user interfaces either in code or with the Glade User Interface designer, using libglademm. diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index f97f8b7d82d..16a21382d85 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "Indicator to take menus from applications and place them in the panel (GTK+ 2 library for Xfce/LXDE)"; + description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)"; homepage = https://launchpad.net/indicators-gtk2; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 1a0be52dbbe..519c94dd995 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { longDescription = '' libchamplain is a C library providing a ClutterActor to display - maps. It also provides a Gtk+ widget to display maps in Gtk+ + maps. It also provides a GTK widget to display maps in GTK applications. Python and Perl bindings are also available. It supports numerous free map sources such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free. diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index f7e0a987b06..5b6d92d629d 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library to delight your users with fancy features"; longDescription = '' - The libdazzle library is a companion library to GObject and Gtk+. It + The libdazzle library is a companion library to GObject and GTK. It provides various features that we wish were in the underlying library but cannot for various reasons. In most cases, they are wildly out of scope for those libraries. In other cases, our design isn't quite generic diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 4883b39b7cf..e5b6c4e068c 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A library full of GTK+ widgets for mobile phones"; + description = "A library full of GTK widgets for mobile phones"; homepage = https://source.puri.sm/Librem5/libhandy; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index be1daa0505a..d4ac3ae8dc9 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # disable tests as we don't need to depend on gtk+(2/3) + # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" "-Ddocbook_docs=disabled" "-Dgtk_doc=false" diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index 49cdb2c95ba..cb22d9f97bc 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig , glib, gtk2, libxml2, pango }: - + stdenv.mkDerivation { name = "libsexy-0.1.11"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ glib gtk2 libxml2 pango ]; meta = with stdenv.lib; { - description = "A collection of GTK+ widgets"; + description = "A collection of GTK widgets"; homepage = https://blog.chipx86.com/tag/libsexy/; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 9519e295213..f590653df6b 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Common build files of GLib/GTK+ C++ bindings"; + description = "Common build files of GLib/GTK C++ bindings"; longDescription = '' The mm-common module provides the build infrastructure and utilities shared among the GNOME C++ binding libraries. It is only a required diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 551c70cebcc..14483a12f7e 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Gtk+ widget for displaying OpenStreetMap tiles"; + description = "GTK widget for displaying OpenStreetMap tiles"; homepage = https://nzjrs.github.io/osm-gps-map; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index b67db91ef64..e57b192e40a 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -70,8 +70,8 @@ in stdenv.mkDerivation rec { Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. ''; homepage = https://www.pango.org/; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 064ebf71cc3..6cb2c070c94 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. ''; }; } diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index dd50e6ec039..123af4fa3fa 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { buildInputs = [ gtk2 ]; meta = with stdenv.lib; { - description = "Additional style plugins for Qt5, including BB10, GTK+, Cleanlooks, Motif, Plastique"; + description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique"; homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index a43700ce439..7530cc64bf5 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GTK+ bindings for librep"; + description = "GTK bindings for librep"; homepage = http://sawfish.wikia.com; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 8f92e0b64f6..7ba120d661b 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -117,9 +117,9 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A GTK+3 SPICE widget"; + description = "GTK 3 SPICE widget"; longDescription = '' - spice-gtk is a GTK+3 SPICE widget. It features glib-based + spice-gtk is a GTK 3 SPICE widget. It features glib-based objects for SPICE protocol parsing and a gtk widget for embedding the SPICE display into other applications such as virt-manager. Python bindings are available too. diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index f4e8c128ccb..e091f6a3917 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; + description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is + GTK, and a minimal sample application (vte) using that. Vte is mainly used in gnome-terminal, but can also be used to embed a console/terminal in games, editors, IDEs, etc. VTE supports Unicode and character set conversion, as well as emulating any terminal known to diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 273072e9323..35bc881d3d1 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; + description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is + GTK, and a minimal sample application (vte) using that. Vte is mainly used in gnome-terminal, but can also be used to embed a console/terminal in games, editors, IDEs, etc. VTE supports Unicode and character set conversion, as well as emulating any terminal known to diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 25868cdb886..060109072b4 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.4.11"; meta = with stdenv.lib; { - description = "Web content rendering engine, GTK+ port"; + description = "Web content rendering engine, GTK port"; homepage = http://webkitgtk.org/; license = licenses.bsd2; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 71b30960bac..d2ba7a03955 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.24.3"; meta = { - description = "Web content rendering engine, GTK+ port"; + description = "Web content rendering engine, GTK port"; homepage = https://webkitgtk.org/; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 55a4a02f7ff..581319a0edf 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { stdenv.lib.maintainers.roconnor ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; - description = "LablGTK is is an Objective Caml interface to gtk+"; + description = "LablGTK is is an Objective Caml interface to GTK"; license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 38ea45bc297..df6f4609a69 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { z77z roconnor vbgl ]; homepage = http://lablgtk.forge.ocamlcore.org/; - description = "An OCaml interface to gtk+"; + description = "An OCaml interface to GTK"; license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 8ba27248db6..d49208ede60 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cairo2 ]; meta = { - description = "OCaml interface to gtk+-3"; + description = "OCaml interface to GTK 3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index 77fae1d0981..a6a93f9ec95 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ../generic-setup-hook.sh; meta = { - description = "A collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure"; + description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure"; homepage = http://puredocs.bitbucket.org/pure-gtk.html; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index c729874846d..17dc8dea4f8 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; + description = "A small GTK app for keeping track of your time. It's main goal is to be as unintrusive as possible"; homepage = https://mg.pov.lt/gtimelog/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ocharles ]; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index c6f939d319a..09ccb5c3d95 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "GTK+-2 bindings"; + description = "GTK 2 Python bindings"; homepage = "https://gitlab.gnome.org/Archive/pygtk"; platforms = platforms.all; license = with licenses; [ lgpl21Plus ]; diff --git a/pkgs/development/python-modules/pywebkitgtk/default.nix b/pkgs/development/python-modules/pywebkitgtk/default.nix index 5448f5c6951..c76f1f47077 100644 --- a/pkgs/development/python-modules/pywebkitgtk/default.nix +++ b/pkgs/development/python-modules/pywebkitgtk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = "https://code.google.com/p/pywebkitgtk/"; - description = "Python bindings for the WebKit GTK+ port"; + description = "Python bindings for the WebKit GTK port"; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 44b5384106e..7792d14775c 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; + description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://www.gtk.org/gtk-doc"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index 27ca714b73a..02d5ad87dc4 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "a helper script that creates application bundles form GTK+ executables for macOS"; + description = "a helper script that creates application bundles form GTK executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; - homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling; + homepage = https://wiki.gnome.org/Projects/GTK/OSX/Bundling; license = licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 5280b69cdce..5b47ce0bc24 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./bench.patch ]; meta = with stdenv.lib; { - description = "Application designed to test GTK+ performance"; + description = "Application designed to test GTK performance"; homepage = http://gtkperf.sourceforge.net/; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 418d6440b69..da53b4f8c55 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ]; - # Work around build failures on recent GTK+. + # Work around build failures on recent GTK. # See http://ubuntuforums.org/showthread.php?p=10535837 NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index c3cfbaf23b3..c08b16a0a1d 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { curlOpts = "--user-agent 'Mozilla/5.0'"; }; - # Optionally, it can use GTK+. + # Optionally, it can use GTK. buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; # Don't try to install `xlock' setuid. Password authentication works diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 5fd8f1a594e..02812b1f939 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "An adaptive Gtk+ theme based on Material Design Guidelines"; + description = "An adaptive GTK theme based on Material Design Guidelines"; homepage = https://github.com/adapta-project/adapta-gtk-theme; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index 9cdefb9bb54..74f0a54ccef 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "An Enlightenment-like GTK+ theme with sharp corners"; + description = "An Enlightenment-like GTK theme with sharp corners"; homepage = https://github.com/tsujan/E17gtk; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix index 1a4241be865..f24524eb6b9 100644 --- a/pkgs/misc/themes/equilux-theme/default.nix +++ b/pkgs/misc/themes/equilux-theme/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = "A Material Design theme for GNOME/GTK+ based desktop environments"; + description = "A Material Design theme for GNOME/GTK based desktop environments"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix index 966190a5e76..2f56f6eb4c5 100644 --- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ intltool gtk2 ]; meta = { - description = "Theme engines for GTK+ 2"; + description = "Theme engines for GTK 2"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 496fa422877..1a6e99f0393 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { longDescription = '' In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities. - wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK+ theme made specifically for wpgtk and custom keywords and values to replace in templates. + wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK theme made specifically for wpgtk and custom keywords and values to replace in templates. INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. ''; diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index ff98e96655f..53da140b7fd 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - description = "A GTK+ front-end for command line archiving tools"; + description = "A GTK front-end for command line archiving tools"; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 07684155a7e..2a110c4cc83 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ]; meta = { - description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; + description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = https://github.com/ib/xarchiver; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 60c96ca78ce..8e393ac3f13 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = https://github.com/blueman-project/blueman; - description = "GTK+-based Bluetooth Manager"; + description = "GTK-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 5313b69933b..8dcaed706c1 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Lightweight GTK+ clipboard manager"; + description = "Lightweight GTK clipboard manager"; homepage = https://github.com/rickyrockrat/parcellite; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index d2a7f3f37ea..58a6c7c4071 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "A searchable command palette in every modern GTK+ application"; + description = "A searchable command palette in every modern GTK application"; homepage = https://github.com/p-e-w/plotinus; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index d8d4353f782..9431216e251 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 readline ncurses gettext openssl ]; - meta = { - description = "GTK+-based FTP client"; + meta = { + description = "GTK-based FTP client"; homepage = http://www.gftp.org; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index fe9a5695a4b..70e36cb7ec5 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A GTK+ Gnutella client, optimized for speed and scalability"; + description = "A GTK Gnutella client, optimized for speed and scalability"; homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 6b9d0bfa5dd..78dcb00eb78 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; meta = with stdenv.lib; { - description = "Download manager using gtk+ and libcurl"; + description = "Download manager using GTK and libcurl"; longDescription = '' uGet is a VERY Powerful download manager application with a large inventory of features but is still very light-weight and low on diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index ac6a50960ad..25e018de627 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; longDescription = '' - Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + Pinentry provides a console and (optional) GTK and Qt GUIs allowing users to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb9132731fc..afd86f8583c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7537,7 +7537,7 @@ let }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { - description = "Perl interface to the 3.x series of the gtk+ toolkit"; + description = "Perl interface to the 3.x series of the GTK toolkit"; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -19379,7 +19379,7 @@ let }; propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: - # Error: Unable to initialize GTK+, is DISPLAY set properly?" + # Error: Unable to initialize GTK, is DISPLAY set properly?" doCheck = false; buildInputs = [ ExtUtilsXSpp ]; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9ae5a9e1fbd..2068478872b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -102,7 +102,7 @@ let # Needed for support jobs.nix-info.x86_64-linux jobs.nix-info-tested.x86_64-linux - # Ensure that X11/GTK+ are in order. + # Ensure that X11/GTK are in order. jobs.thunderbird.x86_64-linux jobs.unar.x86_64-linux |