* ncurses: added symlinks for bynary packages linked against libncurses. Tested

           with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923

8 files changed, 45 insertions, 25 deletions

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/builder.sh b/pkgs/applications/networking/instant-messengers/pidgin/builder.sh
deleted file mode 100644
index 11c9cd964e1..00000000000
--- a/pkgs/applications/networking/instant-messengers/pidgin/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-configureFlags="\
-  --with-nspr-includes=$nss/include/nspr \
-  --with-nspr-libs=$nss/lib \
-  --with-nss-includes=$nss/include/nss \
-  --with-nss-libs=$nss/lib"
-
-genericBuild
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 21885b6bcd4..e7e58c154f0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -13,25 +13,24 @@
 { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
   GStreamer, startupnotification, gettext,
   perl, perlXMLParser, libxml2, openssl, nss,
-  libXScrnSaver
+  libXScrnSaver, ncurses
 } :
 
 stdenv.mkDerivation {
   name = "pidgin-2.0.1";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/pidgin/pidgin-2.0.1.tar.bz2;
     sha256 = "1z2is5hp77qc5lw200jf0d1rai4gp83q2kl9x06ra026c2591yc0";
   };
 
-  inherit nss;
+  inherit nss ncurses;
   buildInputs = [
     pkgconfig gtk gtkspell aspell
     GStreamer startupnotification gettext
     perl perlXMLParser libxml2 openssl nss
-    libXScrnSaver
+    libXScrnSaver ncurses
   ];
-
+  configureFlags="--with-nspr-includes=${nss}/include/nspr --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include";
   meta = {
     description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client.";
   };
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 34e5735ba1e..31219e0ad0e 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
       rm -vf $out/lib/lib\${lib}.so
       echo \"INPUT(-l\${lib}w)\" > $out/lib/lib\${lib}.so
       ln -svf lib\${lib}w.a $out/lib/lib\${lib}.a
+      ln -svf lib\${lib}w.so.5 $out/lib/lib\${lib}.so.5
     done;
   ";
 }
diff --git a/pkgs/os-specific/linux/device-mapper/default.nix b/pkgs/os-specific/linux/device-mapper/default.nix
index f69a12f3388..2cb8ca3b258 100644
--- a/pkgs/os-specific/linux/device-mapper/default.nix
+++ b/pkgs/os-specific/linux/device-mapper/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, static ? false}:
 
 stdenv.mkDerivation {
-  name = "device-mapper-1.02.13";
+  name = "device-mapper-1.02.20";
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.13.tgz;
-    md5 = "9ab13083a939ceb26ce5da6b625aeb3c";
+    url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.20.tgz;
+    sha256 = "2db8a8d402b6a827c5684919b4013444cb9fad50ab8cf7ca86ade9bea7796b1c";
   };
+  configureFlags = if static then "--enable-static_link" else "";
   # To prevent make install from failing.
   installFlags = "OWNER= GROUP=";
 }
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 2617507268b..e9ee3defe9b 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,12 +1,13 @@
-{stdenv, fetchurl, devicemapper}:
+{stdenv, fetchurl, devicemapper, static ? false}:
 
 stdenv.mkDerivation {
-  name = "lvm2-2.02.17";
+  name = "lvm2-2.02.26";
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.17.tgz;
-    sha256 = "12bbr0rg5cmysmdvz6pv2fz9yhcff3fmivdcy2qaxn4p412255sj";
+    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.26.tgz;
+    sha256 = "6a177953f1a81aff91144b6bea8eb5f73f6139b10bffd5946c22a32f586ab899";
   };
   buildInputs = [devicemapper];
+  configureFlags = if static then "--enable-static_link" else "";
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
 }
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4ab51d72ba6..63013a615e4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2183,8 +2183,8 @@ rec {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-sis-X11R7.2-0.9.3.tar.bz2;
       sha256 = "0szg1rm9fag1889p82ws1yb15yyb6knagncq650mlf2xww116vjq";
     };
-    buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig glproto mesaHeaders fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
+  }) // {inherit glproto mesaHeaders fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
     
   xf86videosisusb = (stdenv.mkDerivation {
     name = "xf86-video-sisusb-0.8.1";
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
new file mode 100644
index 00000000000..72ca4c987c5
--- /dev/null
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation {
+  name = "pwgen-2.05";
+
+  src = fetchurl {
+    url = ftp://ftp.chg.ru/pub/sourceforge/p/pw/pwgen/pwgen-2.05.tar.gz;
+    sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8";
+  };
+  meta = {
+	description = "Small, GPL'ed password generator which creates passwords which can be easily memorized by a human.";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3476cb8838e..d2a9e466f6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -494,6 +494,10 @@ rec {
     inherit (xlibs) libX11;
   };
 
+  pwgen = import ../tools/security/pwgen {
+    inherit stdenv fetchurl;
+  };
+
   qtparted = import ../tools/misc/qtparted {
     inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib qt3;
     inherit (xlibs) libX11 libXext;
@@ -2232,6 +2236,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  devicemapperStatic = lowPrio (appendToName "static" (import ../os-specific/linux/device-mapper {
+    inherit fetchurl stdenv;
+    static = true;
+  }));
+
   dietlibc = import ../os-specific/linux/dietlibc {
     inherit fetchurl glibc;
     # Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works.
@@ -2435,6 +2444,12 @@ rec {
     inherit fetchurl stdenv devicemapper;
   };
 
+  lvm2Static = lowPrio (appendToName "static" (import ../os-specific/linux/lvm2 {
+    inherit fetchurl stdenv;
+    static = true;
+    devicemapper = devicemapperStatic;
+  }));
+
   mdadm = import ../os-specific/linux/mdadm {
     inherit fetchurl stdenv groff;
   };
@@ -2823,7 +2838,7 @@ rec {
   };
 
   pidgin = import ../applications/networking/instant-messengers/pidgin {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext ncurses;
     inherit (gtkLibs) gtk;
     inherit (gnome) startupnotification;
     inherit (xlibs) libXScrnSaver;