diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-08-24 16:21:08 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-08-24 22:31:37 +0200 |
commit | c9baba9212feb6e39151118647d45b34b029a6df (patch) | |
tree | 48dc0df228a071cc5639fe51bfce55d621a3a8f1 /pkgs/tools | |
parent | 2a6c7e2874a3ada9b1c544db61402e03091556db (diff) | |
download | nixlib-c9baba9212feb6e39151118647d45b34b029a6df.tar nixlib-c9baba9212feb6e39151118647d45b34b029a6df.tar.gz nixlib-c9baba9212feb6e39151118647d45b34b029a6df.tar.bz2 nixlib-c9baba9212feb6e39151118647d45b34b029a6df.tar.lz nixlib-c9baba9212feb6e39151118647d45b34b029a6df.tar.xz nixlib-c9baba9212feb6e39151118647d45b34b029a6df.tar.zst nixlib-c9baba9212feb6e39151118647d45b34b029a6df.zip |
Fix many package descriptions
(My OCD kicked in today...) Remove repeated package names, capitalize first word, remove trailing periods and move overlong descriptions to longDescription. I also simplified some descriptions as well, when they were particularly long or technical, often based on Arch Linux' package descriptions. I've tried to stay away from generated expressions (and I think I succeeded). Some specifics worth mentioning: * cron, has "Vixie Cron" in its description. The "Vixie" part is not mentioned anywhere else. I kept it in a parenthesis at the end of the description. * ctags description started with "Exuberant Ctags ...", and the "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis at the end of description. * nix has the description "The Nix Deployment System". Since that doesn't really say much what it is/does (especially after removing the package name!), I changed that to "Powerful package manager that makes package management reliable and reproducible" (borrowed from nixos.org). * Tons of "GNU Foo, Foo is a [the important bits]" descriptions is changed to just [the important bits]. If the package name doesn't contain GNU I don't think it's needed to say it in the description either.
Diffstat (limited to 'pkgs/tools')
61 files changed, 84 insertions, 65 deletions
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index d91f4bfdf652..e226f1f93c43 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ imlib2 libX11 libXext ]; meta = { - description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; + description = "Allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 3f691b8ecd45..2e23e7bd4de4 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tomas.styblo.name/wmctrl/; - description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 0e92021b62c9..35c4ca06c6c5 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Xnee, an X11 event recording and replay tool"; + description = "X11 event recording and replay tool"; longDescription = '' Xnee is a suite of programs that can record, replay and distribute diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index efc0647f5dbd..c3c9c70fe927 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; - description = "xtrace, a tool to trace X11 protocol connections"; + description = "Tool to trace X11 protocol connections"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index acb8708ec14f..407242cf2d9b 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; - description = "TightVNC is an improved version of VNC"; + description = "Improved version of VNC"; longDescription = '' TightVNC is an improved version of VNC, the great free diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index afd734fbae04..f19564e4ad91 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU Sharutils, tools for remote synchronization and `shell archives'"; + description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index b446b06f987c..fe2b9e00aaaf 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation { installPhase = ''make INSTPREFIX=$out install''; meta = { - description = "Partclone provides utilities to save and restore used blocks on a partition and is designed for higher compatibility of the file system by using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition"; + description = "Utilities to save and restore used blocks on a partition"; + longDescription = '' + Partclone provides utilities to save and restore used blocks on a + partition and is designed for higher compatibility of the file system by + using existing libraries, e.g. e2fslibs is used to read and write the + ext2 partition. + ''; homepage = http://partclone.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 88cca66efb13..218ea9a1e7ff 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux acl; meta = { - description = "GNU xorriso, an ISO 9660 Rock Ridge file system manipulator"; + description = "ISO 9660 Rock Ridge file system manipulator"; longDescription = '' GNU xorriso copies file objects from POSIX compliant filesystems diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b7bf9c59f494..cc304d9aa1e5 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gzip/; - description = "Gzip, the GNU zip compression program"; + description = "GNU zip compression program"; longDescription = ''gzip (GNU zip) is a popular data compression program written by diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ca8d356abb3e..4460ae6edf3e 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; - description = "The RZIP compression program"; + description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index d91525e348f7..f8c6942bad0e 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; + description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; homepage = "http://chunkfs.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 9ebab38984bc..ea96001a421b 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.arg0.net/encfs; - description = "EncFS provides an encrypted filesystem in user-space via FUSE"; + description = "Provides an encrypted filesystem in user-space via FUSE"; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 0b666f389420..6b9631bfccfe 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/mtools/; - description = "GNU mtools, utilities to access MS-DOS disks"; + description = "Utilities to access MS-DOS disks"; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; }; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index b6a296e6bc7b..fba066d0f4cb 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_LDFLAGS="-lsvn_client-1"; meta = { - description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; + description = "FUSE filesystem for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 68d978a2a554..a28d5394fc19 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec buildInputs = [fuse glib neon pkgconfig]; meta = { homepage = "http://noedler.de/projekte/wdfs/"; - description = "wdfs a user-space filesystem that allows to mount a webdav share"; + description = "User-space filesystem that allows to mount a webdav share"; }; } diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 2638594903ab..0e94571503c3 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -37,6 +37,6 @@ rec { name = "cuneiform-" + version; meta = { inherit version; - description = "Cuneiform OCR"; + description = "Multi-language OCR system"; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index ae0c4d197315..0f67de3c3ea1 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Plotutils, a powerful C/C++ library for exporting 2D vector graphics"; + description = "Powerful C/C++ library for exporting 2D vector graphics"; longDescription = '' The GNU plotutils package contains software for both programmers and diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 56e18227d661..0f8f82acaed0 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "GoAccess is an open source real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems."; + description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = http://goaccess.prosoftcorp.com; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 2b2f3aeaca3c..503beefa15af 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./nix-mapping.patch ]; meta = { - description = "GNU Idutils, a text searching utility"; + description = "Text searching utility"; longDescription = '' An "ID database" is a binary file containing a list of file diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 20830bad6bfa..6d03b09c588f 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { homepage = "http://www.spinnaker.de/lbdb/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - description = "The Little Brother's Database (lbdb)"; + description = "The Little Brother's Database"; }; } diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 28d9b4863d4b..6dba834e8be5 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor"; + description = "Interactive LDAP client for Unix terminals"; + longDescription = '' + ldapvi is an interactive LDAP client for Unix terminals. Using it, you + can update LDAP entries with a text editor. + ''; homepage = http://www.lichteblau.com/ldapvi/; license = licenses.gpl2; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 8ede3aa918b1..d731e856790d 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Minicom, a modem control and terminal emulation program"; + description = "Modem control and terminal emulation program"; homepage = http://alioth.debian.org/projects/minicom/; longDescription = diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index b7f7842680f6..b97d8f0b7199 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; meta = { - description = '' + description = "A terminal pager similar to 'more' and 'less'"; + longDescription = '' MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. Unlike other well-known paging programs most supports multiple windows and can scroll left and right. Why settle for less? diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index df360bb9804d..4b0332c75060 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Parallel, a shell tool for executing jobs in parallel"; + description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 108d4d5e0400..01b9f391a443 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "export PATH=\"${utillinux}/sbin:$PATH\""; meta = { - description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; + description = "Create, destroy, resize, check, and copy partitions"; longDescription = '' GNU Parted is an industrial-strength package for creating, destroying, diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 392fcbcc8ff9..0d379cd11d4a 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ncurses postgresql]; meta = { - description = "pg_top is 'top' for PostgreSQL"; + description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: <itemizedlist> diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index f2f5f37ebe44..4d6829e99a4c 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]); meta = { - description = "GNU Recutils, tools and libraries to access human-editable, text-based databases"; + description = "Tools and libraries to access human-editable, text-based databases"; longDescription = '' GNU Recutils is a set of tools and libraries to access diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 3a35e9a9f1cc..737ba244fe8e 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./max-resident.patch ]; meta = { - description = "GNU Time, a tool that runs programs and summarizes the system resources they use"; + description = "Tool that runs programs and summarizes the system resources they use"; longDescription = '' The `time' command runs another program, then displays diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index c19d58b98162..760f56726fab 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; - description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; + description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 4acbabb50f98..32f681dabebb 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tmux.sourceforge.net/; - description = "tmux is a terminal multiplexer"; + description = "Terminal multiplexer"; longDescription = '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index fcdf5095d70f..d884d48f5214 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://code.google.com/p/yad/"; - description = "Yad (yet another dialog) is a GUI dialog tool for shell scripts"; + description = "GUI dialog tool for shell scripts"; longDescription = '' Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a fork of Zenity with many improvements, such as custom buttons, additional diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index cd3ae12a11b8..f890bdddb693 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy"; + description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = http://cntlm.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index c99af220a56c..7d955b449506 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; meta = { - description = "The ConnMan project provides a daemon for managing internet connections"; + description = "Provides a daemon for managing internet connections"; homepage = "https://connman.net/"; maintainers = [ stdenv.lib.maintainers.matejc ]; # tested only on linux, might work on others also diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index f93221296125..ab8e14fddd0b 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "flvstreamer is an command-line RTMP client"; + description = "Command-line RTMP client"; longDescription = '' flvstreamer is an open source command-line RTMP client intended to diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index c74dbe528290..54cb8b21aafa 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -18,7 +18,7 @@ let version = "20000331"; in installTargets = "install man"; meta = { - description = "`host', a DNS resolution utility"; + description = "DNS resolution utility"; license = "BSD-style"; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 20ee6da8a30c..a6a921f6f588 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU Inetutils, a collection of common network programs"; + description = "Collection of common network programs"; longDescription = '' The GNU network utilities suite provides the diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 49753d189d63..cfeaf47fdf23 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preConfigure = '' autoconf ''; meta = { - description = "Jnettop, a network traffic visualizer"; + description = "Network traffic visualizer"; longDescription = '' Jnettop is a traffic visualiser, which captures traffic going diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 6be4119469ea..c86dba91f5e6 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; meta = { - description = "GNU lsh, a GPL'd implementation of the SSH protocol"; + description = "GPL'd implementation of the SSH protocol"; longDescription = '' lsh is a free implementation (in the GNU sense) of the ssh diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 4c1001310ae1..0ee490327042 100755 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GNU Mailutils is a rich and powerful protocol-independent mail framework"; + description = "Rich and powerful protocol-independent mail framework"; longDescription = '' GNU Mailutils is a rich and powerful protocol-independent mail diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 02013d8ede6d..9db42f09d81a 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; meta = { - description = "MiniDLNA Media Server"; + description = "Media server software"; longDescription = '' MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 2e27c2b2dc33..ed295e95a38b 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "tcpdump, a famous network sniffer"; + description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; maintainers = stdenv.lib.maintainers.mornfall; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 6ff5439c4bc6..27d7fe2572a0 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doCheck = (perl != null); meta = { - description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP"; + description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; longDescription = '' GNU Wget is a free software package for retrieving files using HTTP, diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b2e86935b50d..6631214f39ab 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -66,7 +66,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "The Nix Deployment System"; + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; homepage = http://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index fe2a19491d99..668a76051153 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - description = "The scrypt encryption utility"; + description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index bc87c091a58f..03e8c727022d 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -7,7 +7,7 @@ meta = with stdenv.lib; { homepage = http://steghide.sourceforge.net/; - description = "Steghide is a steganography program that is able to hide data in various kinds of image- and audio-files."; + description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; }; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 1c9967edc477..854f67f2aeec 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=$(out)"; meta = with stdenv.lib; { - description = ''Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses - Intel(R) Trusted Execution Technology (Intel(R) TXT) to perform a measured - and verified launch of an OS kernel/VMM.''; + description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = http://sourceforge.net/projects/tboot/; license = licenses.bsd3; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d71bbd891f91..3318d0c1102d 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.torproject.org/; repositories.git = https://git.torproject.org/git/tor; - description = "Tor, an anonymous network router to improve privacy on the Internet"; + description = "Anonymous network router to improve privacy on the Internet"; longDescription='' Tor protects you by bouncing your communications around a distributed diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 95b3b6b51f77..6e7ff75a6a48 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ trousers openssl ]; meta = with stdenv.lib; { - description = ''tpm-tools is an open-source package designed to enable user and application - enablement of Trusted Computing using a Trusted Platform Module (TPM), - similar to a smart card environment.''; + description = "Management tools for TPM hardware"; + longDescription = '' + tpm-tools is an open-source package designed to enable user and + application enablement of Trusted Computing using a Trusted Platform + Module (TPM), similar to a smart card environment. + ''; homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 4c2af359b964..fe797291f9ea 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; meta = with stdenv.lib; { - description = "TrouSerS is an CPL (Common Public License) licensed Trusted Computing Software Stack."; + description = "Trusted computing software stack"; homepage = http://trousers.sourceforge.net/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 6132abc08790..0cf29a67b9da 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; meta = { - description = "Vixie Cron, a daemon for running commands at specific times"; + description = "Daemon for running commands at specific times (Vixie Cron)"; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 21a67dba305c..48562adffebe 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU FreeIPMI, an implementation of the Intelligent Platform Management Interface"; + description = "Implementation of the Intelligent Platform Management Interface"; longDescription = '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 982aac3c9900..6ae92b685cc9 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/"; - description = "consolidate duplicate files via hardlinks"; + description = "Consolidate duplicate files via hardlinks"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 4bf958959961..842529c573f1 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU mcron, a flexible implementation of `cron' in Guile"; + description = "Flexible implementation of `cron' in Guile"; longDescription = '' The GNU package mcron (Mellor's cron) is a 100% compatible diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index fe11ec592463..797f5b8b6922 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Enscript, a converter from ASCII to PostScript, HTML, or RTF"; + description = "Converter from ASCII to PostScript, HTML, or RTF"; longDescription = '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 5b95c37c732d..c147b3ea301f 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mpage, many-to-one page printing utility"; + description = "Many-to-one page printing utility"; longDescription = '' Mpage reads plain text files or PostScript documents and prints diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index fba52b69fbaf..72caa7ba5cb4 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isLinux; meta = { - description = "Namazu, a full-text search engine"; + description = "Full-text search engine"; longDescription = '' Namazu is a full-text search engine intended for easy use. Not diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index e6fc3510cd40..c07caad15a35 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; - description = "GNU wdiff, comparing files on a word by word basis"; + description = "Comparing files on a word by word basis"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index c0fc43362971..a2ebfa0a9fd4 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; meta = { - description = "Lout, a document layout system similar in style to LaTeX"; + description = "Document layout system similar in style to LaTeX"; longDescription = '' The Lout document formatting system is now reads a high-level diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 8344735606ca..32545abaff2d 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchPhase = "substituteInPlace configure --replace which \"type -P\""; meta = { - description = "Rubber, a wrapper for LaTeX and friends"; + description = "Wrapper for LaTeX and friends"; longDescription = '' Rubber is a program whose purpose is to handle all tasks related diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 1b0602063e9e..a1eee51b34d5 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "xmlto, a front-end to an XSL toolchain"; + description = "Front-end to an XSL toolchain"; longDescription = '' xmlto is a front-end to an XSL toolchain. It chooses an diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index faaea6aaffc4..73986b5be05d 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "dvgrab, receive and store audio & video over IEEE1394"; + description = "Receive and store audio & video over IEEE1394"; longDescription = '' dvgrab receives audio and video data from a digital camcorder via an |