* stdenv branch: synced with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13785

14 files changed, 253 insertions, 34 deletions

diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
new file mode 100644
index 00000000000..97293176c6b
--- /dev/null
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, pkgconfig, fuse, perl}:
+
+stdenv.mkDerivation {
+  name = "cromfs-1.5.6.2";
+  src = fetchurl {
+    url = http://bisqwit.iki.fi/src/arch/cromfs-1.5.6.2.tar.bz2;
+    sha256 = "bbe5db623d3c0d2b92fe877d8c8e22a8f8d84210739313bf691d42c05406464d";
+  };
+
+  patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure; set -x'';
+
+
+  meta = {
+    description = "FUSE Compressed ROM filesystem with lzma"  ;
+	  homepage = http://bisqwit.iki.fi/source/cromfs.html;
+  };
+  
+  installPhase = ''
+    install -d $out/bin
+    install cromfs-driver $out/bin
+    install cromfs-driver-static $out/bin
+    install util/cvcromfs $out/bin
+    install util/mkcromfs $out/bin
+    install util/unmkcromfs $out/bin
+  '';
+
+  buildInputs = [pkgconfig fuse perl];
+}
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
new file mode 100644
index 00000000000..8febdb18d15
--- /dev/null
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, zlib, bzip2, openssl}:
+
+stdenv.mkDerivation {
+  name = "dar-2.3.8";
+  src = fetchurl {
+    url = mirror://sourceforge/dar/dar-2.3.8.tar.gz;
+    md5 = "6c0d383c22df0e1816e860153f60d746";
+  };
+
+  meta = {
+	  homepage = http://dar.linux.free.fr/;
+	  description = "Disk ARchiver, allows backing up files into indexed archives";
+  };
+
+  buildInputs = [zlib bzip2 openssl];
+}
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
index 03ef0c0cad5..7e5bb44764c 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/pkgs/tools/cd-dvd/cdrkit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, libcap, zlib, bzip2}:
 
-stdenv.mkDerivation {
-  name = "cdrkit-1.1.8";
+stdenv.mkDerivation rec {
+  name = "cdrkit-1.1.9";
 
   src = fetchurl {
-    url = http://cdrkit.org/releases/cdrkit-1.1.8.tar.gz;
-    sha256 = "0dzj89swc5h9jr6rr9y6cq6742gc1sdfaivz8r26yfmv5ajx104x";
+    url = "http://cdrkit.org/releases/${name}.tar.gz";
+    sha256 = "18pgak1qh2xsb3sjikfh1hqn27v2ax72nx7r7sjkdw5yqys8mmfm";
   };
 
   buildInputs = [cmake libcap zlib bzip2];
@@ -14,7 +14,19 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools";
+
+    longDescription = ''
+      Cdrkit is a suite of programs for recording CDs and DVDs,
+      blanking CD-RW media, creating ISO-9660 filesystem images,
+      extracting audio CD data, and more.  The programs included in
+      the cdrkit package were originally derived from several sources,
+      most notably mkisofs by Eric Youngdale and others, cdda2wav by
+      Heiko Eissfeldt, and cdrecord by Jörg Schilling.  However,
+      cdrkit is not affiliated with any of these authors; it is now an
+      independent project.
+    '';
+    
     homepage = http://cdrkit.org/;
-    license = "GPL2";
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 31ee5e70e8b..e0c35d63f72 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoconf, automake}:
 
 stdenv.mkDerivation {
-  name = "grub-0.97-patch-1.7";
+  name = "grub-0.97-patch-1.9";
   
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
@@ -11,10 +11,10 @@ stdenv.mkDerivation {
   # Lots of patches from Gentoo, in particular splash screen support
   # (not the fancy SUSE gfxmenu stuff though).  Also a fix for boot
   # failures on systems with more than 2 GiB RAM, and for booting from
-  # ext3 filesystems with 256-byte inodes. 
+  # ext3 filesystems with 256-byte inodes as well as ext4 filesystems.
   gentooPatches = fetchurl {
-    url = mirror://gentoo/distfiles/grub-0.97-patches-1.7.tar.bz2;
-    sha256 = "12akcbp1a31pxzsxm01scgir0fqkk8qqqwhs44vzgs2chzzigyvd";
+    url = mirror://gentoo/distfiles/grub-0.97-patches-1.9.tar.bz2;
+    sha256 = "0a20bi2njqdgi0993g9dzjcn9vjzlisp9ghw0dcz00q84v4lb13b";
   };
 
   patches = [
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
new file mode 100644
index 00000000000..6ea12f262b4
--- /dev/null
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl } :
+stdenv.mkDerivation {
+  name = "proxychains-3.1";
+  src = fetchurl {
+    url = mirror://sourceforge/proxychains/proxychains-3.1.tar.gz;
+    sha256 = "9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a";
+  };
+
+  patchPhase = "sed -e s@libproxychains.so@$out/lib/libproxychains.so@ -i proxychains/proxychains";
+
+  meta = {
+    description = "Proxifier for SOCKS proxies.";
+    homepage = http://proxychains.sourceforge.net;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index 80f774e8e5d..f7a8321fe31 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -17,6 +17,22 @@ stdenv.mkDerivation {
     substituteInPlace checkinstallrc-dist --replace /usr/local $out
   '';
 
+  postInstall =
+    if stdenv.isLinux then
+      # Clear the RPATH, otherwise installwatch.so won't work properly
+      # as an LD_PRELOADed library on applications that load against a
+      # different Glibc.
+      ''
+         patchelf --set-rpath "" $out/lib/installwatch.so
+      ''
+    else "";
+
+  patches = [
+    # Necessary for building on x86_64, see
+    # http://checkinstall.izto.org/cklist/msg00256.html
+    ./readlink.patch
+  ];
+
   meta = {
     homepage = http://checkinstall.izto.org/;
     description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'";
diff --git a/pkgs/tools/package-management/checkinstall/readlink.patch b/pkgs/tools/package-management/checkinstall/readlink.patch
new file mode 100644
index 00000000000..f276c057d8f
--- /dev/null
+++ b/pkgs/tools/package-management/checkinstall/readlink.patch
@@ -0,0 +1,40 @@
+--- a/installwatch-0.7.0beta5/installwatch.c	2007-04-07 14:27:23.000000000 -0400
++++ b/installwatch-0.7.0beta5/installwatch.c	2007-04-07 14:25:06.000000000 -0400
+@@ -84,7 +84,7 @@
+ static int (*true_open)(const char *, int, ...);
+ static DIR *(*true_opendir)(const char *);
+ static struct dirent *(*true_readdir)(DIR *dir);
+-static int (*true_readlink)(const char*,char *,size_t);
++static ssize_t (*true_readlink)(const char*,char *,size_t);
+ static char *(*true_realpath)(const char *,char *);
+ static int (*true_rename)(const char *, const char *);
+ static int (*true_rmdir)(const char *);
+@@ -546,7 +546,7 @@
+ 	struct utimbuf timbuf;
+ 	size_t truesz;
+ 	char linkpath[PATH_MAX+1];
+-	size_t linksz;
++	ssize_t linksz;
+ 
+ #if DEBUG
+ 	debug(2,"copy_path(%s,%s)\n",truepath,translroot);
+@@ -1582,7 +1582,7 @@
+ 	struct stat reslvinfo;
+ 	instw_t iw;
+ 	char wpath[PATH_MAX+1];
+-	size_t wsz=0;
++	ssize_t wsz=0;
+ 	char linkpath[PATH_MAX+1];
+ 
+ 
+@@ -2698,8 +2698,8 @@
+ 	return result;
+ }
+ 
+-int readlink(const char *path,char *buf,size_t bufsiz) {
+-	int result;
++ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
++	ssize_t result;
+ 	instw_t instw;
+ 	int status;
+ 
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index ad180c7906f..a55c052b32c 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,14 +4,12 @@
 , supportOldDBs ? true
 }:
 
-let version = "0.13pre13403"; in
-
 stdenv.mkDerivation {
-  name = "nix-${version}";
+  name = "nix-0.13pre13641";
   
   src = fetchurl {
-    url = "http://nixos.org/releases/nix/nix-${version}-a84h5996/nix-${version}.tar.bz2";
-    sha256 = "81169cc6448fff2e1f72464fb537d6db0d386d303869346fea2433b04181cc7b";
+    url = http://hydra.nixos.org/download/546/1/nix-0.13pre13641.tar.bz2;
+    sha256 = "83936327ed7cfa6e6a103764c3f43c780b2727ed804721200811ba999c31c7e1";
   };
 
   buildInputs = [perl curl openssl];
diff --git a/pkgs/tools/security/aefs/default.nix b/pkgs/tools/security/aefs/default.nix
index 972d997e242..8bf52795be2 100644
--- a/pkgs/tools/security/aefs/default.nix
+++ b/pkgs/tools/security/aefs/default.nix
@@ -4,9 +4,14 @@ stdenv.mkDerivation {
   name = "aefs-0.3pre285";
   
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aefs-0.3pre285.tar.bz2;
+    url = http://nixos.org/tarballs/aefs-0.3pre285.tar.bz2;
     sha256 = "1psciqllzm08c21h6k2zxmvmi0grkvaiq177giv1avzzzfhq0z3c";
   };
 
   buildInputs = [fuse];
+
+  meta = {
+    homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/;
+    description = "A cryptographic filesystem implemented in userspace using FUSE";
+  };
 }
diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix
new file mode 100644
index 00000000000..9898d6080ff
--- /dev/null
+++ b/pkgs/tools/security/ccrypt/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation {
+  name = "ccrypt-1.7";
+
+  src = fetchurl {
+    url = mirror://sourceforge/ccrypt/ccrypt-1.7.tar.gz;
+    sha256 = "1bf974c9ee5f20332f0117c5b80784825f505f1a24eb57a10c8195c3ad16540e";
+  };
+  meta = {
+    description = "Utility for encrypting and decrypting files and streams with AES-256";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/tools/security/gnupg2/default.nix b/pkgs/tools/security/gnupg2/default.nix
index 2ac2608ea3c..19fa84ae650 100644
--- a/pkgs/tools/security/gnupg2/default.nix
+++ b/pkgs/tools/security/gnupg2/default.nix
@@ -1,22 +1,37 @@
-# remmeber to
-# echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf
-# and install pinentry as well
+# Remember to install Pinentry and
+# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
+
+{ fetchurl, stdenv, readline, openldap, bzip2, zlib, libgpgerror
+, pth, libgcrypt, libassuan, libksba, libusb, curl }:
 
-args: with args;
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.8";
+  name = "gnupg-2.0.10";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "04v9s92xph1hrhac49yyrgzdwjqshs2zawvjbi3jc2klwjpi1wqn";
+    sha256 = "08yz2kgcnphjml5mhq4bm4dg64jrz79p97nlrlb88ym6p6ybg26l";
   };
 
   buildInputs = [ readline openldap bzip2 zlib libgpgerror pth libgcrypt
     libassuan libksba libusb curl ];
 
+  doCheck = true;
+
   meta = {
-    description = "A free implementation of the OpenPGP standard for encrypting
-	and signing data, v2";
-    homepage = http://www.gnupg.org/;
+    description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard";
+
+    longDescription = ''
+      GnuPG is the GNU project's complete and free implementation of
+      the OpenPGP standard as defined by RFC4880.  GnuPG allows to
+      encrypt and sign your data and communication, features a
+      versatile key managment system as well as access modules for all
+      kind of public key directories.  GnuPG, also known as GPG, is a
+      command line tool with features for easy integration with other
+      applications.  A wealth of frontend applications and libraries
+      are available.  Version 2 of GnuPG also provides support for
+      S/MIME.
+    '';
+
+    homepage = http://gnupg.org/;
   };
 }
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 0981446a58e..2a09167b9ce 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation {
 
-  name = "ts-0.6";
+  name = "ts-0.6.2";
 
   installPhase=''make install "PREFIX=$out"'';
 
-  patchPhase = ''sed -i 's@/usr/bin/install@install@g' Makefile; set -x'';
-
   src = fetchurl {
-    url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.tar.gz;
-    sha256 = "663df09f9a6e6491f7924b1cdf8a5d00546c736ec3f5f1135ccccb83bf4f2ce8";
+    url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.2.tar.gz;
+    sha256 = "6a99b48800658fb7424a76c5756a638a6b6abb2a8a8c129e196bc24a9aeeb5cc";
   };
 
   meta = { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index fde60a4e5f6..060e5d5e2c7 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -1,9 +1,34 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, ghostscript, perl }:
+
+stdenv.mkDerivation rec {
+  name = "groff-1.20.1";
 
-stdenv.mkDerivation {
-  name = "groff-1.19.2";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/groff/groff-1.19.2.tar.gz;
-    md5 = "f7c9cf2e4b9967d3af167d7c9fadaae4";
+    url = "mirror://gnu/groff/${name}.tar.gz";
+    sha256 = "01fq5i68p4s4fc6m8i90y5d28wk1x6zh2mkw85n0qqnb6n0qfidn";
+  };
+
+  buildInputs = [ ghostscript perl ];
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
+
+    longDescription = ''
+      groff is the GNU implementation of troff, a document formatting
+      system.  Included in this release are implementations of troff,
+      pic, eqn, tbl, grn, refer, -man, -mdoc, -mom, and -ms macros,
+      and drivers for PostScript, TeX dvi format, HP LaserJet 4
+      printers, Canon CAPSL printers, HTML and XHTML format (beta
+      status), and typewriter-like devices.  Also included is a
+      modified version of the Berkeley -me macros, the enhanced
+      version gxditview of the X11 xditview previewer, and an
+      implementation of the -mm macros.
+    '';
+
+    homepage = http://www.gnu.org/software/groff/;
+
+    license = "GPLv3+";
   };
 }
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix
new file mode 100644
index 00000000000..a57b5cc594a
--- /dev/null
+++ b/pkgs/tools/text/namazu/default.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, perl }:
+
+stdenv.mkDerivation rec {
+  name = "namazu-2.0.18";
+
+  src = fetchurl {
+    url = "http://namazu.org/stable/${name}.tar.gz";
+    sha256 = "12i5z830yh5sw3087gmna44742gcw2q7lpj6b94k8fj0h45cm26j";
+  };
+
+  buildInputs = [ perl ];
+
+  # First install the `File::MMagic' Perl module.
+  preConfigure = ''
+    ( cd File-MMagic &&				\
+      perl Makefile.PL				\
+        LIB="$out/lib/site_perl/5.10.0"		\
+        INSTALLSITEMAN3DIR="$out/man" &&	\
+      make && make install )
+    export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB"
+  '';
+
+  doCheck = true;
+
+  meta = {
+    description = "Namazu, a full-text search engine";
+
+    longDescription = ''
+      Namazu is a full-text search engine intended for easy use.  Not
+      only does it work as a small or medium scale Web search engine,
+      but also as a personal search system for email or other files.
+    '';
+
+    license = "GPLv2+";
+    homepage = http://namazu.org/;
+  };
+}