public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cleaned up a lot of description fields that contained newlines.

Browse Source 
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
This commit is contained in:
Eelco Dolstra
2009-03-03 13:27:40 +00:00
parent 9efba4b3b0
commit fcad0b0a5a
104 changed files with 348 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/fpc/binary.nix
View File

@@ -1,17 +1,16 @@
args: with args;
stdenv.mkDerivation {
name = "fpc-2.2.2-binary";
src = fetchurl {
url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar;
sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5";
};
url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar;
sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5";
};
builder = ./binary-builder.sh;
meta = {
description = "
Free Pascal Compiler from a binary distribution.
";
description = "Free Pascal Compiler from a binary distribution";
};
}

36
pkgs/development/compilers/fpc/default.nix
View File

@@ -1,31 +1,37 @@
args:
if ((args ? startFPC) && (args.startFPC != null))
then
if args ? startFPC && args.startFPC != null then
with args;
stdenv.mkDerivation {
name = "fpc-2.2.2";
src = fetchurl {
url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz;
sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1";
};
url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz;
sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1";
};
buildInputs = [startFPC gawk];
preConfigure = (if system == "i686-linux" || system == "x86_64-linux" then ''
sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "");
preConfigure =
if system == "i686-linux" || system == "x86_64-linux" then ''
sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
makeFlags = "NOGDB=1";
installFlags = "INSTALL_PREFIX=\${out}";
postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin;
mkdir -p $out/lib/fpc/etc/ ;
$out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/;";
postInstall = ''
ln -fs $out/lib/fpc/*/ppc386 $out/bin
mkdir -p $out/lib/fpc/etc/
$out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/
'';
meta = {
description = "
Free Pascal Compiler from a source distribution.
";
description = "Free Pascal Compiler from a source distribution";
};
} else (import ./default.nix (args // {startFPC = (import ./binary.nix args);}))
}
else (import ./default.nix (args // {startFPC = (import ./binary.nix args);}))

8
pkgs/development/compilers/gcc-upc-4.0/default.nix
View File

@@ -52,8 +52,10 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.intrepid.com/upc.html;
license = "GPL/LGPL";
description = ''A GCC-based compiler for the Unified Parallel C (UPC)
language, a distributed shared memory aware variant of
C (see http://upc.gwu.edu/).'';
longDscription = ''
A GCC-based compiler for the Unified Parallel C (UPC) language,
a distributed shared memory aware variant of C (see
http://upc.gwu.edu/).
'';
};
}

4
pkgs/development/compilers/qi/9.1.nix
View File

@@ -31,9 +31,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [allBuild doForceShare doPropagate]);
meta = {
description = "
Qi - next generation on top of Common Lisp.
";
description = "Qi - next generation on top of Common Lisp";
inherit src;
};
}

3
pkgs/development/guile-modules/guile-lib/default.nix
View File

@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
description = ''Guile-Library, a collection of useful Guile
Scheme modules'';
description = "Guile-Library, a collection of useful Guile Scheme modules";
homepage = http://home.gna.org/guile-lib/;
license = "GPL";
};

11
pkgs/development/libraries/SDL_image/default.nix
View File

@@ -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";
};
})
}

11
pkgs/development/libraries/SDL_mixer/default.nix
View File

@@ -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";
};
})
}

11
pkgs/development/libraries/SDL_net/default.nix
View File

@@ -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";
};
})
}

15
pkgs/development/libraries/SDL_ttf/default.nix
View File

@@ -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";
};
}

12
pkgs/development/libraries/chmlib/default.nix
View File

@@ -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";
};
}

4
pkgs/development/libraries/fftw/default.nix
View File

@@ -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;
};
}

8
pkgs/development/libraries/libao/default.nix
View File

@@ -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";
};

2
pkgs/development/libraries/libcv/default.nix
View File

@@ -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";
};

6
pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
View File

@@ -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;
};
}

6
pkgs/development/libraries/libdbi/0.8.2.nix
View File

@@ -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;
};
}

6
pkgs/development/libraries/libextractor/0.5.18.nix
View File

@@ -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;
};
}

24
pkgs/development/libraries/libksba/default.nix
View File

@@ -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";
};
}

5
pkgs/development/libraries/libmad/default.nix
View File

@@ -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";
};
}

3
pkgs/development/libraries/liboil/0.3.13.nix
View File

@@ -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";
};
}

3
pkgs/development/libraries/liboil/0.3.15.nix
View File

@@ -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";
};
}

14
pkgs/development/libraries/libwmf/default.nix
View File

@@ -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";
};
}

27
pkgs/development/libraries/lzo/default.nix
View File

@@ -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;
};
}

12
pkgs/development/libraries/mpich2/default.nix
View File

@@ -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";
};

4
pkgs/development/python-modules/pygame/default.nix
View File

@@ -41,8 +41,6 @@ stdenv.mkDerivation {
installPhase = "yes Y | python setup.py install --prefix=\${out} ";
meta = {
description = "
Python library for games.
";
description = "Python library for games";
};
}

3
pkgs/development/python-modules/pyxml/default.nix
View File

@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = ''The PyXML package is a collection of libraries to process
XML with Python.'';
description = "A collection of libraries to process XML with Python";
homepage = http://pyxml.sourceforge.net/;
};
}

3
pkgs/development/tools/guile/guile-lint/default.nix
View File

@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
description = ''Guile-Lint checks syntax and semantics in a
Guile program or module.'';
description = "Guile-Lint checks syntax and semantics in a Guile program or module";
homepage = http://www.geocities.com/user42_kevin/guile-lint/index.html;
license = "GPL";
};

4
pkgs/development/tools/misc/indent/2.2.9.nix
View File

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]);
meta = {
description = "
GNU Indent - a source text formatter.
";
description = "GNU Indent - a source text formatter";
inherit src;
};
}

4
pkgs/development/tools/misc/intltool/0.36.2.nix
View File

@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
doPropagate doForceShare]);
inherit propagatedBuildInputs;
meta = {
description = "
Internalization tool for XML.
";
description = "Internalization tool for XML";
inherit src;
};
}

4
pkgs/development/tools/misc/intltool/0.40.5.nix
View File

@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
doPropagate doForceShare]);
inherit propagatedBuildInputs;
meta = {
description = "
Internalization tool for XML.
";
description = "Internalization tool for XML";
inherit src;
};
}

4
pkgs/development/tools/misc/ltrace/0.5-3deb.nix
View File

@@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [preBuild preConfigure doConfigure doMakeInstall doForceShare]);
meta = {
description = "
Library call tracer.
";
description = "Library call tracer";
inherit src;
};
}