svn merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=29475

pkgs/applications/audio/spotify/default.nix

@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.5.2.84"; in
+let version = "0.6.1.309"; in
 
 stdenv.mkDerivation {
   name = "spotify-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_i386.deb";
-        sha256 = "0l1pvvkkssng0yc7zlgxr39jx3cs6i71sspmm4xb84y1bl045pas";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb";
+        sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g6d797eb-1_amd64.deb";
-        sha256 = "1wi1z3dyzjz13mkb0r2ilm914p8sg06923sv872nclrl102qbbni";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb";
+        sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs";
       }
     else throw "Spotify not supported on this platform.";
 
@@ -31,9 +31,15 @@ stdenv.mkDerivation {
       mv $out/usr/* $out/
       rmdir $out/usr
 
+      # Work around Spotify referring to a specific minor version of
+      # OpenSSL.
+      mkdir $out/lib
+      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
+      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
+
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib openssl stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64:$out/lib \
         $out/bin/spotify
 
       preload=$out/libexec/spotify/libpreload.so

pkgs/applications/misc/mysql-workbench/default.nix

@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   pname = "mysql-workbench";
-  version = "5.2.33";
+  version = "5.2.34";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
-    sha256 = "193iikz0wfm3yvazficxfiqb84f34psq0bcasp3l41n9dygbgldc";
+    sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6";
   };
 
   buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool

pkgs/applications/networking/mailreaders/notmuch/default.nix

@@ -1,70 +1,75 @@
-{ fetchgit, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
+{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.6-rc4";
+  name = "notmuch-0.8";
 
-  src = fetchgit {
-    url = "git://github.com/chaoflow/notmuch";
-    rev = "9f8ef78e0c6b28918f3edda06b59a9e8f9bef8e3";
-    sha256 = "c7c425c10a695ca22dfbdf5fe8e0dcb6a888edc0b3388023e7ff35f69acc0085";
+  src = fetchurl {
+    url = "http://notmuchmail.org/releases/${name}.tar.gz";
+    sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949";
   };
 
   buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];
 
   # XXX: Make me a loop
   patchPhase = ''
-    substituteInPlace "test/atomicity" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+    # substituteInPlace "test/atomicity" \
+    #   --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    substituteInPlace "test/aggregate-results.sh" \
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/author-order" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/basic" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/crypto" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/dump-restore" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/emacs" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/emacs-large-search-buffer" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/encoding" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/from-guessing" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/json" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/long-id" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/maildir-sync" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/new" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/notmuch-test" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/raw" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/reply" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/search" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/search-by-folder" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/search-insufficient-from-quoting" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    substituteInPlace "test/search-folder-coherence" \
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/search-output" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/search-position-overlap-bug" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
+    substituteInPlace "test/symbol-hiding" \
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/test-lib.sh" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/test-verbose" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/thread-naming" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/thread-order" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace "test/uuencode" \
-      --replace "#!/bin/bash" "#!${bash}/bin/bash"
+      --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
   '';
 
   postBuild = ''

pkgs/applications/networking/p2p/gnunet/0.9.nix

@@ -8,7 +8,7 @@
 assert gtkSupport -> (gtk != null) && (libglade != null);
 
 let
-  rev = "16910";
+  rev = "17000";
   version = "0.9-svn-${rev}";
 in
   stdenv.mkDerivation {
@@ -16,7 +16,7 @@ in
 
     src = fetchsvn {
       url = "https://gnunet.org/svn/gnunet";
-      sha256 = "1jxvh3wvhss0pn286p848zifc8f9pkhcb12m2bpkssh409wwyzkd";
+      sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4";
       inherit rev;
     };
 

pkgs/applications/networking/p2p/ldcpp/default.nix

@@ -1,31 +1,38 @@
-{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }:
+{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }:
 
 with builderDefs;
-	let localDefs = builderDefs.passthru.function ((rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2;
-			sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
-		};
+  let localDefs = builderDefs.passthru.function ((rec {
+    src = /* put a fetchurl here */
+    fetchurl {
+      url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
+      sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a";
+    };
 
-		buildInputs = [scons pkgconfig gtk bzip2 libglade
-			openssl libX11];
-		configureFlags = [];
-		doScons = fullDepEntry (''
-			ensureDir $out
-			export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
-			scons PREFIX=$out 
-			scons PREFIX=$out install
-		'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-	}));
-	in with localDefs;
+    buildInputs = [scons pkgconfig gtk bzip2 libglade
+      openssl libX11 boost];
+    configureFlags = [];
+    doScons = fullDepEntry (''
+      ensureDir $out
+      export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
+      
+      for i in gettext xgettext msgfmt msgcat; do
+        echo > $i
+	chmod a+x $i
+      done
+      export PATH=$PATH:$PWD
+
+      scons PREFIX=$out 
+      scons PREFIX=$out install
+    '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+  }));
+  in with localDefs;
 stdenv.mkDerivation rec {
-	name = "ldcpp-1.0.3";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doScons doForceShare doPropagate]);
-	meta = {
-		description = "Linux DC++ - Direct Connect client";
-		inherit src;
-	};
+  name = "ldcpp-1.1.0";
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [doScons doForceShare doPropagate]);
+  meta = {
+    description = "Linux DC++ - Direct Connect client";
+    inherit src;
+  };
 }

pkgs/applications/networking/remote/freerdp/unstable.nix

@@ -13,20 +13,19 @@
 , libXext
 , directfb
 , cunit
-, xmonadHack ? false
 }:
 
 assert printerSupport -> cups != null;
 
-let rev = "93d09e1a38a94c2436c53ef5ff99668e6c55ef96"; in
+let rev = "42fb9f84e82268073a3838e6082783ba956ecc99"; in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "freerdp-1.0pre${rev}";
 
   src = fetchgit {
     url = git://github.com/FreeRDP/FreeRDP.git;
     inherit rev;
-    sha256 = "a6662826fa0d8e5ecaaf42b40f1f3c54577a1d76ad58a01bd154647d5a1c01f7";
+    sha256 = "5e77163e2a728802fc426860b3f5ff88cb2f2f3b0bbf0912e9e44c3d8fa060e5";
   };
 
   buildInputs = [
@@ -64,11 +63,5 @@ stdenv.mkDerivation (rec {
 
     maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
-} // (stdenv.lib.optionalAttrs xmonadHack {
-   #xmonad doesn't provide the _NET_WORKAREA atom, so we need to remove the
-   #call that relies on it. This just messes up sizing in non-fullscreen mode
-   postUnpack = ''
-    sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c
-  '';
-}))
+}
 

pkgs/applications/networking/sniffers/etherape/default.nix

@@ -0,0 +1,20 @@
+{stdenv, fetchurl, pkgconfig, gtk, libpcap, libglade, libgnome, libgnomeui,
+gnomedocutils, scrollkeeper, libxslt}:
+
+stdenv.mkDerivation rec {
+  name = "etherape-0.9.12";
+  src = fetchurl {
+    url = "mirror://sourceforge/etherape/${name}.tar.gz";
+    sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k";
+  };
+
+  configureFlags = [ "--disable-scrollkeeper" ];
+  buildInputs = [ gtk libpcap pkgconfig libglade libgnome libgnomeui gnomedocutils
+    scrollkeeper libxslt ];
+
+  meta = {
+    homepage = http://etherape.sourceforge.net/;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/development/compilers/urweb/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20110715";
+  version = "20110917";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1qaz6alabhi7jmpsj7x0x4sskkjf05619maym133y2lkgdnvhydh";
+    sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
-      export GCCARGS="-I$out/include \
+      export CCARGS="-I$out/include \
                       -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
 
       export PGHEADER="${postgresql}/include/libpq-fe.h";

pkgs/development/interpreters/python/pythonhome-wrapper.nix

@@ -0,0 +1,21 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "pythonhome-wrapper";
+
+  unpackPhase = "true";
+  installPhase = ''
+    ensureDir $out/bin
+    echo '
+#!/bin/sh
+
+BINDIR=`dirname $0`
+PYTHONHOME=`dirname $BINDIR`
+PYTHONHOME=`(cd $PYTHONHOME && pwd)`
+export PYTHONHOME
+
+$BINDIR/python "$@"
+    ' > $out/bin/py
+    chmod +x $out/bin/py
+  '';
+}

pkgs/development/interpreters/ruby/ruby-19.nix

@@ -1,14 +1,52 @@
-{ ruby18, fetchurl }:
+{ stdenv, fetchurl
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? false
+, groff, docSupport ? false
+}:
 
-ruby18.override rec {
-  version = "1.9.1-p243";
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+in
+
+stdenv.mkDerivation rec {
+  version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
+  
   name = "ruby-${version}";
+  
   src = fetchurl {
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-${version}.tar.gz";
-    sha256 = "1r4bls76dg97lqgwkxi6kbxzirkvjm21d4i2qyz469lnncvqwn9i";
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
+    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
   };
 
-  passthru = {
-    libPath = "lib/ruby-1.9";
+  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+  NROFF = "${groff}/bin/nroff";
+
+  buildInputs = (ops cursesSupport [ ncurses readline ] )
+    ++ (op docSupport groff )
+    ++ (op zlibSupport zlib)
+    ++ (op opensslSupport openssl)
+    ++ (op gdbmSupport gdbm);
+    
+  configureFlags = ["--enable-shared" "--enable-pthread"];
+
+  installFlags = stdenv.lib.optionalString docSupport "install-doc";
+  # Bundler tries to create this directory
+  postInstall = "mkdir -pv $out/${passthru.gemPath}";
+
+  meta = {
+    license = "Ruby";
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+  };
+
+  passthru = rec {
+    majorVersion = "1.9";
+    minorVersion = "2";
+    patchLevel = "290";
+    libPath = "lib/ruby/${majorVersion}";
+    gemPath = "lib/ruby/gems/${majorVersion}";
   };
 }

pkgs/development/interpreters/ruby/rubygems.nix

@@ -4,10 +4,10 @@ rec {
   # some packages (eg ruby-debug) still require 1.8. So let's stick to that for
   # now if nobody has different requirements
 
-  version = "1.4.1";
+  version = "1.8.10";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
-    sha256 = "189wg1msb4sdjvdzv9ia6q3lvjlygpp67wlbkl7cjb22bpjy4w4b";
+    sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q";
   };
 
 

pkgs/development/libraries/gnutls/2.12.nix

@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.12.9";
+  name = "gnutls-2.12.11";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "0ilfdyw6xr0w57aygmw1fvx56x2zh5la01y8bkx59crq927wk8bl";
+    sha256 = "0q0kk69y1vpdxdz0mxqw603zi2y5kkgz3rvinc6bv6z9mwd8xd80";
   };
 
   configurePhase = ''

pkgs/development/libraries/haskell/NumInstances/default.nix

@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "NumInstances";
+  version = "1.0";
+  sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
+  meta = {
+    description = "Instances of numeric classes for functions and tuples";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/cryptohash/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.2";
-  sha256 = "1c23cgkp9y18yrahjn7nz5z2y3xdn16mrgpczidd6jwhp6f2zd42";
+  version = "0.7.3";
+  sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];

pkgs/development/libraries/haskell/derp/default.nix

@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "derp";
+  version = "0.1.5";
+  sha256 = "0mpc4hav5iqrcjns5sz8q0v2c0d7nb2hbzn58cmbl7cma2kp36li";
+  meta = {
+    description = "Derivative Parsing";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/neither/default.nix

@@ -1,10 +1,10 @@
-{ cabal, failure, monadPeel, transformers }:
+{ cabal, failure, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "neither";
-  version = "0.2.0";
-  sha256 = "0a2lyx3dvgzj4g6p69x1fma4rmwxrykji3hc4diqgc4hx02p16jh";
-  buildDepends = [ failure monadPeel transformers ];
+  version = "0.3.0";
+  sha256 = "0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l";
+  buildDepends = [ failure transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/neither";
     description = "Provide versions of Either with good monad and applicative instances";

pkgs/development/libraries/haskell/skein/default.nix

@@ -9,5 +9,9 @@ cabal.mkDerivation (self: {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/vector-space/default.nix

@@ -1,13 +1,13 @@
-{ cabal, Boolean, MemoTrie }:
+{ cabal, Boolean, MemoTrie, NumInstances }:
 
 cabal.mkDerivation (self: {
   pname = "vector-space";
-  version = "0.7.6";
-  sha256 = "166493dnlgrm9bsyp8dvdnkz1s5503casamihs4d3rij4fqvw7vf";
-  buildDepends = [ Boolean MemoTrie ];
+  version = "0.7.8";
+  sha256 = "195g9zsb73w4a0fcfz0kank6gyqajww0qiqivr4fy0bik2nsr6ry";
+  buildDepends = [ Boolean MemoTrie NumInstances ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/vector-space";
-    description = "Vector & affine spaces, linear maps, and derivatives (requires ghc 6.9 or better)";
+    description = "Vector & affine spaces, linear maps, and derivatives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

pkgs/development/libraries/haskell/xml/default.nix

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, text }:
 
 cabal.mkDerivation (self: {
   pname = "xml";
-  version = "1.3.9";
-  sha256 = "1sx6k5dscpcy4aq09g7h0fz0sl4w2nrr4pnklgwrbrh6bf6kc6w2";
+  version = "1.3.10";
+  sha256 = "0mmibqzbbqmw4a8gc4f2yy144nx48gpfwj3iqq6dydvcikajxav2";
+  buildDepends = [ text ];
   meta = {
     homepage = "http://code.galois.com";
     description = "A simple XML library";

pkgs/development/libraries/libdnet/default.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl, automake, autoconf, libtool}:
+
+stdenv.mkDerivation {
+  name = "libdnet-1.12";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = http://libdnet.googlecode.com/files/libdnet-1.12.tgz;
+    sha1 = "71302be302e84fc19b559e811951b5d600d976f8";
+  };
+
+  configureFlags = [ "--enable-shared" ]; # shared libs required by hyenae
+
+  buildInputs = [ automake autoconf libtool ];
+
+  # .so endings are missing (quick and dirty fix)
+  postInstall = ''
+    for i in $out/lib/*; do
+      ln -s $i $i.so
+    done
+  '';
+
+  meta = {
+    description = "libdnet provides a simplified, portable interface to several low-level networking routines";
+    homepage = http://code.google.com/p/libdnet/;
+    license = "BSD"; # New BSD license
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/libraries/opencv/default.nix

@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig,
-  xineLib, gstreamer }:
+{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
+, pkgconfig, gstreamer }:
+
+let v = "2.3.1a"; in
 
 stdenv.mkDerivation rec {
-  name = "opencv-2.3.0";
+  name = "opencv-${v}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2";
-    sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw";
+    url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
+    sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9";
   };
 
-  buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
-    xineLib gstreamer ];
+  buildInputs = [ gtk libjpeg libpng libtiff jasper ffmpeg gstreamer ];
+
+  buildNativeInputs = [ cmake pkgconfig ];
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/openssl/1.0.0e.nix

@@ -1,13 +1,15 @@
 { stdenv, fetchurl, perl }:
 
 let
+  name = "openssl-1.0.0e";
+
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
 in
 
-stdenv.mkDerivation rec {
-  name = "openssl-1.0.0e";
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
@@ -27,12 +29,12 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
 
   buildNativeInputs = [ perl ];
-  
+
   # On x86_64-darwin, "./config" misdetects the system as
   # "darwin-i386-cc".  So specify the system type explicitly.
   configureScript =
     if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
-  
+
   configureFlags = "shared --libdir=lib";
 
   makeFlags = "MANDIR=$(out)/share/man";
@@ -66,5 +68,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.openssl.org/;
     description = "A cryptographic library that implements the SSL and TLS protocols";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/libraries/openssl/default.nix

@@ -1,13 +1,15 @@
 { stdenv, fetchurl, perl }:
 
 let
+  name = "openssl-1.0.0d";
+
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
 in
 
-stdenv.mkDerivation rec {
-  name = "openssl-1.0.0d";
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
@@ -17,12 +19,12 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
 
   buildNativeInputs = [ perl ];
-  
+
   # On x86_64-darwin, "./config" misdetects the system as
   # "darwin-i386-cc".  So specify the system type explicitly.
   configureScript =
     if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
-  
+
   configureFlags = "shared --libdir=lib";
 
   postInstall =
@@ -54,5 +56,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.openssl.org/;
     description = "A cryptographic library that implements the SSL and TLS protocols";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/libraries/talloc/default.nix

@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-talloc-compat1 --enable-largefile";
   
+  # https://bugzilla.samba.org/show_bug.cgi?id=7000
+  postConfigure = if stdenv.isDarwin then ''
+    substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -install_name"
+  '' else "";
+
   meta = {
     description = "talloc is a hierarchical pool based memory allocator with destructors";
     homepage = http://tdb.samba.org/;

pkgs/development/tools/haskell/BNFC-meta/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "BNFC-meta";
-  version = "0.2.1";
-  sha256 = "0c58m1xkaylgp9f3r71nfgqb30fpidldz46dbwalhkb7fm0k4gmm";
+  version = "0.2.2";
+  sha256 = "07jfc0dcrcckibbw0xca1h7x3lnc9jfylfkcs23f0hyg31irf8dx";
   buildDepends = [ alexMeta happyMeta haskellSrcMeta ];
   meta = {
     description = "Deriving Quasi-Quoters from BNF Grammars";

pkgs/development/tools/haskell/alex-meta/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "alex-meta";
-  version = "0.2.0.1";
-  sha256 = "1b508pg4a9f0ln9k91j5dj0mja3faxasz5k6qyxqz3zqnlysm2gj";
+  version = "0.2.0.2";
+  sha256 = "1v47p1nrx2nb92aasq7ml6i0sy1nfyybgm9n4r1sw1g86dg1y8z1";
   buildDepends = [ haskellSrcMeta ];
   meta = {
     description = "Quasi-quoter for Alex lexers";

pkgs/development/tools/haskell/happy-meta/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happy-meta";
-  version = "0.2.0.2";
-  sha256 = "1r9i01bnw0dz10balhpgiwcls5jwv5p09jafi8jl6hy0jwx7xydp";
+  version = "0.2.0.3";
+  sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9";
   buildDepends = [ haskellSrcMeta mtl ];
   meta = {
     description = "Quasi-quoter for Happy parsers";

pkgs/development/tools/haskell/uuagc/cabal.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
-  version = "1.0.0.6";
-  sha256 = "1ij84n2pjhqyz10vsa9qxk4k227wg1c96rq5sylvcwdkzciww81d";
+  version = "1.0.0.7";
+  sha256 = "1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y";
   buildDepends = [ mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";

pkgs/games/scummvm/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL, zlib, mpeg2dec}:
+{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }:
 
 stdenv.mkDerivation {
   name = "scummvm-1.2.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "029abzvpz85accwk7x79w255wr83gnkqg3yc5n6ryl28zg00z3j8";
   };
   
-  buildInputs = [SDL zlib mpeg2dec];
+  buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ];
 
   crossAttrs = {
     preConfigure = ''
@@ -27,3 +27,4 @@ stdenv.mkDerivation {
     homepage = http://www.scummvm.org/;
   };
 }
+

pkgs/os-specific/linux/kernel/linux-3.1.nix

@@ -200,13 +200,13 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1-rc6";
+    version = "3.1-rc7";
 
-    modDirVersion = "3.1.0-rc6";
+    modDirVersion = "3.1.0-rc7";
   
     src = fetchurl {
       url = "https://github.com/torvalds/linux/tarball/v${version}";
-      sha256 = "047a5qkcghn0q9b611vpdwbl87qb0k0q9x0bdpywlpy644l5dfwy";
+      sha256 = "05zlg522svyym6cab7lrqpihzrk8j356dyahyc321nd8yw0qfv2x";
       name = "v${version}.tar.gz";
     };
 

pkgs/shells/bash/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}:
+{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }:
 
 assert interactive -> readline != null;
 
@@ -52,10 +52,7 @@ stdenv.mkDerivation rec {
     # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"
 
-  '' + (if interactive && bashCompletion != null then ''
-    ensureDir "$out/etc"
-    echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"'
-  '' else ''
+  '' + (if interactive then "" else ''
     # Install the completion examples.
     ensureDir "$out/etc"
     cp -v "examples/complete/bash_completion" "$out/etc"

pkgs/tools/networking/hyenae/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, libdnet, pkgconfig, libpcap}:
+
+stdenv.mkDerivation {
+  name = "hyenae-0.36-1";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz;
+    sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg";
+  };
+
+  buildInputs = [libdnet pkgconfig libpcap];
+
+  meta = {
+    description = "";
+    homepage = http://sourceforge.net/projects/hyenae/;
+    license = "GPLv3";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/tools/networking/iodine/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "iodine-0.4.1";
+  name = "iodine-0.6.0-rc1";
 
   src = fetchurl {
     url = "http://code.kryo.se/iodine/${name}.tar.gz";
-    sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5";
+    sha256 = "dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60";
   };
 
   buildInputs = [ zlib ];

pkgs/tools/networking/p2p/bit-tornado/default.nix

@@ -1,4 +1,5 @@
-{stdenv,fetchurl,python,wxPython26}:
+{stdenv,fetchurl,python, wxPython, makeWrapper, 
+  ssl}:
 stdenv.mkDerivation {
   name = "bit-tornado";
 
@@ -7,14 +8,15 @@ stdenv.mkDerivation {
     sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr";
   };
 
-  buildInputs = [python];
+  buildInputs = [python wxPython makeWrapper ssl];
 
-  buildPhase = " ";
+  buildPhase = '' '';
   installPhase = ''
     python setup.py install --prefix=$out ;
-    echo 'export PYTHONPATH=$PYTHONPATH:'$out'/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages/wx-2.6-gtk2-unicode
-    python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 "$@";' > $out/bin/bittornado ; 
-    chmod a+rx $out/bin/bittornado;
+    for i in $(cd $out/bin && ls); do
+        wrapProgram $out/bin/$i \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" 
+    done
   '';
 
   meta = {

pkgs/tools/networking/p2p/rtorrent/default.nix

@@ -14,6 +14,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
 
+  postInstall = "install -D -m 444 doc/rtorrent.1 $out/share/man/man1/rtorrent.1";
+
   meta = {
     homepage = "http://libtorrent.rakshasa.no/";
     description = "An ncurses client for libtorrent, ideal for use with screen or dtach";

pkgs/tools/networking/pdnsd/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "pdnsd-1.2.8-par";
+
+  src = fetchurl {
+    url = http://www.phys.uu.nl/~rombouts/pdnsd/releases/pdnsd-1.2.8-par.tar.gz;
+    sha256 = "0ki4xkklc5lqs2qfmww63dc2zax48x8acfw661206ps4kvhasg2z";
+  };
+
+  patchPhase = ''
+    sed -i 's/.*(cachedir).*/:/' Makefile.in
+  '';
+
+  meta = { 
+    description = "Permanent DNS caching";
+    homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html;
+    license = "GPLv3+";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}

pkgs/tools/system/lxc/default.nix

@@ -1,31 +1,33 @@
-{stdenv, fetchurl, libcap}:
+{ stdenv, fetchurl, libcap, perl }:
 
-stdenv.mkDerivation rec{
+let
   name = "lxc-0.7.5";
+in
+stdenv.mkDerivation{
+  inherit name;
 
   src = fetchurl {
     url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
     sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c";
   };
 
-  patchPhase = ''
-    sed -i -e '/ldconfig/d' src/lxc/Makefile.in
-  '';
+  buildInputs = [ libcap perl ];
 
-  configureFlags = [ "--localstatedir=/var" ];
+  patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in";
 
-  postInstall = '' 
+  configureFlags = "--localstatedir=/var";
+
+  postInstall = ''
     cd "$out/lib"
     lib=liblxc.so.?.*
     ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
   '';
 
-  buildInputs = [ libcap ];
-
   meta = {
     homepage = http://lxc.sourceforge.net;
     description = "lxc Linux Containers userland tools";
-    license = "LGPLv2.1+";
+    license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -446,7 +446,9 @@ let
     gui = true;
   };
 
-  bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
+  bittornado = callPackage ../tools/networking/p2p/bit-tornado { 
+    inherit (pythonPackages) ssl;
+  };
 
   blueman = callPackage ../tools/bluetooth/blueman {
     inherit (pythonPackages) notify;
@@ -1140,6 +1142,8 @@ let
 
   pdfread = callPackage ../tools/graphics/pdfread { };
 
+  pdnsd = callPackage ../tools/networking/pdnsd { };
+
   pg_top = callPackage ../tools/misc/pg_top { };
 
   pdsh = callPackage ../tools/networking/pdsh {
@@ -2581,6 +2585,8 @@ let
     extraLibs = lib.attrValues python.modules;
   };
 
+  pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };
+
   pyrex = pyrex095;
 
   pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { };
@@ -2596,7 +2602,7 @@ let
   regina = callPackage ../development/interpreters/regina {};
 
   ruby18 = callPackage ../development/interpreters/ruby { };
-  #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; };
+  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
   ruby = ruby18;
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
@@ -2854,6 +2860,8 @@ let
     inherit (perlPackages) LocaleGettext;
   };
 
+  hyenae = callPackage ../tools/networking/hyenae { };
+
   iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {
     inherit (perlPackages) XMLSimple;
   };
@@ -3761,6 +3769,8 @@ let
 
   libdmtx = callPackage ../development/libraries/libdmtx { };
 
+  libdnet = callPackage ../development/libraries/libdnet { };
+
   libdrm = callPackage ../development/libraries/libdrm {
     inherit fetchurl stdenv pkgconfig;
     inherit (xorg) libpthreadstubs;
@@ -6222,7 +6232,11 @@ let
     inherit (xlibs) libSM;
   };
 
-  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
+  bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
+    # For some reason, TLS support is broken when using GnuTLS 3.0 (can't
+    # connect to jabber.org, for instance.)
+    gnutls = gnutls2;
+  };
 
   blender = callPackage ../applications/misc/blender/2.49.nix { };
 
@@ -6457,6 +6471,10 @@ let
 
   esniper = callPackage ../applications/networking/esniper { };
 
+  etherape = callPackage ../applications/networking/sniffers/etherape {
+    inherit (gnome) gnomedocutils libgnome libglade gtk libgnomeui scrollkeeper;
+  };
+
   evopedia = callPackage ../applications/misc/evopedia { };
 
   keepassx = callPackage ../applications/misc/keepassx { };

pkgs/top-level/haskell-packages.nix

@@ -517,6 +517,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derive = callPackage ../development/libraries/haskell/derive {};
 
+  derp = callPackage ../development/libraries/haskell/derp {};
+
   Diff = callPackage ../development/libraries/haskell/Diff {};
 
   digest = callPackage ../development/libraries/haskell/digest {
@@ -884,6 +886,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
 
+  NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
+
   numtype = callPackage ../development/libraries/haskell/numtype {};
 
   OneTuple = callPackage ../development/libraries/haskell/OneTuple {};

pkgs/top-level/python-packages.nix

@@ -19,6 +19,12 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  ipython = import ../shells/ipython {
+    inherit (pkgs) stdenv fetchurl;
+    inherit buildPythonPackage pythonPackages;
+  };
+
+
   wrapPython = pkgs.makeSetupHook
     { deps = pkgs.makeWrapper;
       substitutions.libPrefix = python.libPrefix;