* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
This commit is contained in:
Eelco Dolstra
2009-03-16 12:45:27 +00:00
339 changed files with 4943 additions and 2370 deletions
+7 -5
View File
@@ -14,11 +14,13 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://bogofilter.sourceforge.net/;
description = ''Bogofilter is a mail filter that classifies mail
as spam or ham (non-spam) by a statistical analysis of
the message's header and content (body). The program is
able to learn from the user's classifications and
corrections. It is based on a Bayesian filter.'';
longDescription = ''
Bogofilter is a mail filter that classifies mail as spam or ham
(non-spam) by a statistical analysis of the message's header and
content (body). The program is able to learn from the user's
classifications and corrections. It is based on a Bayesian
filter.
'';
license = "GPLv2";
};
}
@@ -0,0 +1,10 @@
{stdenv, fetchurl, pkgconfig, glib}:
stdenv.mkDerivation {
name = "desktop-file-utils-0.15";
src = fetchurl {
url = http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.15.tar.gz;
md5 = "2fe8ebe222fc33cd4a959415495b7eed";
};
buildInputs = [ pkgconfig glib ];
}
+2
View File
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
doCheck = true;
patches = [ ./nix-mapping.patch ];
meta = {
description = "GNU Idutils, a text searching utility";
+10
View File
@@ -0,0 +1,10 @@
diff --git a/libidu/id-lang.map b/libidu/id-lang.map
index 7edb860..6dccd28 100644
--- a/libidu/id-lang.map
+++ b/libidu/id-lang.map
@@ -92,3 +92,5 @@ Makefile.* make
*.gz FILTER gzip -d <%s
*.Z FILTER gzip -d <%s
+
+*.nix text
+13 -3
View File
@@ -1,12 +1,22 @@
{stdenv, fetchurl, e2fsprogs, readline}:
stdenv.mkDerivation {
name = "parted-1.8.7";
name = "parted-1.8.8";
src = fetchurl {
url = mirror://gnu/parted/parted-1.8.7.tar.bz2;
sha256 = "0njabfinn1kbkdx80gayqanpammnl28pklli34bymhx1sxn82kk3";
url = mirror://gnu/parted/parted-1.8.8.tar.bz2;
sha256 = "1sn5qcdi4pvxnxz8ryh5p52qmqd72qbk0d0a65pksxf7khd83kfz";
};
buildInputs = [e2fsprogs readline];
preConfigure=''
export CFLAGS=-fgnu89-inline
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fgnu89-inline"
'';
configureFlags = "--without-readline";
meta = {
description = "industrial-strength package for creating, destroying, resizing, checking and copying partitions";
homepage = http://www.gnu.org/software/parted/;
license = "GPLv3";
};
}
+1 -3
View File
@@ -44,9 +44,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Relational FS over FUSE.
";
description = "A relational filesystem on top of FUSE";
inherit src;
};
}
+1 -3
View File
@@ -45,9 +45,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Relational FS over FUSE.
";
description = "A relational filesystem on top of FUSE";
inherit src;
};
}
+15
View File
@@ -0,0 +1,15 @@
{stdenv, fetchurl} :
stdenv.mkDerivation {
name = "remind-3.1.6";
src = fetchurl {
url = http://www.roaringpenguin.com/files/download/remind-03.01.06.tar.gz;
sha256 = "acdf73904c95de55b615d80c7c007abe58d75e41978a16a43333a22583ac7738";
};
meta = {
homepage = http://www.roaringpenguin.com/products/remind;
description = "Sophisticated calendar and alarm program for the console";
license = "GPLv2";
};
}
+1 -3
View File
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Readline wrapper for console programs.
";
description = "Readline wrapper for console programs";
inherit src;
};
}
@@ -0,0 +1,16 @@
{stdenv, fetchurl, perl, perlXMLParser, autoconf, automake, intltool, gettext, desktop_file_utils}:
stdenv.mkDerivation {
name = "system-config-printer-0.9.93";
src = fetchurl {
url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2;
md5 = "b97deae648bc1c5825874d250a9c140c";
};
patchPhase = ''
sed -i -e "s/xmlto/echo xmlto/" Makefile.am # Disable building manual pages
echo > man/system-config-printer.1
echo > man/system-config-printer-applet.1
./bootstrap
'';
buildInputs = [ perl perlXMLParser autoconf automake intltool gettext desktop_file_utils ];
}
+3 -3
View File
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.cgsecurity.org/wiki/TestDisk;
license = "GPL";
description = "
longDescription = ''
TestDisk is a program for data recovery, primarily designed to
help recover lost partitions and/or make non-booting disks
bootable again
";
bootable again.
'';
};
}
+12 -15
View File
@@ -1,4 +1,5 @@
args: with args;
stdenv.mkDerivation {
name = "timidity-2.13.0";
@@ -7,25 +8,21 @@ stdenv.mkDerivation {
sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
};
instruments =
fetchurl {
url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
};
instruments = fetchurl {
url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
};
buildInputs =[alsaLib];
buildInputs = [alsaLib];
config=./timidity.cfg;
postInstall = "mkdir -p \$out/share/timidity/;
cp \$config \$out/share/timidity/timidity.cfg;
tar -xf \$instruments -C \$out/share/timidity/;
";
postInstall = ''
mkdir -p $out/share/timidity/;
cp ${./timidity.cfg} $out/share/timidity/timidity.cfg
tar -xf $instruments -C $out/share/timidity/
'';
meta = {
description = "
TiMidity - software MIDI renderer.
";
description = "A software MIDI renderer";
};
}
+6 -8
View File
@@ -1,18 +1,16 @@
args: with args;
stdenv.mkDerivation {
name = "wv-1.2.4";
src = fetchurl {
url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
};
url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
};
buildInputs = [zlib imagemagick libpng glib
pkgconfig libgsf libxml2 bzip2];
buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2];
meta = {
description = "
Convertor from Microsoft Word formats to human-editable ones.
";
description = "Converter from Microsoft Word formats to human-editable ones";
};
}