From e9c612cdfe9852a394fd3e68e6f88deacdd9903c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 13 Jun 2016 10:11:45 +0200 Subject: rr: fix build after gcc-5.4 bump Discussion: https://github.com/NixOS/nixpkgs/commit/772c92ba5c60a --- pkgs/development/tools/analysis/rr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/tools/analysis') diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 926aaeb94ccc..26d98ed866b2 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { sha256 = "03fl2wgbc1cilaw8hrhfqjsbpi05cid6k4cr3s2vmv5gx0dnrgy4"; }; - patchPhase = '' + postPatch = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + sed '7i#include "math.h"' -i src/Scheduler.cc patchShebangs . ''; -- cgit 1.4.1 From d133a168f082d2f4c94984190e836e55f5e389a7 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 13 Jun 2016 10:15:48 +0200 Subject: rr: improve the parent commit --- pkgs/development/tools/analysis/rr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/tools/analysis') diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 26d98ed866b2..84ab79879b41 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' - sed '7i#include "math.h"' -i src/Scheduler.cc + sed '7i#include ' -i src/Scheduler.cc patchShebangs . ''; -- cgit 1.4.1 From bd01fad0ed2c0e9f84db55989159f425e82884e6 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Mon, 20 Jun 2016 12:53:46 +0200 Subject: Captialize meta.description of all packages In line with the Nixpkgs manual. A mechanical change, done with this command: find pkgs -name "*.nix" | \ while read f; do \ sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \ done I manually skipped some: * Descriptions starting with an abbreviation, a user name or package name * Frequently generated expressions (haskell-packages.nix) --- pkgs/applications/audio/cd-discid/default.nix | 2 +- pkgs/applications/audio/csound/default.nix | 2 +- pkgs/applications/audio/qsampler/default.nix | 2 +- pkgs/applications/audio/rakarrack/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/seq24/default.nix | 2 +- pkgs/applications/audio/shntool/default.nix | 2 +- pkgs/applications/audio/xsynth-dssi/default.nix | 2 +- pkgs/applications/audio/yoshimi/default.nix | 2 +- .../editors/emacs-modes/logito/default.nix | 2 +- .../editors/emacs-modes/metaweblog/default.nix | 2 +- .../session-management-for-emacs/default.nix | 2 +- pkgs/applications/editors/lighttable/default.nix | 2 +- pkgs/applications/editors/ne/default.nix | 2 +- .../applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/xournal/default.nix | 2 +- pkgs/applications/misc/dmenu/wayland.nix | 2 +- pkgs/applications/misc/fetchmail/default.nix | 2 +- pkgs/applications/misc/goldendict/default.nix | 2 +- pkgs/applications/misc/gphoto2/default.nix | 2 +- pkgs/applications/misc/gxmessage/default.nix | 2 +- pkgs/applications/misc/jbidwatcher/default.nix | 2 +- pkgs/applications/misc/multisync/default.nix | 2 +- pkgs/applications/misc/openjump/default.nix | 2 +- pkgs/applications/misc/tasknc/default.nix | 2 +- pkgs/applications/misc/xpdf/default.nix | 2 +- .../networking/browsers/kwebkitpart/default.nix | 2 +- .../networking/cluster/hadoop/default.nix | 2 +- .../networking/instant-messengers/gale/default.nix | 2 +- pkgs/applications/networking/netperf/default.nix | 2 +- pkgs/applications/office/beancount/default.nix | 2 +- pkgs/applications/office/timetrap/default.nix | 2 +- pkgs/applications/science/logic/ltl2ba/default.nix | 2 +- pkgs/applications/science/math/msieve/default.nix | 2 +- pkgs/applications/science/math/pssp/default.nix | 2 +- .../science/robotics/qgroundcontrol/default.nix | 2 +- .../git-and-tools/git-crypt/default.nix | 2 +- .../git-and-tools/git-remote-hg/default.nix | 2 +- .../git-and-tools/git2cl/default.nix | 2 +- pkgs/applications/video/makemkv/default.nix | 2 +- pkgs/applications/video/xvidcap/default.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/bomber.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/bovo.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/granatier.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kajongg.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kapman.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/katomic.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kblackbox.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kblocks.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kbounce.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kbreakout.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kdiamond.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kfourinline.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kigo.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/killbots.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kiriki.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/klickety.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/klines.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kmines.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/knetwalk.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kolf.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kollision.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/konquest.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kpat.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kreversi.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kshisen.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/ksirk.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/ksquares.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/ksudoku.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/ktuberling.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/kubrick.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/lskat.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/palapeli.nix | 2 +- pkgs/desktops/kde-4.14/kdegames/picmi.nix | 2 +- .../kde-4.14/kdemultimedia/audiocd-kio.nix | 2 +- pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix | 2 +- .../kde-4.14/kdemultimedia/ffmpegthumbs.nix | 2 +- pkgs/desktops/kde-4.14/kdemultimedia/juk.nix | 2 +- pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix | 2 +- pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix | 2 +- .../kde-4.14/kdemultimedia/mplayerthumbs.nix | 2 +- pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix | 2 +- .../pantheon/apps/pantheon-terminal/default.nix | 2 +- .../compilers/elm/packages/elm-repl.nix | 2 +- .../compilers/emscripten-fastcomp/default.nix | 2 +- pkgs/development/compilers/manticore/default.nix | 2 +- pkgs/development/haskell-modules/ghcjs/stage2.nix | 2 +- pkgs/development/interpreters/luajit/default.nix | 2 +- .../interpreters/python/2.6/default.nix | 2 +- .../interpreters/python/2.7/default.nix | 2 +- .../libraries/audio/zita-resampler/default.nix | 2 +- pkgs/development/libraries/buddy/default.nix | 2 +- pkgs/development/libraries/capstone/default.nix | 2 +- pkgs/development/libraries/cyrus-sasl/default.nix | 2 +- pkgs/development/libraries/frame/default.nix | 2 +- pkgs/development/libraries/ftgl/2.1.2.nix | 2 +- pkgs/development/libraries/ftgl/default.nix | 2 +- pkgs/development/libraries/git2/0.21.nix | 2 +- pkgs/development/libraries/git2/default.nix | 2 +- pkgs/development/libraries/idnkit/default.nix | 2 +- pkgs/development/libraries/jbigkit/default.nix | 2 +- .../libraries/kinetic-cpp-client/default.nix | 2 +- .../development/libraries/kyotocabinet/default.nix | 2 +- pkgs/development/libraries/ldb/default.nix | 2 +- pkgs/development/libraries/libasyncns/default.nix | 2 +- pkgs/development/libraries/libconfig/default.nix | 2 +- pkgs/development/libraries/libdwg/default.nix | 2 +- pkgs/development/libraries/libestr/default.nix | 2 +- pkgs/development/libraries/libical/default.nix | 2 +- pkgs/development/libraries/liblo/default.nix | 2 +- pkgs/development/libraries/liblognorm/default.nix | 2 +- pkgs/development/libraries/libmnl/default.nix | 2 +- .../libraries/libnetfilter_queue/default.nix | 2 +- .../libraries/libomxil-bellagio/default.nix | 2 +- pkgs/development/libraries/libqb/default.nix | 2 +- pkgs/development/libraries/librelp/default.nix | 2 +- pkgs/development/libraries/libseccomp/default.nix | 2 +- pkgs/development/libraries/libstatgrab/default.nix | 2 +- pkgs/development/libraries/libstroke/default.nix | 2 +- pkgs/development/libraries/libwacom/default.nix | 2 +- pkgs/development/libraries/libykneomgr/default.nix | 2 +- pkgs/development/libraries/log4cplus/default.nix | 2 +- .../libraries/mediastreamer/default.nix | 2 +- pkgs/development/libraries/minixml/default.nix | 2 +- pkgs/development/libraries/poker-eval/default.nix | 2 +- pkgs/development/libraries/popt/default.nix | 2 +- .../libraries/resolv_wrapper/default.nix | 2 +- .../libraries/socket_wrapper/default.nix | 2 +- pkgs/development/libraries/speex/default.nix | 2 +- pkgs/development/libraries/speexdsp/default.nix | 2 +- pkgs/development/libraries/uid_wrapper/default.nix | 2 +- .../libraries/webrtc-audio-processing/default.nix | 2 +- pkgs/development/libraries/x264/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 2 +- .../mobile/titaniumenv/cli/registry.nix | 20 +++--- pkgs/development/ocaml-modules/http/default.nix | 2 +- pkgs/development/ocaml-modules/zarith/default.nix | 2 +- pkgs/development/pure-modules/gplot/default.nix | 2 +- .../python-modules/matplotlib/default.nix | 2 +- pkgs/development/tools/analysis/kcov/default.nix | 2 +- pkgs/development/tools/gnulib/default.nix | 2 +- pkgs/development/tools/misc/distcc/default.nix | 2 +- .../development/tools/misc/usb-modeswitch/data.nix | 2 +- .../tools/misc/usb-modeswitch/default.nix | 2 +- pkgs/development/tools/misc/xxdiff/default.nix | 2 +- pkgs/development/tools/neoload/default.nix | 2 +- pkgs/development/web/csslint/default.nix | 2 +- pkgs/games/planetaryannihilation/default.nix | 2 +- pkgs/games/zandronum/bin.nix | 2 +- pkgs/games/zangband/default.nix | 2 +- pkgs/misc/emulators/snes9x-gtk/default.nix | 2 +- pkgs/misc/gnuk/generic.nix | 2 +- pkgs/misc/screensavers/light-locker/default.nix | 2 +- pkgs/os-specific/linux/cgmanager/default.nix | 2 +- pkgs/os-specific/linux/fswebcam/default.nix | 2 +- pkgs/os-specific/linux/fusionio/vsl.nix | 2 +- pkgs/os-specific/linux/libsmbios/default.nix | 2 +- pkgs/os-specific/linux/lockdep/default.nix | 2 +- pkgs/os-specific/linux/lxc/default.nix | 2 +- pkgs/os-specific/linux/nftables/default.nix | 2 +- pkgs/os-specific/linux/trace-cmd/default.nix | 2 +- pkgs/servers/http/micro-httpd/default.nix | 2 +- pkgs/servers/http/mini-httpd/default.nix | 2 +- pkgs/servers/ldap/389/default.nix | 2 +- pkgs/servers/mail/petidomo/default.nix | 2 +- pkgs/servers/mail/postfix/pfixtools.nix | 2 +- pkgs/servers/mail/rspamd/default.nix | 2 +- pkgs/servers/nosql/mongodb/default.nix | 2 +- pkgs/servers/nosql/neo4j/default.nix | 2 +- pkgs/servers/squid/default.nix | 2 +- pkgs/tools/X11/xvkbd/default.nix | 2 +- pkgs/tools/backup/partimage/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 2 +- pkgs/tools/cd-dvd/bashburn/default.nix | 2 +- pkgs/tools/compression/bzip2/default.nix | 2 +- pkgs/tools/compression/lbzip2/default.nix | 2 +- pkgs/tools/compression/lzip/default.nix | 2 +- pkgs/tools/filesystems/davfs2/default.nix | 2 +- pkgs/tools/filesystems/extundelete/default.nix | 2 +- pkgs/tools/filesystems/grive/default.nix | 2 +- pkgs/tools/filesystems/zerofree/default.nix | 2 +- pkgs/tools/graphics/bins/default.nix | 2 +- pkgs/tools/graphics/editres/default.nix | 2 +- pkgs/tools/misc/aescrypt/default.nix | 2 +- pkgs/tools/misc/apt-offline/default.nix | 2 +- pkgs/tools/misc/direnv/default.nix | 2 +- pkgs/tools/misc/proxytunnel/default.nix | 2 +- pkgs/tools/misc/rockbox-utility/default.nix | 2 +- .../misc/yubikey-personalization-gui/default.nix | 2 +- .../tools/misc/yubikey-personalization/default.nix | 2 +- pkgs/tools/networking/keepalived/default.nix | 2 +- pkgs/tools/networking/mpack/default.nix | 2 +- pkgs/tools/networking/nbd/default.nix | 2 +- pkgs/tools/networking/ratools/default.nix | 2 +- pkgs/tools/networking/spiped/default.nix | 2 +- pkgs/tools/networking/stunnel/default.nix | 2 +- pkgs/tools/networking/vpnc/default.nix | 2 +- pkgs/tools/security/gnupg/1.nix | 2 +- pkgs/tools/security/gnupg/20.nix | 2 +- pkgs/tools/security/gnupg/21.nix | 2 +- pkgs/tools/security/stricat/default.nix | 2 +- pkgs/tools/security/vidalia/default.nix | 2 +- pkgs/tools/security/volatility/default.nix | 2 +- pkgs/tools/system/dcfldd/default.nix | 2 +- pkgs/tools/system/dfc/default.nix | 2 +- pkgs/tools/system/s6-rc/default.nix | 2 +- pkgs/tools/system/safecopy/default.nix | 2 +- pkgs/tools/system/tm/default.nix | 2 +- pkgs/tools/system/tree/default.nix | 2 +- pkgs/tools/system/ts/default.nix | 2 +- pkgs/tools/text/gist/default.nix | 2 +- pkgs/tools/text/qprint/default.nix | 2 +- pkgs/tools/typesetting/pdfgrep/default.nix | 2 +- pkgs/tools/typesetting/tex/tex4ht/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +- .../typesetting/tex/texlive/moderntimeline.nix | 2 +- pkgs/tools/virtualization/cloud-init/default.nix | 2 +- pkgs/top-level/emacs-packages.nix | 2 +- pkgs/top-level/lua-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 84 +++++++++++----------- 227 files changed, 277 insertions(+), 277 deletions(-) (limited to 'pkgs/development/tools/analysis') diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 7e0c245d3579..5286362b50f5 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; - description = "command-line utility to get CDDB discid information from a CD-ROM disc"; + description = "Command-line utility to get CDDB discid information from a CD-ROM disc"; longDescription = '' cd-discid is a backend utility to get CDDB discid information diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index afca63a2a8a2..664d80490f2a 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; meta = { - description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; + description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = http://www.csounds.com/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index b851517b8724..692938884b63 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.linuxsampler.org; - description = "graphical frontend to LinuxSampler"; + description = "Graphical frontend to LinuxSampler"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index b746cccd113d..37815412fc35 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libpng libsamplerate libsndfile zlib ]; meta = with stdenv.lib; { - description = "multi-effects processor emulating a guitar effects pedalboard"; + description = "Multi-effects processor emulating a guitar effects pedalboard"; homepage = http://rakarrack.sourceforge.net; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 7b4c1143fb4c..91e8f1be6ece 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "modern tracker-based DAW"; + description = "Modern tracker-based DAW"; homepage = http://www.renoise.com/; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 7976a7bf6789..d1de6f1abd49 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - description = "minimal loop based midi sequencer"; + description = "Minimal loop based midi sequencer"; homepage = "http://www.filter24.org/seq24"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index 12ef79d746ec..8645251b384d 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac ]; meta = { - description = "multi-purpose WAVE data processing and reporting utility"; + description = "Multi-purpose WAVE data processing and reporting utility"; homepage = http://www.etree.org/shnutils/shntool/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index c4ed20defd68..96da8ad8c557 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "classic-analog (VCOs-VCF-VCA) style software synthesizer"; + description = "Classic-analog (VCOs-VCF-VCA) style software synthesizer"; longDescription = '' Xsynth-DSSI is a classic-analog (VCOs-VCF-VCA) style software synthesizer which operates as a plugin for the DSSI Soft Synth diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index ab7eb10798d7..0ec399407758 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; meta = with stdenv.lib; { - description = "high quality software synthesizer based on ZynAddSubFX"; + description = "High quality software synthesizer based on ZynAddSubFX"; longDescription = '' Yoshimi delivers the same synthesizer capabilities as ZynAddSubFX along with very good Jack and Alsa midi/audio diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix index a47f04472ec7..c324e395fa9e 100644 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "tiny logging framework for Emacs"; + description = "Tiny logging framework for Emacs"; homepage = https://github.com/sigma/logito; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix index 77bfedf62748..a5633cdfabaa 100644 --- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "an emacs library to access metaweblog based weblogs"; + description = "An emacs library to access metaweblog based weblogs"; homepage = https://github.com/punchagan/metaweblog; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index 0d2fcf097863..f5aeb35d1840 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (require 'session) (add-hook 'after-init-hook 'session-initialize) */ - description = "small session management for emacs"; + description = "Small session management for emacs"; homepage = http://emacs-session.sourceforge.net/; license = "GPL"; }; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 9b87f13d623d..108b7cceb4e2 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "the next generation code editor"; + description = "The next generation code editor"; homepage = http://www.lighttable.com/; license = licenses.gpl3; maintainers = [ maintainers.matejc ]; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 4e8324894abf..169e078edbd6 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "the nice editor"; + description = "The nice editor"; homepage = https://github.com/vigna/ne; longDescription = '' ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 4084018d1d53..74abc06bc4e3 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -174,7 +174,7 @@ rec { installPhase = "installPlugins gmic_gimp"; meta = { - description = "script language for image processing which comes with its open-source interpreter"; + description = "Script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.eu/gimp.shtml; license = stdenv.lib.licenses.cecill20; /* diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index f614eb0a1b5a..56d46088669d 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xournal.sourceforge.net/; - description = "note-taking application (supposes stylus)"; + description = "Note-taking application (supposes stylus)"; maintainers = [ stdenv.lib.maintainers.guibert ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index d55e22c5a3b8..9a13da677456 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "a generic, highly customizable, and efficient menu for the X Window System"; + description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = http://tools.suckless.org/dmenu; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 4cec2ca41b67..88475dd761e1 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.fetchmail.info/"; - description = "a full-featured remote-mail retrieval and forwarding utility"; + description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 36840c656d34..facbe50662c8 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goldendict.org/; - description = "a feature-rich dictionary lookup program"; + description = "A feature-rich dictionary lookup program"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.astsmtl ]; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 4c0e091bf653..742bdaad9966 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; meta = { - description = "a ready to use set of digital camera software applications"; + description = "A ready to use set of digital camera software applications"; longDescription = '' A set of command line utilities for manipulating over 1400 different diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index ce8109717d44..08ae34f97055 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ]; meta = { - description = "a GTK enabled dropin replacement for xmessage"; + description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [jfb]; diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index e4b362ec25d4..d26ad94648aa 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.jbidwatcher.com/"; - description = "monitor and snipe Ebay auctions"; + description = "Monitor and snipe Ebay auctions"; license = "LGPL"; longDescription = '' diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix index 8fd043539698..fc55b275dd0a 100644 --- a/pkgs/applications/misc/multisync/default.nix +++ b/pkgs/applications/misc/multisync/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; # install.sh is not contained in the tar meta = { - description = "modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc"; + description = "Modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc"; }; } diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 8a68bd7ccfb9..fdc4cd5b6d93 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [unzip]; meta = { - description = "open source Geographic Information System (GIS) written in the Java programming language"; + description = "Open source Geographic Information System (GIS) written in the Java programming language"; homepage = http://www.openjump.org/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index f7460618d964..85e6c07d670a 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/mjheagle8/tasknc"; - description = "a ncurses wrapper around taskwarrior"; + description = "A ncurses wrapper around taskwarrior"; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; # Cannot test others }; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index f11d5e6d7009..a7d288162e39 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.foolabs.com/xpdf/"; - description = "viewer for Portable Document Format (PDF) files"; + description = "Viewer for Portable Document Format (PDF) files"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index 56147883f4be..1cbffdd25446 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - description = "a WebKit KPart for Konqueror, Akregator and other KDE applications"; + description = "A WebKit KPart for Konqueror, Akregator and other KDE applications"; homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart; }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 96d263a525e2..925fe19d72ec 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hadoop.apache.org/"; - description = "framework for distributed processing of large data sets across clusters of computers"; + description = "Framework for distributed processing of large data sets across clusters of computers"; license = stdenv.lib.licenses.asl20; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix index 65f6cab6e81c..21f2afdde68b 100644 --- a/pkgs/applications/networking/instant-messengers/gale/default.nix +++ b/pkgs/applications/networking/instant-messengers/gale/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://gale.org/"; - description = "chat/messaging system (server and client)"; + description = "Chat/messaging system (server and client)"; platforms = platforms.all; license = licenses.gpl2Plus; }; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 40aa32636297..9bad7a8b42a3 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "benchmark to measure the performance of many different types of networking"; + description = "Benchmark to measure the performance of many different types of networking"; homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 4114fbffa392..77fcb8ce7e91 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = http://furius.ca/beancount/; - description = "double-entry bookkeeping computer language"; + description = "Double-entry bookkeeping computer language"; longDescription = '' A double-entry bookkeeping computer language that lets you define financial transaction records in a text file, read them in memory, diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 71d0f923dbdc..f6a408d03842 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -9,7 +9,7 @@ bundlerEnv { gemset = ./gemset.nix; meta = { - description = "a simple command line time tracker written in ruby"; + description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; license = lib.licenses.mit; }; diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index f9bdd9a6b3b9..59c6461f5b6c 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "fast translation from LTL formulae to Buchi automata"; + description = "Fast translation from LTL formulae to Buchi automata"; homepage = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index c8b388a06b78..5a6d3dd54043 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { cp msieve $out/bin/''; meta = { - description = "a C library implementing a suite of algorithms to factor large integers"; + description = "A C library implementing a suite of algorithms to factor large integers"; license = stdenv.lib.licenses.publicDomain; homepage = http://msieve.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 4a126797d697..6ced805b3115 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/pspp/"; - description = "a free replacement for SPSS, a program for statistical analysis of sampled data"; + description = "A free replacement for SPSS, a program for statistical analysis of sampled data"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index b67da5b55162..1e33a1be8567 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "provides full ground station support and configuration for the PX4 and APM Flight Stacks"; + description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = http://qgroundcontrol.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 8e537c32313c..5ce665dda0f0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.agwa.name/projects/git-crypt"; - description = "transparent file encryption in git"; + description = "Transparent file encryption in git"; longDescription = '' git-crypt enables transparent encryption and decryption of files in a git repository. Files which you choose to protect are encrypted when diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 86a11d04ed7d..e90fc9ad2580 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/felipec/git-remote-hg"; - description = "semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; + description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; license = licenses.gpl2; maintainers = [ maintainers.garbas ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 1e372c928f88..ade9ac1312a7 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = "http://josefsson.org/git2cl/"; - description = "convert git logs to GNU style ChangeLog files"; + description = "Convert git logs to GNU style ChangeLog files"; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 46b5712ca9a4..6a13bcc015a9 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { - description = "convert blu-ray and dvd to mkv"; + description = "Convert blu-ray and dvd to mkv"; longDescription = '' makemkv is a one-click QT application that transcodes an encrypted blu-ray or DVD disc into a more portable set of mkv files, preserving diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index ade840dc0218..527d31004b01 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; meta = with stdenv.lib; { - description = "screencast video catpuring tool"; + description = "Screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix index 026227910f21..542ff24f5e65 100644 --- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix +++ b/pkgs/desktops/kde-4.14/kdegames/bomber.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height"; + description = "A single player arcade game. The player is invading various cities in a plane that is decreasing in height"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix index b0e7d99c589f..89dff46129b6 100644 --- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix +++ b/pkgs/desktops/kde-4.14/kdegames/bovo.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; + description = "A Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix index 9f1ab0053099..50c3bf985b5b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix +++ b/pkgs/desktops/kde-4.14/kdegames/granatier.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; + description = "A clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix index 9a6f5e836955..cea4fb38b4fb 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix @@ -8,6 +8,6 @@ kde rec { postInstall = "wrapPythonPrograms"; meta = { - description = "an ancient Chinese board game for 4 players"; + description = "An ancient Chinese board game for 4 players"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix index f10e099da3cc..616533911ff8 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kapman.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a clone of the well known game Pac-Man"; + description = "A clone of the well known game Pac-Man"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix index a9936c04f0ea..3f7c1343289a 100644 --- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix +++ b/pkgs/desktops/kde-4.14/kdegames/katomic.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a fun and educational puzzle game built around molecular geometry"; + description = "A fun and educational puzzle game built around molecular geometry"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix index 27eeff2f65bb..1e20cf0051ea 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; + description = "A game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix index 98cf068de09a..08e8c62d2629 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a classic single player falling blocks puzzle game"; + description = "A classic single player falling blocks puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix index 77fa0db63529..291e4c65a43a 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player arcade game with the elements of puzzle"; + description = "A single player arcade game with the elements of puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix index 3a484d919bbb..4c5b2f62852f 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; + description = "A Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix index 06dfcee5ac39..b21a945a64b9 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds"; + description = "A single player puzzle game. The object of the game is to build lines of three similar diamonds"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix index 11b8838e7082..6504d069660b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a board game for two players based on the Connect-Four game"; + description = "A board game for two players based on the Connect-Four game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix index 6217c47a8065..86aff7e77ace 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; + description = "An action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix index 32eee67cc1e0..e417e89a0078 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kigo.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an open-source implementation of the popular Go game"; + description = "An open-source implementation of the popular Go game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix index d9c1472495e7..9d8b307be756 100644 --- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix +++ b/pkgs/desktops/kde-4.14/kdegames/killbots.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple game of evading killer robots"; + description = "A simple game of evading killer robots"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix index 72f7ab67501b..433991abd75b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "an addictive and fun dice game, designed to be played by as many as six players"; + description = "An addictive and fun dice game, designed to be played by as many as six players"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix index a6d22cff51c3..888dba71b662 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple dice driven tactical game"; + description = "A simple dice driven tactical game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix index b592bc40641f..87415f9a4f81 100644 --- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix +++ b/pkgs/desktops/kde-4.14/kdegames/klickety.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a puzzle game where the player removes groups of colored marbles to clear the board"; + description = "A puzzle game where the player removes groups of colored marbles to clear the board"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix index 90952fe91c07..e5c32d3fa9ab 100644 --- a/pkgs/desktops/kde-4.14/kdegames/klines.nix +++ b/pkgs/desktops/kde-4.14/kdegames/klines.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; + description = "A simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix index 946b531ff127..6aca3c229946 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames libkmahjongg ]; meta = { - description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; + description = "The tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix index 538454e95984..c02a61506d75 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kmines.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a classic Minesweeper game"; + description = "A classic Minesweeper game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix index 42ffd2fcb4d5..aed9b48511ac 100644 --- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix +++ b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a Battle Ship game"; + description = "A Battle Ship game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix index a16e578ce848..d7a80f133168 100644 --- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix +++ b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; + description = "A small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix index 78815ee57996..67a75cb9a36f 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kolf.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a miniature golf game"; + description = "A miniature golf game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix index 3147c7305ea0..b0911d093ddd 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kollision.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple ball dodging game"; + description = "A simple ball dodging game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix index 53ddd64928cc..974730a46d0b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix +++ b/pkgs/desktops/kde-4.14/kdegames/konquest.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "the KDE version of Gnu-Lactic Konquest"; + description = "The KDE version of Gnu-Lactic Konquest"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix index b60afa786d17..f33ddfb8570c 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix @@ -3,6 +3,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; nativeBuildInputs = [ shared_mime_info ]; meta = { - description = "a relaxing card sorting game"; + description = "A relaxing card sorting game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix index 2aed981428e1..065ee4bb657c 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; + description = "A simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix index 9c8880340388..085b91584c70 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames libkmahjongg ]; meta = { - description = "a solitaire-like game played using the standard set of Mahjong tiles"; + description = "A solitaire-like game played using the standard set of Mahjong tiles"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix index 767eb67971a8..bfdd8f358dd1 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames qca2 ]; meta = { - description = "a computerized version of the well known strategic board game Risk"; + description = "A computerized version of the well known strategic board game Risk"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix index ccf1fb551e9a..ce5e75336c97 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple Tron-Clone"; + description = "A simple Tron-Clone"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix index 5285f7916cad..692eb1c085af 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; + description = "Each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix index a17be2da6325..7cad6bf0e5ae 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game modeled after the well known pen and paper based game of Dots and Boxes"; + description = "A game modeled after the well known pen and paper based game of Dots and Boxes"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix index ea4e13a5e4f3..72a6a72b66d5 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a logic-based symbol placement puzzle"; + description = "A logic-based symbol placement puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix index 1a6ba9d653c2..a4480864fd8b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix +++ b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a simple constructor game suitable for children and adults alike"; + description = "A simple constructor game suitable for children and adults alike"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix index 9bdc6879db4b..f80cf4a8b356 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a game based on the Rubik's Cube™ puzzle"; + description = "A game based on the Rubik's Cube™ puzzle"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix index 383b347dc330..d7687c1435f7 100644 --- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix +++ b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a library for KMahjongg game"; + description = "A library for KMahjongg game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix index 2a5050cd6676..d3e8268784bb 100644 --- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/lskat.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; + description = "A fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix index ddecc78c75bc..a73fcf100eb7 100644 --- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix +++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix @@ -8,6 +8,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single-player jigsaw puzzle game"; + description = "A single-player jigsaw puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix index 165d7422f95b..77dcdcf48dce 100644 --- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix +++ b/pkgs/desktops/kde-4.14/kdegames/picmi.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkdegames ]; meta = { - description = "a single player logic-based puzzle game"; + description = "A single player logic-based puzzle game"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix index 4c56e7529dd7..20e63baf723f 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; meta = { - description = "transparent audio CD access for applications using the KDE Platform"; + description = "Transparent audio CD access for applications using the KDE Platform"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix index 006300742ecd..bb44c3b7234e 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ]; meta = { - description = "a multimedia player with the focus on simplicity"; + description = "A multimedia player with the focus on simplicity"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix index 45f6c9abcb66..2311b1dda589 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ffmpeg ]; meta = { - description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror"; + description = "A video thumbnail generator for KDE file managers like Dolphin and Konqueror"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix index 93365b194b2e..1bf5584de2fa 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix @@ -5,6 +5,6 @@ kde { buildInputs = [ kdelibs taglib_1_9 libtunepimp ]; meta = { - description = "an audio jukebox application"; + description = "An audio jukebox application"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix index 8d8bc84e16ef..4d36aaf4f68a 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs libcanberra libpulseaudio ]; meta = { - description = "sound mixer, an application to allow you to change the volume of your sound card"; + description = "Sound mixer, an application to allow you to change the volume of your sound card"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix index 720b01d1861e..66b0cfe869f6 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix @@ -3,6 +3,6 @@ kde { #todo: libmusicbrainz5 buildInputs = [ kdelibs ]; meta = { - description = "a library used to retrieve audio CD meta data from the internet"; + description = "A library used to retrieve audio CD meta data from the internet"; }; } diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix index c88ebcc2a5a3..c34b849f4c92 100644 --- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix +++ b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix @@ -2,6 +2,6 @@ kde { buildInputs = [ kdelibs ]; meta = { - description = "a video thumbnail generator for KDE"; + description = "A video thumbnail generator for KDE"; }; } diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix index 5c357cede8e9..5d4f83e26562 100644 --- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix +++ b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix @@ -6,6 +6,6 @@ kde { preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}"; meta = { - description = "various KDE development utilities"; + description = "Various KDE development utilities"; }; } diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 7d5447ae52ab..bb04df6134d4 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { vte_290 libgee gsettings_desktop_schemas defaultIconTheme ]; meta = { - description = "elementary OS's terminal"; + description = "Elementary OS's terminal"; longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; homepage = https://launchpad.net/pantheon-terminal; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix index 030378e1811b..3b17722b91d8 100644 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ b/pkgs/development/compilers/elm/packages/elm-repl.nix @@ -24,6 +24,6 @@ mkDerivation { ]; jailbreak = true; homepage = "https://github.com/elm-lang/elm-repl"; - description = "a REPL for Elm"; + description = "A REPL for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 9c540b0c10eb..5403c29baab4 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/kripken/emscripten-fastcomp; - description = "emscripten llvm"; + description = "Emscripten llvm"; platforms = platforms.all; maintainers = with maintainers; [ qknight matthewbauer ]; license = stdenv.lib.licenses.ncsa; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 983f86531dc9..7e8312549da9 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { inherit stdenv coreutils autoconf automake smlnj; meta = { - description = "a parallel, pure variant of Standard ML"; + description = "A parallel, pure variant of Standard ML"; longDescription = '' Manticore is a high-level parallel programming language aimed at diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix index 4b31e77ca7bd..aca4c6c7828f 100644 --- a/pkgs/development/haskell-modules/ghcjs/stage2.nix +++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix @@ -312,7 +312,7 @@ ]; jailbreak = true; homepage = "http://github.com/ghcjs/ghcjs-base"; - description = "base library for GHCJS"; + description = "Base library for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; Cabal = callPackage diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 23ea2fd65528..adf743848d19 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "high-performance JIT compiler for Lua 5.1"; + description = "High-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 726e2aa6aca1..48712cc21b98 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -109,7 +109,7 @@ let meta = { homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; + description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index a72377a47708..3538f901d460 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -162,7 +162,7 @@ let meta = { homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; + description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 8c7e82557ab5..3f3627b6b238 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "resample library by Fons Adriaensen"; + description = "Resample library by Fons Adriaensen"; version = "${version}"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 8b40260ddf39..12670ab711ae 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://sourceforge.net/projects/buddy/"; - description = "binary decision diagram package"; + description = "Binary decision diagram package"; license = "as-is"; platforms = with stdenv.lib.platforms; allBut cygwin; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index a72532ee35bc..76069e72b0d6 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuild = true; meta = { - description = "advanced disassembly library"; + description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 366e5f613a97..9573358a22f5 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cyrusimap.web.cmu.edu/"; - description = "library for adding authentication support to connection-based protocols"; + description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index fa8e9f0ef2c9..26357b440498 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://launchpad.net/frame"; - description = "handles the buildup and synchronization of a set of simultaneous touches"; + description = "Handles the buildup and synchronization of a set of simultaneous touches"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix index c83173450b19..0a4a6e6b9b00 100644 --- a/pkgs/development/libraries/ftgl/2.1.2.nix +++ b/pkgs/development/libraries/ftgl/2.1.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; - description = "font rendering library for OpenGL applications"; + description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index ce750fc1696f..8fc69ec75685 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; - description = "font rendering library for OpenGL applications"; + description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/git2/0.21.nix b/pkgs/development/libraries/git2/0.21.nix index 823f09b8bced..4ea430865485 100644 --- a/pkgs/development/libraries/git2/0.21.nix +++ b/pkgs/development/libraries/git2/0.21.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libssh2 openssl http-parser ]; meta = { - description = "the Git linkable library"; + description = "The Git linkable library"; homepage = http://libgit2.github.com/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3e9e0bea8e3b..7aaac299b0e3 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { buildInputs = [ zlib libssh2 openssl http-parser ]; meta = { - description = "the Git linkable library"; + description = "The Git linkable library"; homepage = http://libgit2.github.com/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 25c8d7e561b6..fe816ee5267c 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.nic.ad.jp/ja/idn/idnkit; - description = "provides functionalities about i18n domain name processing"; + description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 7dba9e025198..35eabdd35563 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; - description = "a software implementation of the JBIG1 data compression standard"; + description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 64fd951d70dd..445f65b9202e 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/Seagate/kinetic-cpp-client; - description = "code for producing C and C++ kinetic clients"; + description = "Code for producing C and C++ kinetic clients"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 6617816b642b..8e7971d8087c 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fallabs.com/kyotocabinet; - description = "a library of routines for managing a database"; + description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index d266a97535e6..07689fbdd277 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "a LDAP-like embedded database"; + description = "A LDAP-like embedded database"; homepage = http://ldb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index bc21237e238d..bafcc5210b38 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://0pointer.de/lennart/projects/libasyncns/; - description = "a C library for Linux/Unix for executing name service queries asynchronously"; + description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index ff9cd25293aa..df18ae06ed66 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.hyperrealm.com/libconfig; - description = "a simple library for processing structured configuration files"; + description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 8ffa1ff81924..f44d228f6501 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ indent ]; meta = { - description = "library reading dwg files"; + description = "Library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index ad37f9010c5c..96de7eb7b3c2 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libestr.adiscon.com/; - description = "some essentials for string handling"; + description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 6292318d5ca9..a91205e182c7 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/libical/libical; - description = "an Open Source implementation of the iCalendar protocols"; + description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl10; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index ab8c696a66c7..cb62ff3628b8 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; + description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index c5d91e266992..81490ccd5390 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.liblognorm.com/; - description = "help to make sense out of syslog data, or, actually, any event data that is present in text form"; + description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 94401c30a6ba..caabde85f29b 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "minimalistic user-space library oriented to Netlink developers"; + description = "Minimalistic user-space library oriented to Netlink developers"; longDescription = '' libmnl is a minimalistic user-space library oriented to Netlink developers. There are a lot of common tasks in parsing, validating, constructing of both the Netlink diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index a1d2b3b8e244..b1d26b81a8d4 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; - description = "userspace API to packets queued by the kernel packet filter"; + description = "Userspace API to packets queued by the kernel packet filter"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 4a80ac3a8755..24e46c0802b2 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/omxil/; - description = "an opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; + description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 809a855835df..c19dc73abfa6 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { homepage = https://github.com/clusterlabs/libqb; - description = "a library providing high performance logging, tracing, ipc, and poll"; + description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 1a7c8c92b538..52439f0fe2cc 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.librelp.com/; - description = "a reliable logging library"; + description = "A reliable logging library"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 63a60820e3fc..e30271aaa384 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "high level library for the Linux Kernel seccomp filter"; + description = "High level library for the Linux Kernel seccomp filter"; homepage = "http://sourceforge.net/projects/libseccomp"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 36327327b4dd..8ffb8f8bde98 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.i-scream.org/libstatgrab/; - description = "a library that provides cross platforms access to statistics about the running system"; + description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index b9c4a0a36d40..3a09a0de4bfb 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libstroke, a library for simple gesture recognition"; + description = "Libstroke, a library for simple gesture recognition"; homepage = http://etla.net/libstroke/; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 2356e5bddbd6..0d757d33cf95 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; homepage = http://sourceforge.net/projects/linuxwacom/; - description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index c084cfb8116d..ba179e54fe0c 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/libykneomgr; - description = "a C library to interact with the CCID-part of the Yubikey NEO"; + description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 6d63e8367f79..fbae5245b6d9 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "http://log4cplus.sourceforge.net/"; - description = "a port the log4j library from Java to C++"; + description = "A port the log4j library from Java to C++"; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 5830786f6448..164960a52833 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; meta = with stdenv.lib; { - description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications"; + description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 345ff5d31b5d..fa4758d0877a 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "a small XML library"; + description = "A small XML library"; homepage = http://www.minixml.org; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix index 1291617ad6fa..f6e7ed56adc4 100644 --- a/pkgs/development/libraries/poker-eval/default.nix +++ b/pkgs/development/libraries/poker-eval/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pokersource.org/poker-eval/; - description = "poker hand evaluator"; + description = "Poker hand evaluator"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.mtreskin]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index f99514f054a5..02d758f89f26 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { ] else null; meta = { - description = "command line option parsing library"; + description = "Command line option parsing library"; }; } diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index c39314843c02..90e1dfded6ae 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a wrapper for the user, group and hosts NSS API"; + description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 0c6f40c8b143..b93312b0e8c9 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a library passing all socket communications through unix sockets"; + description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 8e3cf899e40b..ce313e351686 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { hompage = http://www.speex.org/; - description = "an Open Source/Free Software patent-free audio compression format designed for speech"; + description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 56b1900837ac..e31c793a7d7a 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { hompage = http://www.speex.org/; - description = "an Open Source/Free Software patent-free audio compression format designed for speech"; + description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 35d7f53173fb..d53941b5e2f5 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "a wrapper for the user, group and hosts NSS API"; + description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary"; license = licenses.bsd3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 803c552b4878..9f9f90a6f176 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing; - description = "a more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; + description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 708db269e946..6e4dc00b0387 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ yasm ]; meta = with stdenv.lib; { - description = "library for encoding H264/AVC video streams"; + description = "Library for encoding H264/AVC video streams"; homepage = http://www.videolan.org/developers/x264.html; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 6ec61cda9d09..e8ec8f2aa241 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -345,7 +345,7 @@ let lispPackages = rec { command-line-arguments = buildLispPackage rec { baseName = "command-line-arguments"; version = "git-20141113"; - description = "small library to deal with command-line arguments"; + description = "Small library to deal with command-line arguments"; deps = []; # Source type: git src = pkgs.fetchgit { diff --git a/pkgs/development/mobile/titaniumenv/cli/registry.nix b/pkgs/development/mobile/titaniumenv/cli/registry.nix index 045f619087e4..3d31d41dd434 100644 --- a/pkgs/development/mobile/titaniumenv/cli/registry.nix +++ b/pkgs/development/mobile/titaniumenv/cli/registry.nix @@ -120,7 +120,7 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; meta = { - description = "get colors in your node.js console"; + description = "Get colors in your node.js console"; homepage = https://github.com/Marak/colors.js; license = "MIT"; }; @@ -169,7 +169,7 @@ let sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }; meta = { - description = "get colors in your node.js console like what"; + description = "Get colors in your node.js console like what"; homepage = https://github.com/Marak/colors.js; }; production = true; @@ -513,7 +513,7 @@ let sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; meta = { - description = "parse argument options"; + description = "Parse argument options"; homepage = https://github.com/substack/minimist; license = "MIT"; }; @@ -1164,7 +1164,7 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; meta = { - description = "read and write binary structures and data types"; + description = "Read and write binary structures and data types"; homepage = https://github.com/rmustacc/node-ctype; }; production = true; @@ -1599,7 +1599,7 @@ let }; }; meta = { - description = "the complete solution for node.js command-line programs"; + description = "The complete solution for node.js command-line programs"; homepage = "https://github.com/tj/commander.js#readme"; license = "MIT"; }; @@ -1614,7 +1614,7 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; meta = { - description = "graceful fs.readlink"; + description = "Graceful fs.readlink"; homepage = https://github.com/zhiyelee/graceful-readlink; license = "MIT"; }; @@ -1745,7 +1745,7 @@ let }; dependencies = {}; meta = { - description = "extend like a boss"; + description = "Extend like a boss"; homepage = https://github.com/Raynos/xtend; license = "MIT"; }; @@ -2316,7 +2316,7 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; meta = { - description = "get colors in your node.js console"; + description = "Get colors in your node.js console"; homepage = https://github.com/Marak/colors.js; license = "MIT"; }; @@ -2332,7 +2332,7 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; meta = { - description = "decycle your json"; + description = "Decycle your json"; homepage = https://github.com/douglascrockford/JSON-js; }; production = true; @@ -2347,7 +2347,7 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; meta = { - description = "a customizable value inspector"; + description = "A customizable value inspector"; }; production = true; linkDependencies = false; diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index d2fa675bbd82..f25a6f97b392 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://ocaml-http.forge.ocamlcore.org/; platforms = ocaml.meta.platforms or []; - description = "do it yourself (OCaml) HTTP daemon"; + description = "Do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; maintainers = with maintainers; [ roconnor vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 16a1ac3b30f2..10a3a1602ae9 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; meta = with stdenv.lib; { - description = "fast, arbitrary precision OCaml integers"; + description = "Fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index acaf1efdaaac..e110afa1d249 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ../generic-setup-hook.sh; meta = { - description = "a pure binding to gnuplot"; + description = "A pure binding to gnuplot"; homepage = http://puredocs.bitbucket.org/pure-gplot.html; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index c60ee54bec8e..6bc28fd95687 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "python plotting library, making publication quality plots"; + description = "Python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 00eb5b9afc13..ffb2896da359 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { - description = "code coverage tester for compiled programs, Python scripts and shell scripts"; + description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; longDescription = '' Kcov is a code coverage tester for compiled programs, Python diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index af3f4a1afffb..fdeafcbb4fe2 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gnu.org/software/gnulib/"; - description = "central location for code to be shared among GNU packages"; + description = "Central location for code to be shared among GNU packages"; license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 26acd085bb85..7a2796b48ca8 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -70,7 +70,7 @@ let }; meta = { - description = "a fast, free distributed C/C++ compiler"; + description = "A fast, free distributed C/C++ compiler"; homepage = "http://distcc.org"; license = "GPL"; diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 91b343b20b4c..f543d3a475c1 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 usb-modeswitch ]; meta = { - description = "device database and the rules file for 'multi-mode' USB devices"; + description = "Device database and the rules file for 'multi-mode' USB devices"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 9aad2edfa4ec..893df94d2379 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { - description = "a mode switching tool for controlling 'multi-mode' USB devices"; + description = "A mode switching tool for controlling 'multi-mode' USB devices"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 1d7e6b330423..07cc55465d10 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://furius.ca/xxdiff/"; - description = "graphical file and directories comparator and merge tool"; + description = "Graphical file and directories comparator and merge tool"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 9c781e6f7577..c68c29f86dea 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior"; + description = "Load testing software for Web applications to realistically simulate user activity and analyze server behavior"; homepage = https://www.neotys.com/product/overview-neoload.html; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4a6cdc3aa34b..d5a6889c06af 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "checks CSS for syntax errors and other problems"; + description = "Checks CSS for syntax errors and other problems"; longDescription = '' CSSLint is a tool to help point out problems with your CSS code. It does basic syntax checking as well as applying a set of diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index b3237012eccd..5e5da9497e58 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.uberent.com/pa/; - description = "next-generation RTS that takes the genre to a planetary scale"; + description = "Next-generation RTS that takes the genre to a planetary scale"; license = stdenv.lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 6ac61571d4cb..0d6c21bfa823 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zandronum.com/; - description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; + description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play"; maintainers = [ stdenv.lib.maintainers.lassulus ]; # Binary version has different version string than source code version. license = stdenv.lib.licenses.unfreeRedistributable; diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index ab7a6d7cb432..cf5e41f389a9 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "rogue-like game"; + description = "Rogue-like game"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index c1ff6cb94934..e5cd08b7f9de 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator"; + description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan."; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 52e970b5b822..14d487da82ba 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.fsij.org/pages/gnuk; - description = "an implementation of USB cryptographic token for gpg"; + description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 48b30bccbdd8..80e405d4442f 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; - description = "light-locker is a simple locker"; + description = "Light-locker is a simple locker"; longDescription = '' light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies. It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix index 2260ac08b632..e46aecbd4142 100644 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://linuxcontainers.org/cgmanager/introduction/; - description = "a central privileged daemon that manages all your cgroups"; + description = "A central privileged daemon that manages all your cgroups"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index fa0797bf7a3c..fd37d35623e4 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { [ libv4l gd ]; meta = { - description = "neat and simple webcam app"; + description = "Neat and simple webcam app"; homepage = http://www.sanslogic.co.uk/fswebcam; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix index f3909950cb91..8e24b5061cd3 100644 --- a/pkgs/os-specific/linux/fusionio/vsl.nix +++ b/pkgs/os-specific/linux/fusionio/vsl.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fusionio.com; - description = "kernel driver for accessing fusion-io cards"; + description = "Kernel driver for accessing fusion-io cards"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; broken = stdenv.system != "x86_64-linux"; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 8d05a0d7d232..a3d212dda53b 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://linux.dell.com/libsmbios/main"; - description = "a library to obtain BIOS information"; + description = "A library to obtain BIOS information"; license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 7765f5f8b9c2..3c7ceb1270c0 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "userspace locking validation tool built on the Linux kernel"; + description = "Userspace locking validation tool built on the Linux kernel"; homepage = "https://kernel.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 82ea72af1605..eda1863ec97b 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://lxc.sourceforge.net"; - description = "userspace tools for Linux Containers, a lightweight virtualization system"; + description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; longDescription = '' diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e0b16eb24f5b..4b3e078cb57d 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { - description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; + description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; homepage = http://netfilter.org/projects/nftables; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index c50f0185eb52..1d1712f6b476 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "make prefix=$out install install_doc"; meta = { - description = "user-space tools for the Linux kernel ftrace subsystem"; + description = "User-space tools for the Linux kernel ftrace subsystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index ba7c69ef7dbf..02cf49854ac8 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://acme.com/software/micro_httpd/"; - description = "a really small HTTP server"; + description = "A really small HTTP server"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index f35497fef8e4..20cea2708895 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mini-httpd.nongnu.org/"; - description = "a minimalistic high-performance web server"; + description = "A minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 39667c8ba626..c5f7a45cefea 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://directory.fedoraproject.org/; - description = "enterprise-class Open Source LDAP server for Linux"; + description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index cf8aea594325..3ecb00b64fc3 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://petidomo.sourceforge.net/"; - description = "a simple and easy to administer mailing list server"; + description = "A simple and easy to administer mailing list server"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index f45dd3b7248a..c8202b35455c 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { makeFlags = "DESTDIR=$(out) prefix="; meta = { - description = "a collection of postfix-related tools"; + description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; homepage = https://github.com/Fruneau/pfixtools; }; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 0888eb1182a0..92b529fc564c 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/vstakhov/rspamd"; license = licenses.asl20; - description = "advanced spam filtering system"; + description = "Advanced spam filtering system"; maintainers = with maintainers; [ avnik fpletz ]; }; } diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ca7e30e95e3d..127d807133e0 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "a scalable, high-performance, open source NoSQL database"; + description = "A scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; license = licenses.agpl3; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 91c4472e0492..f94ca52259e6 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "a highly scalable, robust (fully ACID) native graph database"; + description = "A highly scalable, robust (fully ACID) native graph database"; homepage = "http://www.neo4j.org/"; license = licenses.gpl3; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index e518d063dd45..7546fe37afe5 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; + description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 035b4fd6ee73..c7c7b9e55674 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = '' xmkmf -a ''; meta = with stdenv.lib; { - description = "virtual keyboard for X window system"; + description = "Virtual keyboard for X window system"; longDescription = '' xvkbd is a virtual (graphical) keyboard program for X Window System which provides facility to enter characters onto other clients (softwares) by clicking on a diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index e73e71da51a2..b0b9444a2380 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ]; meta = { - description = "opensource disk backup software"; + description = "Opensource disk backup software"; homepage = http://www.partimage.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index bcbc8a846474..1c313beae9fd 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ python librsync gnused ]; meta = { - description = "backup system trying to combine best a mirror and an incremental backup system"; + description = "Backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 1a14aae62636..ada58e87fd0a 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "bash script CD Burner Writer"; + description = "Bash script CD Burner Writer"; longDescription = '' It might not be the best looking application out there, but it works. It’s simple, fast and small, and can handle most things you throw at it. diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index f46ddd1c5369..d12169a0fd9a 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.bzip.org"; - description = "high-quality data compression program"; + description = "High-quality data compression program"; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 44f6a0bb7a45..cf616a21e0aa 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://lbzip2.org/; - description = "parallel bzip2 compression utility"; + description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index b0dfd79b9bac..a800a19e12b9 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/lzip/lzip.html"; - description = "a lossless data compressor based on the LZMA algorithm"; + description = "A lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index b2246e73328f..a5cd54bf74d9 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://savannah.nongnu.org/projects/davfs2"; - description = "mount WebDAV shares like a typical filesystem"; + description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 5b33e31958c5..a30709d4c920 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs ]; meta = with stdenv.lib; { - description = "utility that can recover deleted files from an ext3 or ext4 partition"; + description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = http://extundelete.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index e9a7204f0e6c..63d3bbc3373a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "an open source (experimental) Linux client for Google Drive"; + description = "An open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index fa0349689119..4e027a53ffcb 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://intgat.tigress.co.uk/rmy/uml/index.html; - description = "zero free blocks from ext2, ext3 and ext4 file-systems"; + description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; }; diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix index 579ec802e092..63bf9aae5521 100644 --- a/pkgs/tools/graphics/bins/default.nix +++ b/pkgs/tools/graphics/bins/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = { - description = "generates static HTML photo albums"; + description = "Generates static HTML photo albums"; homepage = http://bins.sautret.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index c9b1febcc93a..78a66721b0c9 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; - description = "a dynamic resource editor for X Toolkit applications"; + description = "A dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index ba58bd86a747..819728032bb6 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; meta = with stdenv.lib; { - description = "encrypt files with Advanced Encryption Standard (AES)"; + description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = http://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index e479167dc159..dc170bcd14bb 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { preFixup = ''rm "$out/bin/apt-offline-gui"''; meta = with stdenv.lib; { - description = "offline APT package manager"; + description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ maintainers.falsifian ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 72a8f61bf3f0..305a32edadeb 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out"; meta = { - description = "a shell extension that manages your environment"; + description = "A shell extension that manages your environment"; longDescription = '' Once hooked into your shell direnv is looking for an .envrc file in your current directory before every prompt. diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 993a36ea9092..a51b6238cd52 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { installPhase = ''make DESTDIR="$out" PREFIX="" install''; meta = { - description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; + description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 54a6b0309b00..3bf704ca68e9 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "open source firmware for mp3 players"; + description = "Open source firmware for mp3 players"; homepage = http://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 4bc68aba29df..31f39b887c56 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization-gui; - description = "a QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; + description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 8b8b5074fc39..dbf0b9af8abc 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization; - description = "a library and command line tool to personalize YubiKeys"; + description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 1d0c9d55076e..c579d12b6bd4 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://keepalived.org; - description = "routing software written in C"; + description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 5a1095506424..41266e65aa09 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "configureFlags=--mandir=$out/share/man"; meta = { - description = "utilities for encoding and decoding binary files in MIME"; + description = "Utilities for encoding and decoding binary files in MIME"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b89d2adea6bc..23d4117f8b84 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; - description = "map arbitrary files as block devices over the network"; + description = "Map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 423c58450c56..00c1c86ea8b5 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "a fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; + description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; homepage = https://github.com/danrl/ratools; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 2fec2ac1bd58..b50d619b437d 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "utility for secure encrypted channels between sockets"; + description = "Utility for secure encrypted channels between sockets"; homepage = "https://www.tarsnap.com/spiped.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 96169ab294ce..2f12aaa7ee23 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "universal tls/ssl wrapper"; + description = "Universal tls/ssl wrapper"; homepage = "http://www.stunnel.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index e1905e2deb65..b183b653d26e 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; - description = "virtual private network (VPN) client for Cisco's VPN concentrators"; + description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 8593fe69733a..4766968b06fd 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "free implementation of the OpenPGP standard for encrypting and signing data"; + description = "Free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 65d43ec9dbee..932bf508c2fa 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/"; - description = "free implementation of the OpenPGP standard for encrypting and signing data"; + description = "Free implementation of the OpenPGP standard for encrypting and signing data"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 6119f708070d..a1cbcb458c59 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gnupg.org; - description = "a complete and free implementation of the OpenPGP standard"; + description = "A complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wkennington peti fpletz ]; platforms = platforms.all; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 64ebb4c0ca26..3dd00718af79 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "multi-use cryptographic tool based on the STRIBOB algorithm"; + description = "Multi-use cryptographic tool based on the STRIBOB algorithm"; homepage = "https://www.stribob.com/stricat/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 5a2173139403..a4aec5369fc5 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; repositories.git = https://git.torproject.org/vidalia; - description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; + description = "A cross-platform graphical controller for the Tor software, built using the Qt framework"; license = licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index bed7d5369579..511da154c507 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://code.google.com/p/volatility; - description = "advanced memory forensics framework"; + description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 27ebbf3518fc..240cc36f7266 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with stdenv.lib; { - description = "an enhanced version of GNU dd"; + description = "An enhanced version of GNU dd"; homepage = http://dcfldd.sourceforge.net/; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 63a6e7e1fa30..1876bac496da 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://projects.gw-computing.net/projects/dfc"; - description = "displays file system space usage using graphs and colors"; + description = "Displays file system space usage using graphs and colors"; license="free"; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index b6f3de5f5cde..02c76798fd77 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/s6-rc/; - description = "a service manager for s6-based systems"; + description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ pmahoney ]; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 304d8f21eb28..5e7ec51bf107 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "data recovery tool for damaged hardware"; + description = "Data recovery tool for damaged hardware"; longDescription = '' Safecopy is a data recovery tool which tries to extract as much data as possible from a diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 58036af1a947..a297f9371001 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; - description = "terminal mixer - multiplexer for the i/o of terminal applications"; + description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.all; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index a5050047256b..00df3c45f4ff 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; - description = "command to produce a depth indented directory listing"; + description = "Command to produce a depth indented directory listing"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 8e65eda8f540..cad1230ac87a 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; - description = "task spooler - batch queue"; + description = "Task spooler - batch queue"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.all; diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index ca9de0590ca2..0eb64fe1d18a 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -18,7 +18,7 @@ buildRubyGem rec { dontStrip = true; meta = with lib; { - description = "upload code to https://gist.github.com (or github enterprise)"; + description = "Upload code to https://gist.github.com (or github enterprise)"; homepage = "http://defunkt.io/gist/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 3bb147f7dd27..2eae12561861 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.fourmilab.ch/webtools/qprint/"; license = stdenv.lib.licenses.publicDomain; - description = "encode and decode Quoted-Printable files"; + description = "Encode and decode Quoted-Printable files"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e6c63e029561..cef212b2a134 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "a tool to search text in PDF files"; + description = "A tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index eacd0316b464..61936e766c5e 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; - description = "a system to convert (La)TeX documents to HTML and various other formats"; + description = "A system to convert (La)TeX documents to HTML and various other formats"; license = stdenv.lib.licenses.lppl12; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 558d9102352b..29e1c45245f7 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -17,7 +17,7 @@ rec { '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; meta = { - description = "the moderncv class for TeXLive"; + description = "The moderncv class for TeXLive"; # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 189d418b0391..caa140d42c79 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -17,7 +17,7 @@ rec { '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; meta = { - description = "the moderntimeline extensions for moderncv"; + description = "The moderntimeline extensions for moderncv"; # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 34b6226ff98d..c038ca7c1bbe 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = { homepage = http://cloudinit.readthedocs.org; - description = "provides configuration and customization of cloud instance"; + description = "Provides configuration and customization of cloud instance"; maintainers = [ lib.maintainers.madjar ]; platforms = lib.platforms.all; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0878a6adeb8b..1bf3b4c0e61b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -395,7 +395,7 @@ let }; packageRequires = [ company ghc-mod ]; meta = { - description = "company-mode completion backend for haskell-mode via ghc-mod"; + description = "Company-mode completion backend for haskell-mode via ghc-mod"; license = gpl3Plus; }; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5f38fdf42aa7..e652bf2d5901 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -427,7 +427,7 @@ let }; meta = with stdenv.lib; { - description = "vicious widgets for window managers"; + description = "Vicious widgets for window managers"; homepage = http://git.sysphere.org/vicious/; license = licenses.gpl2; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a51930f3e386..cd7982baa503 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -597,7 +597,7 @@ in modules // { meta = { homepage = https://github.com/bitprophet/alabaster; - description = "a Sphinx theme"; + description = "A Sphinx theme"; license = licenses.bsd3; }; }; @@ -887,7 +887,7 @@ in modules // { buildInputs = with self; [ pytest ]; meta = { - description = "namespace control and lazy-import mechanism"; + description = "Namespace control and lazy-import mechanism"; homepage = "http://bitbucket.org/hpk42/apipkg"; license = licenses.mit; }; @@ -971,7 +971,7 @@ in modules // { }; meta = { - description = "reference implementation of PEP 3156"; + description = "Reference implementation of PEP 3156"; homepage = http://www.python.org/dev/peps/pep-3156; license = licenses.free; }; @@ -3813,7 +3813,7 @@ in modules // { sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c"; }; meta = { - description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; + description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; }; propagatedBuildInputs = with self; [ self.coverage ]; }; @@ -4606,7 +4606,7 @@ in modules // { buildInputs = with self; [ covCore pytest ]; meta = { - description = "plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; homepage = https://github.com/schlamar/pytest-cov; license = licenses.mit; }; @@ -4694,7 +4694,7 @@ in modules // { TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true; meta = { - description = "complete yet simple CSS parser for Python"; + description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; homepage = http://pythonhosted.org/tinycss/; }; @@ -5315,7 +5315,7 @@ in modules // { ''; meta = { - description = "integrates an Android device into a desktop"; + description = "Integrates an Android device into a desktop"; homepage = https://github.com/screenfreeze/deskcon-desktop; license = licenses.gpl3; }; @@ -5838,7 +5838,7 @@ in modules // { meta = { homepage = "http://python-eve.org/"; - description = "open source Python REST API framework designed for human beings"; + description = "Open source Python REST API framework designed for human beings"; license = licenses.bsd3; }; }; @@ -5932,7 +5932,7 @@ in modules // { doCheck = !isPy3k; # failures.. meta = { - description = "rapid multi-Python deployment"; + description = "Rapid multi-Python deployment"; license = licenses.gpl2; }; }; @@ -6559,7 +6559,7 @@ in modules // { doCheck = false; meta = { - description = "python humanize utilities"; + description = "Python humanize utilities"; homepage = https://github.com/jmoiron/humanize; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; @@ -6665,7 +6665,7 @@ in modules // { }; meta = { - description = "helpers to pass trusted data to untrusted environments and back"; + description = "Helpers to pass trusted data to untrusted environments and back"; homepage = "https://pypi.python.org/pypi/itsdangerous/"; }; }; @@ -6707,7 +6707,7 @@ in modules // { doCheck = false; meta = { - description = "tools for i3 users and developers"; + description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; platforms = platforms.linux; @@ -7109,7 +7109,7 @@ in modules // { }; meta = { - description = "dependencies for mwlib markup"; + description = "Dependencies for mwlib markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; }; @@ -7132,7 +7132,7 @@ in modules // { ]; meta = { - description = "generate pdfs from mediawiki markup"; + description = "Generate pdfs from mediawiki markup"; homepage = "http://pediapress.com/code/"; license = licenses.bsd3; }; @@ -7223,7 +7223,7 @@ in modules // { JPEG_DIR="${pkgs.libjpeg.dev}"; meta = { - description = "interface to netCDF library (versions 3 and 4)"; + description = "Interface to netCDF library (versions 3 and 4)"; homepage = https://pypi.python.org/pypi/netCDF4; license = licenses.free; # Mix of license (all MIT* like) }; @@ -10478,7 +10478,7 @@ in modules // { buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); meta = { - description = "automatically generated zsh completion function for Python's option parser modules"; + description = "Automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; }; }; @@ -14221,7 +14221,7 @@ in modules // { meta = { homepage = "https://github.com/simplegeo/python-oauth2"; - description = "library for OAuth version 1.0"; + description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = platforms.linux; @@ -14286,7 +14286,7 @@ in modules // { [ pyptlib argparse twisted pycrypto pyyaml ]; meta = { - description = "a pluggable transport proxy"; + description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; maintainers = with maintainers; [ phreedom thoughtpolice ]; @@ -18929,7 +18929,7 @@ in modules // { meta = { homepage = "https://github.com/asweigart/pyperclip"; license = licenses.bsdOriginal; - description = "cross-platform clipboard module"; + description = "Cross-platform clipboard module"; }; }; @@ -19501,7 +19501,7 @@ in modules // { buildInputs = with self; [ ]; meta = { - description = "job queue server"; + description = "Job queue server"; homepage = "https://github.com/pediapress/qserve"; license = licenses.bsd3; }; @@ -19698,7 +19698,7 @@ in modules // { doCheck = false; meta = with stdenv.lib; { - description = "readme"; + description = "Readme"; homepage = "https://github.com/pypa/readme"; }; }; @@ -20041,7 +20041,7 @@ in modules // { }; meta = { - description = "python refactoring library"; + description = "Python refactoring library"; homepage = http://rope.sf.net; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20060,7 +20060,7 @@ in modules // { propagatedBuildInputs = with self; [ ropemode ]; meta = { - description = "a plugin for performing python refactorings in emacs"; + description = "A plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net/ropemacs.html; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20079,7 +20079,7 @@ in modules // { propagatedBuildInputs = with self; [ rope ]; meta = { - description = "a plugin for performing python refactorings in emacs"; + description = "A plugin for performing python refactorings in emacs"; homepage = http://rope.sf.net; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; @@ -20205,7 +20205,7 @@ in modules // { }; meta = { - description = "common routines for ruamel packages"; + description = "Common routines for ruamel packages"; homepage = https://bitbucket.org/ruamel/base; license = licenses.mit; }; @@ -20222,7 +20222,7 @@ in modules // { }; meta = { - description = "a version of dict that keeps keys in insertion resp. sorted order"; + description = "A version of dict that keeps keys in insertion resp. sorted order"; homepage = https://bitbucket.org/ruamel/ordereddict; license = licenses.mit; }; @@ -20523,7 +20523,7 @@ in modules // { doCheck = false; meta = { - description = "statisitical data visualization"; + description = "Statisitical data visualization"; homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; license = "BSD"; maintainers = with maintainers; [ fridh ]; @@ -20630,7 +20630,7 @@ in modules // { propagatedBuildInputs = with self; [ twisted ]; meta = { - description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; + description = "Setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; homepage = http://allmydata.org/trac/setuptools_trial; @@ -21095,7 +21095,7 @@ in modules // { buildInputs = with self; [ ]; meta = { - description = "parse english textual date descriptions"; + description = "Parse english textual date descriptions"; homepage = "https://github.com/pediapress/timelib/"; license = licenses.zlib; }; @@ -22380,7 +22380,7 @@ in modules // { propagatedBuildInputs = with self; [ testtools ]; meta = { - description = "a pyunit extension for dependency injection"; + description = "A pyunit extension for dependency injection"; homepage = https://pypi.python.org/pypi/testscenarios; license = licenses.asl20; }; @@ -22700,7 +22700,7 @@ in modules // { propagatedBuildInputs = with self; [ numpy ]; meta = { - description = "explicitly typed attributes for Python"; + description = "Explicitly typed attributes for Python"; homepage = http://pypi.python.org/pypi/traits; license = "BSD"; }; @@ -23236,7 +23236,7 @@ in modules // { }; meta = { - description = "python wrapper for Xvfb, Xephyr and Xvnc"; + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; homepage = "https://github.com/ponty/pyvirtualdisplay"; license = licenses.bsdOriginal; maintainers = with maintainers; [ layus ]; @@ -23261,7 +23261,7 @@ in modules // { doCheck = false; meta = { - description = "a tool to create isolated Python environments"; + description = "A tool to create isolated Python environments"; homepage = http://www.virtualenv.org; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; @@ -23995,7 +23995,7 @@ in modules // { patches = [ ../development/python-modules/btrees-py35.patch ]; meta = { - description = "scalable persistent components"; + description = "Scalable persistent components"; homepage = http://packages.python.org/BTrees; }; }; @@ -24012,7 +24012,7 @@ in modules // { }; meta = { - description = "automatic persistence for Python objects"; + description = "Automatic persistence for Python objects"; homepage = http://www.zope.org/Products/ZODB; }; }; @@ -24570,7 +24570,7 @@ in modules // { meta = { homepage = http://liw.fi/cmdtest/; - description = "black box tests Unix command line tools"; + description = "Black box tests Unix command line tools"; }; }; @@ -25549,7 +25549,7 @@ in modules // { }; meta = { - description = "implements a lazy string for python useful for use with gettext"; + description = "Implements a lazy string for python useful for use with gettext"; homepage = https://github.com/mitsuhiko/speaklater; license = "bsd"; maintainers = with maintainers; [ matejc ]; @@ -27042,7 +27042,7 @@ in modules // { meta = { homepage = http://github.com/bepasty/bepasty-server; - description = "binary pastebin server"; + description = "Binary pastebin server"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; @@ -27099,7 +27099,7 @@ in modules // { }; meta = { homepage = http://bitbucket.org/thomaswaldmann/xstatic; - description = "base packaged static files for python"; + description = "Base packaged static files for python"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; @@ -27114,7 +27114,7 @@ in modules // { }; meta = { homepage = https://github.com/bitprophet/alabaster; - description = "convert xlsx to csv"; + description = "Convert xlsx to csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; }; @@ -27413,7 +27413,7 @@ in modules // { }; meta = { - description = "console colouring for python"; + description = "Console colouring for python"; homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10"; license = licenses.bsdOriginal; }; @@ -27432,7 +27432,7 @@ in modules // { buildInputs = with self; [ mock ]; meta = { - description = "python test runner"; + description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; licence = licenses.mit; }; -- cgit 1.4.1 From aa9a04883e34f6a7b89846e87654577d5b218f46 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 23 Jun 2016 09:25:10 +0200 Subject: Revert "Merge branch 'staging'" due to glibc The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe. --- nixos/lib/testing.nix | 8 +-- pkgs/applications/graphics/leocad/default.nix | 1 - pkgs/applications/graphics/photivo/default.nix | 12 ++--- pkgs/applications/misc/cli-visualizer/default.nix | 4 -- pkgs/applications/misc/termite/default.nix | 2 - .../science/robotics/qgroundcontrol/default.nix | 5 -- .../video/simplescreenrecorder/default.nix | 4 -- .../virtualization/virtualbox/default.nix | 9 +--- pkgs/build-support/cc-wrapper/default.nix | 1 - pkgs/build-support/gcc-cross-wrapper/builder.sh | 1 - pkgs/build-support/gcc-cross-wrapper/default.nix | 4 +- pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +- pkgs/build-support/trivial-builders.nix | 1 - .../stylesheets/xslt/docbook-xsl/default.nix | 6 +-- .../kde-5/plasma-5.6/plasma-desktop/default.nix | 3 -- pkgs/development/compilers/gcc/4.5/default.nix | 38 +++++--------- pkgs/development/compilers/gcc/4.6/builder.sh | 4 +- pkgs/development/compilers/gcc/4.6/default.nix | 34 ++++--------- pkgs/development/compilers/gcc/4.8/default.nix | 36 ++++---------- pkgs/development/compilers/gcc/4.9/default.nix | 36 ++++---------- pkgs/development/compilers/gcc/5/default.nix | 41 +++++---------- pkgs/development/compilers/gcc/6/default.nix | 35 ++++--------- pkgs/development/compilers/gcc/builder.sh | 17 ++++--- pkgs/development/libraries/botan/generic.nix | 2 - pkgs/development/libraries/botan/unstable.nix | 1 - pkgs/development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/glibc/builder.sh | 58 ++++++++++++++++++++++ pkgs/development/libraries/glibc/common.nix | 1 - pkgs/development/libraries/glibc/default.nix | 57 +-------------------- .../development/libraries/glibc/fix_warnings.patch | 36 -------------- pkgs/development/libraries/kerberos/krb5.nix | 2 - .../libraries/kerberos/path_char_fix.patch | 38 -------------- pkgs/development/libraries/libelf/default.nix | 6 +-- .../development/libraries/libxkbcommon/default.nix | 9 ++-- pkgs/development/libraries/xgboost/default.nix | 2 - pkgs/development/python-modules/generic/wrap.sh | 13 ++--- pkgs/development/tools/analysis/rr/default.nix | 3 +- pkgs/development/tools/misc/hydra/default.nix | 8 +-- pkgs/games/cataclysm-dda/default.nix | 3 -- pkgs/games/dwarf-fortress/dfhack/default.nix | 1 - pkgs/games/dwarf-fortress/unfuck.nix | 2 - pkgs/games/openspades/default.nix | 6 +-- pkgs/games/openspades/git.nix | 2 - pkgs/games/the-butterfly-effect/default.nix | 3 -- pkgs/misc/emulators/higan/default.nix | 1 - pkgs/misc/emulators/pcsx2/default.nix | 4 -- pkgs/os-specific/linux/sysdig/default.nix | 3 -- pkgs/servers/nosql/arangodb/default.nix | 13 +++-- pkgs/stdenv/generic/setup.sh | 4 -- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 38 +++++++------- pkgs/tools/typesetting/xmlto/default.nix | 9 ++-- 51 files changed, 200 insertions(+), 431 deletions(-) create mode 100644 pkgs/development/libraries/glibc/builder.sh delete mode 100644 pkgs/development/libraries/glibc/fix_warnings.patch delete mode 100644 pkgs/development/libraries/kerberos/path_char_fix.patch (limited to 'pkgs/development/tools/analysis') diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 5f463c092846..f7159634e4f1 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -113,14 +113,14 @@ rec { --add-flags "$vms" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ - --set testScript '$testScript' \ - --set VLANS '${toString vlans}' + --set testScript '"$testScript"' \ + --set VLANS '"${toString vlans}"' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests 'startAll; joinAll;' \ - --set VLANS '${toString vlans}' \ + --set tests '"startAll; joinAll;"' \ + --set VLANS '"${toString vlans}"' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} ''; # " diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 96384765bd03..884dc1158534 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 qmake4Hook zlib ]; postPatch = '' - sed '1i#include ' -i common/camera.cpp substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" ''; diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index d84363df899e..12816ba96af4 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -10,19 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h"; }; - postPatch = '' # kinda icky + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; + patchPhase = '' # kinda icky sed -e '/("@INSTALL@")/d' \ -e s,@INSTALL@,$out/share/photivo, \ -i Sources/ptSettings.cpp - sed '1i#include ' -i Sources/filters/ptFilter_StdCurve.cpp ''; - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; - - enableParallelBuilding = true; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 1c7fd62f8ecc..6b9856a996ac 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -10,10 +10,6 @@ stdenv.mkDerivation rec { sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw"; }; - postPatch = '' - sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp - ''; - buildInputs = [ fftw ncurses libpulseaudio ]; buildFlags = [ "ENABLE_PULSE=1" ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 33c42e3dc1dd..33bc29f871c7 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -13,8 +13,6 @@ let sha256 = "1cw4yw7n9m2si8b7zcfyz9pyihncabxm5g39v1mxslfajxgwzmd8"; }; - postPatch = "sed '1i#include ' -i termite.cc"; - makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; buildInputs = [ pkgconfig vte gtk3 ncurses ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 81f5accd4780..1e33a1be8567 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { ] ++ qtInputs; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; - postPatch = '' - sed '1i#include ' -i src/Vehicle/Vehicle.cc \ - -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \ - -i src/{uas/UAS,ui/QGCDataPlot2D}.cc - ''; preConfigure = '' mkdir build diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 3ea04a39393b..a5fb122cf897 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -11,15 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql"; }; - postPatch = "sed '1i#include ' -i src/Benchmark.cpp"; - buildInputs = [ alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig libpulseaudio qt4 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A screen recorder for Linux"; homepage = http://www.maartenbaert.be/simplescreenrecorder; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ebdac411b113..df7b555e0487 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -97,14 +97,7 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch - ++ [ - (fetchurl rec { - name = "fix-detect-gcc-5.4.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=827193;filename=${name};msg=5"; - sha256 = "0y6v5dc6fqj9iv27cl8q2g87v1kxg19129mpas4vjg7g0529v4g9"; - }) - ]; + patches = optional enableHardening ./hardened.patch; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a37c806905fd..da114fdb347f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation { echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags echo "${libc_lib}" > $out/nix-support/orig-libc - echo "${libc_dev}" > $out/nix-support/orig-libc-dev '' + (if nativeTools then '' diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh index 9396ace84f11..c6bc2a7c8bf9 100644 --- a/pkgs/build-support/gcc-cross-wrapper/builder.sh +++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh @@ -111,7 +111,6 @@ chmod +x "$out/bin/$crossConfig-ld" # Glibc. test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc test -n "$libc" && echo $libc > $out/nix-support/orig-libc -test -n "$libc_dev" && echo $libc_dev > $out/nix-support/orig-libc-dev doSubstitute "$addFlags" "$out/nix-support/add-flags" diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 505d80a6b2ac..d3494b83a87b 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation { ldWrapper = ./ld-wrapper.sh; utils = ./utils.sh; addFlags = ./add-flags; - inherit nativeTools nativeLibc nativePrefix gcc binutils; - libc = if libc ? out then libc.out else libc; - libc_dev = if libc ? dev then libc.dev else libc; + inherit nativeTools nativeLibc nativePrefix gcc libc binutils; crossConfig = if cross != null then cross.config else null; osxMinVersion = cross.osxMinVersion or null; gccLibs = if gcc != null then gccLibs else null; diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index d922db5ccf58..7d0f88abb855 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -16,7 +16,7 @@ makeWrapper() { varName=${params[$((n + 1))]} value=${params[$((n + 2))]} n=$((n + 2)) - echo "export $varName=\"$value\"" >> $wrapper + echo "export $varName=$value" >> $wrapper fi if test "$p" = "--unset"; then diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 18e49105ae78..73f4d7783c43 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -8,7 +8,6 @@ rec { runCommand = name: env: buildCommand: stdenv.mkDerivation ({ inherit name buildCommand; - passAsFile = [ "buildCommand" ]; } // env); diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a955f5cf8a48..77cd666b8c6d 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -3,7 +3,7 @@ let common = { pname, sha256 }: stdenv.mkDerivation rec { - name = "${pname}-1.79.1"; + name = "${pname}-1.78.1"; src = fetchurl { url = "mirror://sourceforge/docbook/${name}.tar.bz2"; @@ -35,12 +35,12 @@ in { docbook_xsl = common { pname = "docbook-xsl"; - sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj"; + sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; }; docbook_xsl_ns = common { pname = "docbook-xsl-ns"; - sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"; + sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; }; } diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix index 2a1d95806c10..618e7387e62c 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix @@ -34,9 +34,6 @@ plasmaPackage rec { }) ./0003-tzdir.patch ]; - postPatch = '' - sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp - ''; NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 69ff590a6314..b1eedf7707df 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -179,11 +179,11 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' sed -i gcc/config/t-gnu \ - -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g' + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of @@ -197,7 +197,7 @@ stdenv.mkDerivation ({ grep -q LIBC_DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' done '' else null; @@ -205,10 +205,10 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross crossMingw; - nativeBuildInputs = [ texinfo which gettext ] + nativeBuildInputs = [ texinfo which ] ++ optional (perl != null) perl; - buildInputs = [ gmp mpfr libmpc libelf ] + buildInputs = [ gmp mpfr libmpc libelf gettext ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (zlib != null) zlib) @@ -284,7 +284,6 @@ stdenv.mkDerivation ({ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -347,28 +346,15 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread))); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; passthru = { inherit langC langCC langAda langFortran langVhdl diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index 6087bb30cfb2..af36ec33b70a 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -209,9 +209,7 @@ postInstall() { # Move runtime libraries to $lib. mkdir -p $lib/lib ln -s lib $lib/lib64 - moveToOutput "lib/lib*.so" "$lib" - moveToOutput "lib/lib*.so.*[0-9]" "$lib" - moveToOutput "lib/*.la" "$lib" + mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/ for i in $lib/lib/*.la; do substituteInPlace $i --replace $out $lib done diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 330f8a7cf8e7..7003f4335c8a 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -229,11 +229,11 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' sed -i gcc/config/t-gnu \ - -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g' + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of @@ -247,7 +247,7 @@ stdenv.mkDerivation ({ grep -q LIBC_DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' done '' else null; @@ -357,7 +357,6 @@ stdenv.mkDerivation ({ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -422,28 +421,15 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread))); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; passthru = { inherit langC langCC langAda langFortran langVhdl diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 32a43a24efd5..6810b52574c6 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -164,8 +164,8 @@ let version = "4.8.5"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" - else " --with-headers=${libcCross.dev}/include") + + (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" + else " --with-headers=${libcCross}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + @@ -255,9 +255,9 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' '' else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of @@ -271,7 +271,7 @@ stdenv.mkDerivation ({ grep -q LIBC_DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' done '' else null; @@ -415,7 +415,6 @@ stdenv.mkDerivation ({ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -483,28 +482,15 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread))); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; passthru = diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 6a9078fefcef..195a7b03eed4 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -166,8 +166,8 @@ let version = "4.9.3"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" - else " --with-headers=${libcCross.dev}/include") + + (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" + else " --with-headers=${libcCross}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + @@ -258,9 +258,9 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' '' else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of @@ -274,7 +274,7 @@ stdenv.mkDerivation ({ grep -q LIBC_DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' done '' else null; @@ -422,7 +422,6 @@ stdenv.mkDerivation ({ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -490,28 +489,15 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread))); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; passthru = diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 9ab725e2da88..9e0220ffc728 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -58,8 +58,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "5.4.0"; - sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; +let version = "5.3.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -166,8 +165,8 @@ let version = "5.4.0"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" - else " --with-headers=${getDev libcCross}/include") + + (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" + else " --with-headers=${libcCross}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + @@ -213,7 +212,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - inherit sha256; + sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"; }; inherit patches; @@ -257,9 +256,9 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' '' else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of @@ -273,7 +272,7 @@ stdenv.mkDerivation ({ grep -q LIBC_DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' done '' else null; @@ -416,7 +415,6 @@ stdenv.mkDerivation ({ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -484,28 +482,15 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread))); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${getDev libcCross}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; passthru = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index d281488fd505..6ca0f2f59f44 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -165,8 +165,8 @@ let version = "6.1.0"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" - else " --with-headers=${libcCross.dev}/include") + + (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" + else " --with-headers=${libcCross}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + @@ -256,9 +256,9 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' '' else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of @@ -272,7 +272,7 @@ stdenv.mkDerivation ({ grep -q LIBC_DYNAMIC_LINKER "$header" || continue echo " fixing \`$header'..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' done '' else null; @@ -482,28 +482,15 @@ stdenv.mkDerivation ({ ++ optional (libpthread != null) libpthread))); EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; passthru = diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 6b09cfd59edb..22107e72ef70 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -70,6 +70,10 @@ if test "$noSysDirs" = "1"; then # gcj in. unset LIBRARY_PATH unset CPATH + if test -z "$crossStageStatic"; then + EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib" + fi else if test -z "$NIX_CC_CROSS"; then EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" @@ -86,16 +90,15 @@ if test "$noSysDirs" = "1"; then extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" - glibc_libdir="$glibc_dir/lib" - glibc_devdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc-dev)" - configureFlags="$configureFlags --with-native-system-header-dir=$glibc_devdir/include" - # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS="$glibc_devdir/include" + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" + glibc_libdir="$glibc_dir/lib" + configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include" extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 4a4ec5d9fe9c..823e50e32272 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -2,7 +2,6 @@ # Passed by version specific builders , baseVersion, revision, sha256 , extraConfigureFlags ? "" -, postPatch ? null , ... }: @@ -18,7 +17,6 @@ stdenv.mkDerivation rec { ]; inherit sha256; }; - inherit postPatch; buildInputs = [ python bzip2 zlib gmp openssl boost ]; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index d952b50aeb8e..dd185f21035d 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -5,5 +5,4 @@ callPackage ./generic.nix (args // { revision = "29"; sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176"; openssl = null; - postPatch = "sed '1i#include ' -i src/tests/test_bigint.cpp"; }) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 63eb086b0fb1..78a8756b59b4 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in ''; - nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; # HACK, see #10874 (and 14664) + buildInputs = [ xz xz.bin libiconv ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh new file mode 100644 index 000000000000..85f27c7b3559 --- /dev/null +++ b/pkgs/development/libraries/glibc/builder.sh @@ -0,0 +1,58 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS + + # Apparently --bindir is not respected. + makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") +} + +postInstall() { + if test -n "$installLocales"; then + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales + fi + + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache + + if test -n "$linuxHeaders"; then + # Include the Linux kernel headers in Glibc, except the `scsi' + # subdirectory, which Glibc provides itself. + (cd $dev/include && \ + ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .) + fi + + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink + # "lib64" to "lib". + if test -n "$is64bit"; then + ln -s lib $out/lib64 + fi + + # Get rid of more unnecessary stuff. + rm -rf $out/var $out/sbin/sln + + for i in $out/lib/*.a; do + strip -S "$i" + done + # Put libraries for static linking in a separate output. Note + # that libc_nonshared.a and libpthread_nonshared.a are required + # for dynamically-linked applications. + mkdir -p $static/lib + mv $out/lib/*.a $static/lib + mv $static/lib/lib*_nonshared.a $out/lib + + # Work around a Nix bug: hard links across outputs cause a build failure. + cp $bin/bin/getconf $bin/bin/getconf_ + mv $bin/bin/getconf_ $bin/bin/getconf +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index e90fdc4ad7bd..a189edb9832d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation ({ ./glob-simplify-interface.patch ./cve-2016-1234.patch ./cve-2016-3706.patch - ./fix_warnings.patch ]; postPatch = diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 0ea6b4b938b2..80fc2ce1e93d 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -17,21 +17,7 @@ in inherit lib stdenv fetchurl linuxHeaders installLocales profilingLibraries gccCross withGd gd libpng; - NIX_NO_SELF_RPATH = true; - - postConfigure = '' - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS - - # Apparently --bindir is not respected. - makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") - ''; + builder = ./builder.sh; # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new @@ -40,7 +26,7 @@ in # Building from a proper gcc staying in the path where it was installed, # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. - preInstall = '' + preInstall = if cross != null then "" else '' if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 @@ -49,41 +35,6 @@ in fi ''; - postInstall = '' - if test -n "$installLocales"; then - make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - if test -n "$linuxHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $dev/include && \ - ln -sv $(ls -d $linuxHeaders/include/* | grep -v scsi\$) .) - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # Get rid of more unnecessary stuff. - rm -rf $out/var $out/sbin/sln - - # Put libraries for static linking in a separate output. Note - # that libc_nonshared.a and libpthread_nonshared.a are required - # for dynamically-linked applications. - mkdir -p $static/lib - mv $out/lib/*.a $static/lib - mv $static/lib/lib*_nonshared.a $out/lib - - # Work around a Nix bug: hard links across outputs cause a build failure. - cp $bin/bin/getconf $bin/bin/getconf_ - mv $bin/bin/getconf_ $bin/bin/getconf - ''; - separateDebugInfo = true; meta.description = "The GNU C Library"; @@ -111,10 +62,6 @@ in dontStrip=1 ''; - preInstall = null; # clobber the native hook - - separateDebugInfo = false; # this is currently broken for crossDrv - # To avoid a dependency on the build system 'bash'. preFixup = '' rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} diff --git a/pkgs/development/libraries/glibc/fix_warnings.patch b/pkgs/development/libraries/glibc/fix_warnings.patch deleted file mode 100644 index fd75c18c84ec..000000000000 --- a/pkgs/development/libraries/glibc/fix_warnings.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/stdlib/setenv.c 2016-05-30 11:09:14.487180254 +0000 -+++ b/stdlib/setenv.c 2016-05-30 11:08:25.560390748 +0000 -@@ -277,6 +277,7 @@ - - ep = __environ; - if (ep != NULL) -+ { - while (*ep != NULL) - if (!strncmp (*ep, name, len) && (*ep)[len] == '=') - { -@@ -290,6 +291,7 @@ - } - else - ++ep; -+ } - - UNLOCK; - ---- a/nis/nis_call.c 2016-05-30 08:05:59.359855696 -0700 -+++ b/nis/nis_call.c 2016-05-30 08:05:55.679873221 -0700 -@@ -680,6 +680,7 @@ - /* Choose which entry should be evicted from the cache. */ - loc = &nis_server_cache[0]; - if (*loc != NULL) -+ { - for (i = 1; i < 16; ++i) - if (nis_server_cache[i] == NULL) - { -@@ -690,6 +691,7 @@ - || ((*loc)->uses == nis_server_cache[i]->uses - && (*loc)->expires > nis_server_cache[i]->expires)) - loc = &nis_server_cache[i]; -+ } - old = *loc; - *loc = new; - diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 78644200e0b1..332ca526b6ba 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ] ++ optionals (!libOnly) [ openldap libedit ]; - patches = [ ./path_char_fix.patch ]; - preConfigure = "cd ./src"; buildPhase = optionalString libOnly '' diff --git a/pkgs/development/libraries/kerberos/path_char_fix.patch b/pkgs/development/libraries/kerberos/path_char_fix.patch deleted file mode 100644 index 2a6dc4c11c37..000000000000 --- a/pkgs/development/libraries/kerberos/path_char_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -See https://github.com/krb5/krb5/pull/467 -diff --git a/src/include/Makefile.in b/src/include/Makefile.in -index 4bb11e4..cb4b44b 100644 ---- a/src/include/Makefile.in -+++ b/src/include/Makefile.in -@@ -57,19 +57,19 @@ SBINDIR = @sbindir@ - LIBDIR = @libdir@ - SYSCONFCONF = @SYSCONFCONF@ - --PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ -- -e "s+@PREFIX+$(INSTALL_PREFIX)+" \ -- -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \ -- -e "s+@BINDIR+$(BINDIR)+" \ -- -e "s+@LIBDIR+$(LIBDIR)+" \ -- -e "s+@SBINDIR+$(SBINDIR)+" \ -- -e "s+@MODULEDIR+$(MODULE_DIR)+" \ -- -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \ -- -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ -- -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \ -- -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \ -- -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \ -- -e 's+@SYSCONFCONF+$(SYSCONFCONF)+' -+PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \ -+ -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \ -+ -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \ -+ -e "s\"@BINDIR\"$(BINDIR)\"" \ -+ -e "s\"@LIBDIR\"$(LIBDIR)\"" \ -+ -e "s\"@SBINDIR\"$(SBINDIR)\"" \ -+ -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \ -+ -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \ -+ -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \ -+ -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \ -+ -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \ -+ -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \ -+ -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\"" - - OSCONFSRC = $(srcdir)/osconf.hin - diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 12588617d4a1..623256bb6b7b 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { }; doCheck = true; - + # For cross-compiling, native glibc is needed for the "gencat" program. crossAttrs = { - nativeBuildInputs = [ gettext glibc ]; + nativeBuildInputs = [ glibc ]; }; # Libelf's custom NLS macros fail to determine the catalog file extension on @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # FIXME: Eventually make Gettext a build input on all platforms. configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls"; - nativeBuildInputs = [ gettext ]; + buildInputs = [ gettext ]; meta = { description = "ELF object file access library"; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 7087142a2aa9..7cfccfe05f74 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { name = "libxkbcommon-0.6.1"; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; - configureFlags = [ - "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" - "--with-x-locale-root=${libX11.out}/share/X11/locale" - ]; + configureFlags = '' + --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb + ''; preBuild = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/,--version-script=.*$//' Makefile diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 4ba366be56f0..e3c5d7573107 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093"; }; - postPatch = "sed '1i#include ' -i src/tree/param.h"; - enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index efbb1e737876..a67ea51f5a9b 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -46,15 +46,16 @@ wrapPythonProgramsIn() { # wrapProgram creates the executable shell script described # above. The script will set PYTHONPATH and PATH variables.! # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - local -a wrap_args=("$f" - --prefix PYTHONPATH ':' "$program_PYTHONPATH" - --prefix PATH ':' "$program_PATH:$dir/bin") + local wrap_args="$f \ + --prefix PYTHONPATH ':' $program_PYTHONPATH \ + --prefix PATH ':' $program_PATH:$dir/bin" # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. - local -a user_args="($makeWrapperArgs)" - local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") - wrapProgram "${wrapProgramArgs[@]}" + for arg in $makeWrapperArgs; do + wrap_args="$wrap_args $arg" + done + wrapProgram $wrap_args fi fi done diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 84ab79879b41..926aaeb94ccc 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { sha256 = "03fl2wgbc1cilaw8hrhfqjsbpi05cid6k4cr3s2vmv5gx0dnrgy4"; }; - postPatch = '' + patchPhase = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' - sed '7i#include ' -i src/Scheduler.cc patchShebangs . ''; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index a4f1a96c6a4c..510a0679527e 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -3,7 +3,7 @@ , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, fetchpatch }: +, rpm, dpkg, cdrkit }: with stdenv; @@ -70,12 +70,6 @@ in releaseTools.nixBuild rec { sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl"; }; - patches = [(fetchpatch { - name = "cmath.diff"; - url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337 - sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0"; - })]; - buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b46114ec62be..3956c994531e 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { sed -i Makefile \ -e 's,-Werror,,g' \ -e 's,\(DATA_PREFIX=$(PREFIX)/share/\)cataclysm-dda/,\1,g' - - sed '1i#include ' \ - -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp ''; makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 1ee0f829571d..3d3b1c4d9aa8 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -39,7 +39,6 @@ in stdenv.mkDerivation rec { }; patches = [ ./use-system-libraries.patch ]; - postPatch = "sed '1i#include ' -i plugins/3dveins.cpp"; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # we can't use native Lua; upstream uses private headers diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 5b2327c2ff54..1d6ea1196dab 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i"; }; - postPatch = "sed '1i#include ' -i g_src/ttf_manager.cpp"; - cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 143fa21ce2e5..2203bb6337eb 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -16,11 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan(" substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan(" - substituteInPlace Sources/Draw/SWMapRenderer.cpp \ - --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf(" - sed '1i#include ' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \ - -i Sources/Draw/SWMapRenderer.cpp - sed '1i#include ' -i Sources/Draw/SWFeatureLevel.h + substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf(" ''; nativeBuildInputs = diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix index 7d76573f7345..8212f160cda8 100644 --- a/pkgs/games/openspades/git.nix +++ b/pkgs/games/openspades/git.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn"; }; - postPatch = "sed '1i#include ' -i Sources/Client/{,Client}Player.cpp"; - nativeBuildInputs = with stdenv.lib; [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 68114bb75652..7cd54b1b65b3 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -10,13 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; }; - postPatch = "sed '1i#include ' -i src/model/World.h"; - buildInputs = [ qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake gettext ]; - enableParallelBuilding = true; installPhase = '' make DESTDIR=.. install diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 77392913cb1a..1395e3ac3efe 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { }; patches = [ ./0001-change-flags.diff ]; - postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp"; buildInputs = [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ]; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 673e4c3ed087..1b95bca643c7 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691"; }; - postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; - configurePhase = '' mkdir -p build cd build @@ -52,8 +50,6 @@ stdenv.mkDerivation rec { soundtouch wxGTK30 zlib ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Playstation 2 emulator"; longDescription= '' diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 82e088b76c20..8296ec62c5b2 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - postPatch = '' - sed '1i#include ' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp - ''; cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 8b8d1ba0ae16..ffcd507653a0 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -11,13 +11,6 @@ stdenv.mkDerivation rec { sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; }; - postPatch = '' - substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash - substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash - sed '1i#include ' -i arangod/Aql/Functions.cpp \ - -i lib/Basics/string-buffer.cpp - ''; - buildInputs = [ openssl zlib python gyp go readline ]; @@ -26,6 +19,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + + patchPhase = '' + substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash + substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5b50167d9b9f..85e74461d2a4 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -827,10 +827,6 @@ showPhaseHeader() { genericBuild() { - if [ -f "$buildCommandPath" ]; then - . "$buildCommandPath" - return - fi if [ -n "$buildCommand" ]; then eval "$buildCommand" return diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 16099dfb3d39..d6e024c62583 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -5,7 +5,7 @@ let buildFor = toolsArch: ( let pkgsFun = import ../../..; pkgsNoParams = pkgsFun {}; - + sheevaplugCrossSystem = { crossSystem = rec { config = "armv5tel-unknown-linux-gnueabi"; @@ -18,10 +18,10 @@ let openssl.system = "linux-generic32"; }; }; - + raspberrypiCrossSystem = { crossSystem = rec { - config = "armv6l-unknown-linux-gnueabi"; + config = "armv6l-unknown-linux-gnueabi"; bigEndian = false; arch = "arm"; float = "hard"; @@ -33,10 +33,10 @@ let inherit (platform) gcc; }; }; - + armv7l-hf-multiplatform-crossSystem = { crossSystem = rec { - config = "armv7l-unknown-linux-gnueabi"; + config = "armv7l-unknown-linux-gnueabi"; bigEndian = false; arch = "arm"; float = "hard"; @@ -48,7 +48,7 @@ let inherit (platform) gcc; }; }; - + selectedCrossSystem = if toolsArch == "armv5tel" then sheevaplugCrossSystem else if toolsArch == "armv6l" then raspberrypiCrossSystem else @@ -91,13 +91,13 @@ rec { coreutilsMinimal = (pkgs.coreutils.override (args: { aclSupport = false; })).crossDrv; - + curlMinimal = (pkgs.curl.override { zlibSupport = false; sslSupport = false; scpSupport = false; }).crossDrv; - + busyboxMinimal = (pkgs.busybox.override { # TBD: uClibc is broken. # useUclibc = true; @@ -113,10 +113,10 @@ rec { CONFIG_UNXZ y ''; }).crossDrv; - + inherit pkgs; - build = + build = stdenv.mkDerivation { name = "build"; @@ -126,7 +126,7 @@ rec { crossConfig = stdenv.cross.config; buildCommand = '' - set -x + set -x mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. @@ -142,20 +142,20 @@ rec { cp -d ${glibc.out}/lib/libnss*.so* $out/lib cp -d ${glibc.out}/lib/libresolv*.so* $out/lib cp -d ${glibc.out}/lib/crt?.o $out/lib - + cp -rL ${glibc.dev}/include $out chmod -R u+w $out/include - + # Hopefully we won't need these. rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video find $out/include -name .install -exec rm {} \; find $out/include -name ..install.cmd -exec rm {} \; mv $out/include $out/include-glibc - + # Copy coreutils, bash, etc. cp ${coreutilsMinimal}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - + cp ${bash}/bin/bash $out/bin cp ${findutils}/bin/find $out/bin cp ${findutils}/bin/xargs $out/bin @@ -174,7 +174,7 @@ rec { cp -d ${curlMinimal}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep - + # Copy what we need of GCC. cp -d ${gcc}/bin/gcc $out/bin cp -d ${gcc}/bin/cpp $out/bin @@ -203,12 +203,12 @@ rec { cp -d ${libmpc}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib - + # TBD: Why are these needed for cross but not native tools? cp -d ${cloogppl}/lib/libcloog*.so* $out/lib cp -d ${cloog}/lib/libcloog*.so* $out/lib cp -d ${isl}/lib/libisl*.so* $out/lib - + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin @@ -216,7 +216,7 @@ rec { cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out - + # Strip executables even further. for i in $out/bin/* $out/libexec/gcc/*/*/*; do if test -x $i -a ! -L $i; then diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 37bc1831d5b1..f99c14720760 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, flex, libxml2, libxslt -, docbook_xml_dtd_45, docbook_xsl, w3m +, docbook_xml_dtd_42, docbook_xsl, w3m , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.28"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ]; + buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ]; postInstall = '' wrapProgram "$out/bin/xmlto" \ -- cgit 1.4.1 From 21253ac835166b6204f1b8ee7bea13d797c0ce00 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 5 May 2016 11:38:33 +0300 Subject: lcov: 1.10 -> 1.12; maintain --- pkgs/development/tools/analysis/lcov/default.nix | 21 ++------- .../tools/analysis/lcov/freebsd-install.patch | 13 ------ .../tools/analysis/lcov/lcov-except-unreach.patch | 13 ------ .../tools/analysis/lcov/no-warn-missing.patch | 54 ---------------------- 4 files changed, 5 insertions(+), 96 deletions(-) delete mode 100644 pkgs/development/tools/analysis/lcov/freebsd-install.patch delete mode 100644 pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch delete mode 100644 pkgs/development/tools/analysis/lcov/no-warn-missing.patch (limited to 'pkgs/development/tools/analysis') diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 10cdf01103a6..daefafa9e6af 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,31 +1,20 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "lcov-1.10"; + name = "lcov-1.12"; src = fetchurl { url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "13xq2ln4jjasslqzzhr5g11q1c19gwpng1jphzbzmylmrjz62ila"; + sha256 = "19wfifdpxxivhq9adbphanjfga9bg9spms9v7c3589wndjff8x5l"; }; - patches = - [ ./lcov-except-unreach.patch ./no-warn-missing.patch ] - ++ stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch; + buildInputs = [ perl ]; preBuild = '' + patchShebangs bin/ makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man) ''; - preInstall = '' - substituteInPlace bin/install.sh --replace /bin/bash $shell - ''; - - postInstall = '' - for i in "$out/bin/"*; do - substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl - done - ''; - meta = with stdenv.lib; { description = "Code coverage tool that enhances GNU gcov"; @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://ltp.sourceforge.net/coverage/lcov.php; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ maintainers.mornfall ]; + maintainers = with maintainers; [ dezgeg mornfall ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/analysis/lcov/freebsd-install.patch b/pkgs/development/tools/analysis/lcov/freebsd-install.patch deleted file mode 100644 index 7ca2608cf5ef..000000000000 --- a/pkgs/development/tools/analysis/lcov/freebsd-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -FreeBSD's `install' doesn't support `-D'. Thus, use GNU install instead, -since `stdenv-native' assumes that `ginstall' is available. - ---- lcov-1.9/bin/install.sh 2010-08-06 13:05:17.000000000 +0200 -+++ lcov-1.9/bin/install.sh 2012-03-02 16:53:28.000000000 +0100 -@@ -34,6 +34,6 @@ - local TARGET=$2 - local PARAMS=$3 - -- install -p -D $PARAMS $SOURCE $TARGET -+ ginstall -p -D $PARAMS $SOURCE $TARGET - } - diff --git a/pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch b/pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch deleted file mode 100644 index 6c8d8664d02b..000000000000 --- a/pkgs/development/tools/analysis/lcov/lcov-except-unreach.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://ltp.cvs.sourceforge.net/viewvc/ltp/utils/analysis/lcov/bin/geninfo?r1=1.117&r2=1.118&view=patch - ---- a/bin/geninfo 2012/10/10 08:36:16 1.117 -+++ b/bin/geninfo 2012/11/13 09:58:53 1.118 -@@ -1833,7 +1833,7 @@ - push(@result, 0); - } else { - # Check for zero count -- if ($count eq "#####") { -+ if ($count =~ /^[#=]/) { - $count = 0; - } - push(@result, 1); diff --git a/pkgs/development/tools/analysis/lcov/no-warn-missing.patch b/pkgs/development/tools/analysis/lcov/no-warn-missing.patch deleted file mode 100644 index fa1f476fba0f..000000000000 --- a/pkgs/development/tools/analysis/lcov/no-warn-missing.patch +++ /dev/null @@ -1,54 +0,0 @@ -http://ltp.cvs.sourceforge.net/viewvc/ltp/utils/analysis/lcov/bin/geninfo?view=log - ---- a/bin/geninfo 2013/01/10 09:02:32 1.119 -+++ b/bin/geninfo 2013/02/22 14:09:08 1.120 -@@ -864,7 +864,6 @@ - my $source; # gcov source header information - my $object; # gcov object header information - my @matches; # List of absolute paths matching filename -- my @unprocessed; # List of unprocessed source code files - my $base_dir; # Base directory for current file - my @tmp_links; # Temporary links to be cleaned up - my @result; -@@ -1060,7 +1059,6 @@ - - # Traverse the list of generated .gcov files and combine them into a - # single .info file -- @unprocessed = keys(%{$instr}); - foreach $gcov_file (sort(@gcov_list)) - { - my $i; -@@ -1143,16 +1141,6 @@ - \@matches, \@gcov_content); - } - -- # Remove processed file from list -- for ($index = scalar(@unprocessed) - 1; $index >= 0; $index--) -- { -- if ($unprocessed[$index] eq $source_filename) -- { -- splice(@unprocessed, $index, 1); -- last; -- } -- } -- - # Skip external files if requested - if (!$opt_external) { - if (is_external($source_filename)) { -@@ -1297,16 +1285,6 @@ - unlink($gcov_file); - } - -- # Check for files which show up in the graph file but were never -- # processed -- if (@unprocessed && @gcov_list) -- { -- foreach (@unprocessed) -- { -- warn("WARNING: no data found for $_\n"); -- } -- } -- - if (!($output_filename && ($output_filename eq "-"))) - { - close(INFO_HANDLE); -- cgit 1.4.1 From 42c91dd1d8f251dbbb021ce003dba564ed200706 Mon Sep 17 00:00:00 2001 From: Danny Arnold Date: Sun, 10 Jul 2016 14:02:21 +0200 Subject: flow: 0.22.1 -> 0.28.0 (#16827) --- pkgs/development/tools/analysis/flow/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/tools/analysis') diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index e0802f9850bf..2cff523323f6 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, git, mercurial }: with lib; stdenv.mkDerivation rec { - version = "0.22.1"; + version = "0.28.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "11d04g8rvjv2q79pmrjjx8lmmm1ix8kih7wc0adln0ap5123ph46"; + sha256 = "1xryv1366zc385r82r6n832xkaqcm63zs1baizl02qchfzfa3am2"; }; installPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml libelf ] + buildInputs = [ ocaml libelf git mercurial ] # git and mercurial are necessary because of https://github.com/facebook/flow/issues/1981 ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { -- cgit 1.4.1