From fcad0b0a5a6563453d3793e010af8b11232f64ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Mar 2009 13:27:40 +0000 Subject: * Cleaned up a lot of description fields that contained newlines. Some of these should be longDescriptions, but most others just shouldn't contain newlines. E.g. write description = "Bla"; and not description = '' Bla ''; This pollutes "nix-env -qa --description" output. svn path=/nixpkgs/trunk/; revision=14310 --- pkgs/development/libraries/SDL_image/default.nix | 11 ++++----- pkgs/development/libraries/SDL_mixer/default.nix | 11 ++++----- pkgs/development/libraries/SDL_net/default.nix | 11 ++++----- pkgs/development/libraries/SDL_ttf/default.nix | 15 ++++++------ pkgs/development/libraries/chmlib/default.nix | 12 +++++----- pkgs/development/libraries/fftw/default.nix | 4 +--- pkgs/development/libraries/libao/default.nix | 8 ++++--- pkgs/development/libraries/libcv/default.nix | 2 +- .../libraries/libdbi-drivers/0.8.2-1.nix | 6 ++--- pkgs/development/libraries/libdbi/0.8.2.nix | 6 ++--- pkgs/development/libraries/libextractor/0.5.18.nix | 6 ++--- pkgs/development/libraries/libksba/default.nix | 24 +++++++++---------- pkgs/development/libraries/libmad/default.nix | 5 +--- pkgs/development/libraries/liboil/0.3.13.nix | 3 +-- pkgs/development/libraries/liboil/0.3.15.nix | 3 +-- pkgs/development/libraries/libwmf/default.nix | 14 +++++------ pkgs/development/libraries/lzo/default.nix | 27 ++++++++++++---------- pkgs/development/libraries/mpich2/default.nix | 12 ++++++---- 18 files changed, 84 insertions(+), 96 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index d26213ef7cd..35154e9f945 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,5 +1,6 @@ args: with args; -stdenv.mkDerivation (rec { + +stdenv.mkDerivation rec { pname = "SDL_image"; version = "1.2.6"; @@ -12,11 +13,9 @@ stdenv.mkDerivation (rec { buildInputs = [SDL libpng libjpeg libtiff libungif libXpm]; - postInstall = "ln -s \${out}/include/SDL/SDL_image.h \${out}/include/"; + postInstall = "ln -s $out/include/SDL/SDL_image.h $out/include/"; meta = { - description = " - SDL image library. -"; + description = "SDL image library"; }; -}) +} diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 024fd643be6..bd7b66f21a1 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,5 +1,6 @@ args: with args; -stdenv.mkDerivation (rec { + +stdenv.mkDerivation rec { pname = "SDL_mixer"; version = "1.2.8"; @@ -14,11 +15,9 @@ stdenv.mkDerivation (rec { configureFlags = "--disable-music-ogg-shared"; - postInstall = "ln -s \${out}/include/SDL/SDL_mixer.h \${out}/include/"; + postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/"; meta = { - description = " - SDL multi-channel audio mixer library. -"; + description = "SDL multi-channel audio mixer library"; }; -}) +} diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 7de557322f6..6c8c79d701c 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -1,5 +1,6 @@ args: with args; -stdenv.mkDerivation (rec { + +stdenv.mkDerivation rec { pname = "SDL_net"; version = "1.2.7"; @@ -12,11 +13,9 @@ stdenv.mkDerivation (rec { buildInputs = [SDL]; - postInstall = "ln -s \${out}/include/SDL/SDL_net.h \${out}/include/"; + postInstall = "ln -s $out/include/SDL/SDL_net.h $out/include/"; meta = { - description = " - SDL networking library. -"; + description = "SDL networking library"; }; -}) +} diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index c7a356adc61..29c1df93a50 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,19 +1,18 @@ args: with args; + stdenv.mkDerivation { - name = "SDL_image-1.2.6"; + name = "SDL_ttf-2.0.9"; src = fetchurl { - url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz; - sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l"; - }; + url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz; + sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l"; + }; buildInputs = [SDL freetype]; - postInstall = "ln -s \${out}/include/SDL/SDL_ttf.h \${out}/include/"; + postInstall = "ln -s $out/include/SDL/SDL_ttf.h $out/include/"; meta = { - description = " - SDL image library. -"; + description = "SDL TrueType library"; }; } diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index bd593aaea0a..4f27a133c99 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,16 +1,16 @@ -args: with args; +{stdenv, fetchurl}: stdenv.mkDerivation rec { name = "chmlib-0.39"; + src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j"; + sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j"; }; meta = { - homepage = http://www.jedrea.com/chmlib; - license = "LGPL"; - description = "CHLIB is a library for dealing with Microsoft ITSS/CHM - format files"; + homepage = http://www.jedrea.com/chmlib; + license = "LGPL"; + description = "A library for dealing with Microsoft ITSS/CHM format files"; }; } diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 270d12ac6ab..f3604c7d32f 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation { builder = writeScript "fftw-3.1.2-builder" (textClosure localDefs [doConfigure doMakeInstall doForceShare]); meta = { - description = " - Fastest Fourier Transform in the West library. -"; + description = "Fastest Fourier Transform in the West library"; inherit src; }; } diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index cb42848585b..6411657c6b6 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation { buildInputs = [pkgconfig]; meta = { - description = ''Libao is Xiph.org's cross-platform audio - library that allows programs to output audio - using a simple API on a wide variety of platforms.''; + longDescription = '' + Libao is Xiph.org's cross-platform audio library that allows + programs to output audio using a simple API on a wide variety of + platforms. + ''; homepage = http://xiph.org/ao/; license = "GPL"; }; diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix index 7daa084c8e5..649d0a5728f 100644 --- a/pkgs/development/libraries/libcv/default.nix +++ b/pkgs/development/libraries/libcv/default.nix @@ -26,7 +26,7 @@ rec { ln -s $out/include/opencv/* $out/include '') ["doMakeInstall" "minInit"]; - name = "libcv-" + version; + name = "libcv-0.9.7"; meta = { description = "libcv - computer vision library"; }; diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix index 575d141fcf5..add438d07f1 100644 --- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix +++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix @@ -29,13 +29,11 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "libdbi"+version; + name = "libdbi-"+version; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - DB independent interface to DB; DB drivers (mysql only for now). -"; + description = "DB independent interface to DB; DB drivers (mysql only for now)"; inherit src; }; } diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix index fd7b950c3ce..dd0f2ec1c5f 100644 --- a/pkgs/development/libraries/libdbi/0.8.2.nix +++ b/pkgs/development/libraries/libdbi/0.8.2.nix @@ -11,13 +11,11 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "libdbi"+version; + name = "libdbi-"+version; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - DB independent interface to DB. -"; + description = "DB independent interface to DB"; inherit src; }; } diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix index da3bafd915b..ed56e5ce4fe 100644 --- a/pkgs/development/libraries/libextractor/0.5.18.nix +++ b/pkgs/development/libraries/libextractor/0.5.18.nix @@ -11,13 +11,11 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "libextractor"+version; + name = "libextractor-"+version; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - Libextractor - extracts metadata from files. -"; + description = "A tool to extract metadata from files"; inherit src; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 573064f2889..5ff99341da1 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,19 +1,19 @@ args: with args; + stdenv.mkDerivation rec { - name = "libksba-1.0.2"; + name = "libksba-1.0.2"; - src = fetchurl { - url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2"; - sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh"; - }; + src = fetchurl { + url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2"; + sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh"; + }; - propagatedBuildInputs = [libgpgerror]; + propagatedBuildInputs = [libgpgerror]; - configureFlags = "--enable-shared --disable-static"; + configureFlags = "--enable-shared --disable-static"; - meta = { - homepage = http://www.gnupg.org; - description = "Libksba is a CMS and X.509 access library under - development"; - }; + meta = { + homepage = http://www.gnupg.org; + description = "Libksba is a CMS and X.509 access library under development"; + }; } diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 458945e102d..41408297527 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -7,10 +7,7 @@ stdenv.mkDerivation { sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; - buildInputs = []; - meta = { - description = "MAD, a high-quality, fixed-point, MPEG audio decoder - supporting MPEG-1 and MPEG-2."; + description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; }; } diff --git a/pkgs/development/libraries/liboil/0.3.13.nix b/pkgs/development/libraries/liboil/0.3.13.nix index 3cb6ad6f992..b1425e454fb 100644 --- a/pkgs/development/libraries/liboil/0.3.13.nix +++ b/pkgs/development/libraries/liboil/0.3.13.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://liboil.freedesktop.org; - description = "Liboil is a library of simple functions that are optimized - for various CPUs."; + description = "A library of simple functions that are optimized for various CPUs"; }; } diff --git a/pkgs/development/libraries/liboil/0.3.15.nix b/pkgs/development/libraries/liboil/0.3.15.nix index db068d2dec3..b777a1195f9 100644 --- a/pkgs/development/libraries/liboil/0.3.15.nix +++ b/pkgs/development/libraries/liboil/0.3.15.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://liboil.freedesktop.org; - description = "Liboil is a library of simple functions that are optimized - for various CPUs."; + description = "A library of simple functions that are optimized for various CPUs"; }; } diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index 6f580613b16..7f7d7693182 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,18 +1,16 @@ args: with args; + stdenv.mkDerivation { name = "libwmf-0.2.8.4"; src = fetchurl { - url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz; - sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; - }; + url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz; + sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; + }; - buildInputs = [zlib imagemagick libpng - pkgconfig glib freetype libjpeg libxml2]; + buildInputs = [zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2]; meta = { - description = " - WMF library from wvWare. -"; + description = "WMF library from wvWare"; }; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 64d03c434c2..834b7abf593 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,14 +1,17 @@ -args: with args; +{stdenv, fetchurl}: + stdenv.mkDerivation rec { - name = "lzo-2.02"; - src = fetchurl { - url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1i9g9bdrmyn6546rnck3kkh8nssfaw75m2rxir4sn7bwvnsfryx2"; - }; - configureFlags = "--enable-shared --disable-static"; - meta = { - description = "LZO is a data compresion library which is suitable for - data de-/compression in real-time"; - homepage = http://www.oberhumer.com/opensource/lzo; - }; + name = "lzo-2.02"; + + src = fetchurl { + url = "${meta.homepage}/download/${name}.tar.gz"; + sha256 = "1i9g9bdrmyn6546rnck3kkh8nssfaw75m2rxir4sn7bwvnsfryx2"; + }; + + configureFlags = "--enable-shared --disable-static"; + + meta = { + description = "A data compresion library suitable for real-time data de-/compression"; + homepage = http://www.oberhumer.com/opensource/lzo; + }; } diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index b92eed68bde..7fb0e009f4a 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { name = "mpich2-1.0.6p1"; + src = fetchurl { - url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/" - + name + ".tar.gz"; + url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${name}.tar.gz"; sha256 = "1k0za8951j5fn89ww6bsy9b4yi989zz7bnd8a6acfr8r0yb8z01q"; }; buildInputs = [ python ]; meta = { - description = ''MPICH2 is a free high-performance and portable - implementation of the Message Passing Interface - (MPI) standard, both version 1 and version 2.''; + longDescription = '' + MPICH2 is a free high-performance and portable implementation of + the Message Passing Interface (MPI) standard, both version 1 and + version 2. + ''; homepage = http://www.mcs.anl.gov/mpi/mpich2/; license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license"; }; -- cgit 1.4.1