* Sync with the trunk.

svn path=/nixpkgs/branches/x-updates/; revision=25900

pkgs/applications/audio/spotify/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       }
     else throw "Spotify not supported on this platform.";
 
-  buildInputs = [ dpkg ];
+  buildInputs = [ dpkg makeWrapper ];
 
   unpackPhase = "true";
   
@@ -35,6 +35,12 @@ stdenv.mkDerivation {
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
         --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
         $out/bin/spotify
+
+      preload=$out/libexec/spotify/libpreload.so
+      mkdir -p $out/libexec/spotify
+      gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
+
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload
     ''; # */
 
   dontStrip = true;
@@ -52,14 +58,6 @@ stdenv.mkDerivation {
         provides the Spotify client for Linux.  At present, it does not
         work with free Spotify accounts; it requires a Premium or
         Unlimited account.
-
-        Currently, the Spotify client requires a symlink from
-        /usr/share/spotify to its resources.  Thus, you should do
-        something like:
-
-          $ nix-env -i spotify
-          $ mkdir -p /usr/share
-          $ ln -s ~/.nix-profile/share/spotify /usr/share/
       '';
   };
 }

pkgs/applications/audio/spotify/preload.c

@@ -0,0 +1,59 @@
+/* Spotify looks for its theme data in /usr/share/spotify/theme.  This
+   LD_PRELOAD library intercepts open() and stat() calls to redirect
+   them to the corresponding location in $out. */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+
+char themeDir [] = "/usr/share/spotify/theme";
+char realThemeDir [] = OUT "/share/spotify/theme";
+
+const char * rewrite(const char * path, char * buf)
+{
+    if (strncmp(path, themeDir, sizeof(themeDir) - 1) != 0) return path;
+    if (snprintf(buf, PATH_MAX, "%s%s", realThemeDir, path + sizeof(themeDir) - 1) >= PATH_MAX)
+        abort();
+    return buf;
+}
+
+int open(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open(rewrite(path, buf), flags, mode);
+}
+
+int open64(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open64(rewrite(path, buf), flags, mode);
+}
+
+int __xstat64(int ver, const char *path, struct stat64 *st)
+{
+    char buf[PATH_MAX];
+    int (*___xstat64) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");
+    return ___xstat64(ver, rewrite(path, buf), st);
+}

pkgs/applications/misc/googleearth/default.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
+{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv
-libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4,
+, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
-zlib }:
+, zlib, fontconfig }:
 
 /* I haven't found any x86_64 package from them */
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "googleearth-5.2.0001";
+  name = "googleearth-6.0.1.2032";
 
   src = fetchurl {
     url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
-    sha256 = "2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30";
+    sha256 = "15bcr379bsdg0flvrgaiyjccx07b4a48z9v3pl006ywm6gp3jbfm";
   };
 
   buildNativeInputs = [
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
     libX11 
     qt4
     zlib
+    fontconfig
   ];
 
   phases = "unpackPhase installPhase";

pkgs/applications/networking/mumble/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
+ avahi }:
+        
+throw "It does not build still. It wants dns_sd.h"
+
+stdenv.mkDerivation rec {
+  name = "mumble-" + version;
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mumble/${name}.tar.gz";
+    sha256 = "1s4vlkdfmyzx7h3i4060q0sf2xywl9sm6dpjhaa150blbcylwmic";
+  };
+
+  patchPhase = ''
+    sed -e s/qt_ja_JP.qm// -i src/mumble/mumble.pro src/mumble11x/mumble11x.pro
+    sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc
+  '';
+
+  configurePhase = "qmake PREFIX=$out";
+
+  buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi ];
+
+  meta = { 
+    homepage = http://mumble.sourceforge.net/;
+    description = "Low-latency, high quality voice chat software";
+    license = "BSD";
+  };
+}

pkgs/applications/video/vlc/default.nix

@@ -2,31 +2,38 @@
 , zlib, a52dec, libmad, faad2, ffmpeg, alsa
 , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
 , libvorbis, libtheora, speex, lua, libgcrypt, libupnp
+, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
+, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
+, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
+, libass
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "vlc-1.1.0";
+  name = "vlc-${version}";
+  version = "1.1.5";
+
+  patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/1.1.0/vlc-1.1.0.tar.bz2;
+    url = "mirror://sourceforge/vlc/${name}.tar.bz2";
-    sha256 = "1j7icg7a2lr99kpc3sjjdp3z7128y6afnvxsafxlnih0qif2ryx9";
+    sha256 = "09nawmvw5zs6hywk5xkqn2iyvrh4r5d7z6rbpaaydckz66fazqzq";
   };
 
   buildInputs = [
-    perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
+    perl zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread
-    alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
+    pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt
-    libvorbis libtheora speex lua libgcrypt libupnp
+    libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-  ];
+    udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
+    libkate libtiger libv4l samba liboggz libass
+  ]
+  ++ (with xlibs; [ xlibs.xlibs libXv libXpm xcbutil ]);
 
   configureFlags = [ "--enable-alsa"
     "--disable-glx"
     "--disable-remoteosd"
-    "--enable-faad"
-    "--enable-theora"
-    "--enable-vorbis"
-    "--enable-speex"
     "--disable-dbus"
     "--disable-dbus-control"
+    "--with-kde-solid=$out/share/apps/solid/actions"
   ];
 
   preBuild = ''

pkgs/build-support/fetchurl/mirrors.nix

@@ -10,6 +10,7 @@ rec {
   
   # SourceForge.
   sourceforge = [
+    http://prdownloads.sourceforge.net/
     http://heanet.dl.sourceforge.net/sourceforge/
     http://surfnet.dl.sourceforge.net/sourceforge/
     http://dfn.dl.sourceforge.net/sourceforge/
@@ -17,7 +18,6 @@ rec {
     http://ovh.dl.sourceforge.net/sourceforge/
     http://osdn.dl.sourceforge.net/sourceforge/
     http://kent.dl.sourceforge.net/sourceforge/
-    http://prdownloads.sourceforge.net/
   ];
 
   sf = sourceforge;
@@ -101,6 +101,7 @@ rec {
 
   # Mirrors of ftp://ftp.kde.org/pub/kde/.
   kde = [
+    "http://download.kde.org/download.php?url="
     http://ftp.gwdg.de/pub/x11/kde/
     ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
     ftp://ftp.kde.org/pub/kde/

pkgs/data/documentation/man-pages/default.nix

@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.25";
+  name = "man-pages-3.32";
   
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
-    sha256 = "1cq3zijmbsnjshkm78kffgqrdsxgg7ypvcf2digdyy0s9himnvwc";
+    sha256 = "1qr1k6kgx7i4gni9w2h610k2aa2bqdk7p08bmqslfwrzpmkkiawn";
   };
 
   preBuild =

pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix

@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/librsvg/2.26/librsvg-2.26.0.tar.bz2;
     sha256 = "1sivagvlyr58hxgazr6pyq3yfxbg0wrv7rgzsk5xi631v3qbbjpx";
   };
-  buildInputs = [ pkgconfig libxml2 libgsf bzip2 glib gtk libcroco ];
+  buildInputs = [ pkgconfig libxml2 libgsf bzip2 libcroco ];
+  propagatedBuildInputs = [ glib gtk ];
 }

pkgs/desktops/kde-4.5/support/akonadi/default.nix

@@ -1,14 +1,13 @@
 {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.4.0";
+  name = "akonadi-1.4.3";
   src = fetchurl {
     url = "http://download.akonadi-project.org/${name}.tar.bz2";
-    sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5";
+    sha256 = "18xi66w78lsf2jf1z1vl8abps9hdv3g5msw6q1kj6xhmn4lbgjkk";
   };
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
   patches = [ ./fix-broken-datadir-parameter.patch ];
-  postPatch = "sed -e '/Q_ASSERT.*SQLITE/d' -i qsqlite/src/qsql_sqlite.cpp";
   meta = with stdenv.lib; {
     description = "KDE PIM Storage Service";
     license = "LGPL";

pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch

@@ -9,7 +9,7 @@ Fix broken datadir parameter.
 +  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
  #ifndef Q_WS_WIN
 -  arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
-   arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir );
+   arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory );
  #else
 -  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
    arguments << QString::fromLatin1( "--shared-memory" );

pkgs/desktops/kde-4.5/support/attica/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, qt4}:
 
 stdenv.mkDerivation rec {
-  name = "attica-0.1.4";
+  name = "attica-0.2.0";
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
-    sha256 = "0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1";
+    sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
   };
   buildInputs = [ cmake qt4 ];
   meta = with stdenv.lib; {

pkgs/desktops/kde-4.5/support/soprano/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.5.2";
+  name = "soprano-2.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "17k17hrcwij2plms4hb0j6994ar9kcxykf699iyiggfpj1zg7nym";
+    sha256 = "0hxc6jnbh0529jsc0ixvy8pshnffrpgsadinhk9navkpyn5xg4l9";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger

pkgs/development/libraries/SDL_image/default.nix

@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";
-  version = "1.2.6";
+  version = "1.2.10";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
-    sha256 = "1i3f72dw3i3l6d77dk81gw57sp0629rng9k76qb37brlz7dv3z48";
+    sha256 = "0xhqw56xgc0rn3ziccirib8ai2whbbidjmvig527n9znjlg5vq3m";
   };
 
   buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
-  postInstall = "ln -s $out/include/SDL/SDL_image.h $out/include/";
+  postInstall = "ln -sv $out/include/SDL/SDL_image.h $out/include/";
 
   meta = {
     description = "SDL image library";

pkgs/development/libraries/dotconf/default.nix

@@ -0,0 +1,18 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "dotconf-" + version;
+  version = "1.0.13";
+
+  src = fetchurl {
+    url = "http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz";
+    sha256 = "0rcvi743jgnrq2p5gknnvsqiv47479y5gyc2g9pz7bp7v7bzlmc9";
+  };
+
+  meta = {
+    description = "A configuration parser library";
+
+    homepage = http://www.azzit.de/dotconf/;
+    license = "LGPLv21+";
+  };
+}

pkgs/development/libraries/libass/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, freetype, fontconfig, pkgconfig, enca ? null }:
+
+stdenv.mkDerivation rec {
+  name = "libass-0.9.11";
+
+  src = fetchurl {
+    url = "http://libass.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "0p3li523s8n85kfh5xdbbfffr17z8xdh2qcgvdg7ki1myv6agl7z";
+  };
+
+  buildInputs = [ freetype fontconfig enca pkgconfig ];
+
+  meta = {
+    homepage = http://code.google.com/p/libass/;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/development/libraries/libkate/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libogg, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "libkate-0.3.8";
+
+  src = fetchurl {
+    url = "http://libkate.googlecode.com/files/${name}.tar.gz";
+    sha256 = "00d6561g31la9bb8q99b7l4rvi67yiwm50ky8dhlsjd88h7rks2n";
+  };
+
+  buildInputs = [ libogg libpng ];
+
+  meta = {
+    description = "A library for encoding and decoding Kate streams";
+    longDescription = ''
+      This is libkate, the reference implementation of a codec for the Kate
+      bitstream format. Kate is a karaoke and text codec meant for encapsulation
+      in an Ogg container. It can carry Unicode text, images, and animate
+      them.'';
+    homepage = http://code.google.com/p/libkate;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/development/libraries/liboggz/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, libogg, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "liboggz-1.1.1";
+
+  src = fetchurl {
+    url = "http://downloads.xiph.org/releases/liboggz/${name}.tar.gz";
+    sha256 = "0nj17lhnsw4qbbk8jy4j6a78w6v2llhqdwq46g44mbm9w2qsvbvb";
+  };
+
+  propagatedBuildInputs = [ libogg ];
+
+  buildInputs = [ pkgconfig ];
+
+  meta = {
+    homepage = http://xiph.org/oggz/;
+    description = "A C library and tools for manipulating with Ogg files and streams";
+    longDescription = ''
+      Oggz comprises liboggz and the tool oggz, which provides commands to
+      inspect, edit and validate Ogg files. The oggz-chop tool can also be used
+      to serve time ranges of Ogg media over HTTP by any web server that
+      supports CGI.
+
+      liboggz is a C library for reading and writing Ogg files and streams.  It
+      offers various improvements over the reference libogg, including support
+      for seeking, validation and timestamp interpretation. Ogg is an
+      interleaving data container developed by Monty at Xiph.Org, originally to
+      support the Ogg Vorbis audio format but now used for many free codecs
+      including Dirac, FLAC, Speex and Theora.'';
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/development/libraries/libtiger/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, libkate, pango, cairo, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libtiger-0.3.4";
+
+  src = fetchurl {
+    url = "http://libtiger.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk";
+  };
+
+  buildInputs = [ libkate pango cairo pkgconfig ];
+
+  meta = {
+    homepage = http://code.google.com/p/libtiger/;
+    authors = [ "Vincent Penquerc'h" ];
+    description = "A rendering library for Kate streams using Pango and Cairo";
+  };
+}

pkgs/development/libraries/mlt/default.nix

@@ -2,11 +2,11 @@
 libvorbis, sox}:
 
 stdenv.mkDerivation {
-  name = "mlt-0.5.10";
+  name = "mlt-0.6.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/mlt/mlt-0.5.10.tar.gz;
+    url = mirror://sourceforge/mlt/mlt-0.6.2.tar.gz;
-    sha256 = "17nil3snm6qgcyld852ys0kqm61cx94zb3bvjdqgci6z1ia3crhh";
+    sha256 = "0rvyblxyp52mdjl4aicrk16k56yb24ic4ir3n145cxdarwi98r7i";
   };
 
   buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];

pkgs/development/libraries/qt-4.x/4.7/default.nix

@@ -8,7 +8,7 @@
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
 let
-  v = "4.7.0";
+  v = "4.7.1";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "0mbr7sjaswkd5gibyb36mlaas049fj8vf2risi66fzfac3amclp0";
+    sha256 = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a";
   };
 
   preConfigure = ''

pkgs/development/libraries/speechd/default.nix

@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, dotconf, glib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "speech-dispatcher-" + version;
+  version = "0.7.1";
+
+  src = fetchurl {
+    url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
+    sha256 = "0laag72iw03545zggdzcr860b8q7w1vrjr3csd2ldps7jhlwzad8";
+  };
+
+  buildInputs = [ dotconf glib pkgconfig ];
+
+  meta = {
+    description = "Common interface to speech synthesis";
+
+    homepage = http://www.freebsoft.org/speechd;
+    license = "GPLv2+";
+  };
+}

pkgs/development/libraries/taglib/default.nix

@@ -1,16 +1,16 @@
-{stdenv, fetchurl, zlib}:
+{stdenv, fetchurl, zlib, cmake}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "taglib-1.6.1";
+  name = "taglib-1.6.3";
   
   src = fetchurl {
-    url = http://developer.kde.org/~wheeler/files/src/taglib-1.6.1.tar.gz;
+    url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz";
-    sha256 = "0i5s3n6i8ac5q7gqdnynrmi75as24nhy76y0q0v764llw82jlxcf";
+    sha256 = "0jr8ixqr2q0rwcmf4n58vrwbibmd3kijsjdddck6vln6qaf0ifm9";
   };
   
-  configureFlags = "--enable-asf --enable-mp4";
+  cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
 
-  buildInputs = [zlib];
+  buildInputs = [zlib cmake];
 
   meta = {
     homepage = http://developer.kde.org/~wheeler/taglib.html;

pkgs/development/libraries/xine-lib/builder.sh

@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-if test -n "$libdvdcss"; then
-    # Ugly hack to force libdvdcss to be present (so the user doesn't
-    # have to set LD_LIBRARY_PATH).
-    export NIX_LDFLAGS="-rpath $libdvdcss/lib -L$libdvdcss/lib -ldvdcss $NIX_LDFLAGS"
-fi
-
-if test -n "$libXv"; then
-    configureFlags="--with-xv-path=$libXv/lib $configureFlags"
-fi
-
-genericBuild

pkgs/development/libraries/xine-lib/default.nix

@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xine-lib-1.1.16.3";
+  name = "xine-lib-1.1.19";
   
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.bz2";
-    sha256 = "0lkvss7r8q16gyisiy3dkgbbk6vvpflfydi3927pvp2mz8g28nnj";
+    sha256 = "0x47kmsaxx1bv8w2cacvzls3sjw9y4vk82rd94km1m1s6k2wcxv2";
   };
   
   buildInputs =

pkgs/development/libraries/xine-lib/xine-lib-linux-headers-2.6.23.patch

@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Ken Moffat <zarniwhoop@users.sourceforge.net>
-# Date 1193435051 -3600
-# Node ID 8a369a0d5ff104cc115bbe76c6b4f3e281d1ef25
-# Parent 05fde4048642d1a7edb19ea623acd760064718bc
-Linux-2.6.23 header change breaks build
->
-> /* Special codes used when specifying changer slots. */
-> #define CDSL_NONE               (INT_MAX-1)
-> #define CDSL_CURRENT            INT_MAX
-
---- a/src/input/vcd/libcdio/_cdio_linux.c	Tue Oct 23 23:45:58 2007 +0100
-+++ b/src/input/vcd/libcdio/_cdio_linux.c	Fri Oct 26 22:44:11 2007 +0100
-@@ -59,6 +59,7 @@ static const char _rcsid[] = "$Id: _cdio
- #include <unistd.h>
- #include <fcntl.h>
- #include <mntent.h>
-+#include <limits.h>
- 
- #include <linux/cdrom.h>
- #include <scsi/scsi.h>
-

pkgs/development/tools/build-managers/cmake/default.nix

@@ -1,10 +1,11 @@
-{fetchurl, stdenv, replace, curl, expat, zlib
+{fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4}:
 
 let
   os = stdenv.lib.optionalString;
+  inherit (stdenv.lib) optional;
   majorVersion = "2.8";
-  minorVersion = "1";
+  minorVersion = "3";
   version = "${majorVersion}.${minorVersion}";
 in
 stdenv.mkDerivation rec {
@@ -14,12 +15,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0hi28blqxvir0dkhln90sgr0m3ri9n2i3hlmwdl4m5vkfsmp9bky";
+    sha256 = "1262bz0c0g5c57ba7rbbrs72xa42xs26fwf72mazmkmmhqkx17k8";
   };
 
-  buildInputs = [ curl expat zlib ]
+  buildInputs = [ curl expat zlib bzip2 libarchive ]
-    ++ stdenv.lib.optional useNcurses ncurses
+    ++ optional useNcurses ncurses
-    ++ stdenv.lib.optional useQt4 qt4;
+    ++ optional useQt4 qt4;
 
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
   configureFlags =

pkgs/development/tools/build-managers/cmake/setup-hook.sh

@@ -52,7 +52,7 @@ if test -z "$dontUseCmakeConfigure"; then
 fi
 
 if test -n "$crossConfig"; then
-    crossEnvHooks=(${crossEnvHooks[@]} addCMakeParams)
+    crossEnvHooks+=(addCMakeParams)
 else
-    envHooks=(${envHooks[@]} addCMakeParams)
+    envHooks+=(addCMakeParams)
 fi

pkgs/misc/drivers/gutenprint/default.nix

@@ -3,7 +3,7 @@
 , libtiff, libpng, openssl, gimp }:
 
 let
-   version = "5.2.4";
+   version = "5.2.6";
    inherit (composableDerivation) edf wwf;
 in
 
@@ -11,8 +11,8 @@ composableDerivation.composableDerivation {} {
   name = "gutenprint-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gimp-print/files/gutenprint-5.2/${version}/gutenprint-${version}.tar.bz2";
+    url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2";
-    sha256 = "09lnmf92h51sm0hmzd1hn2kl1sh6dxlnc0zjd9lrifzg0miyh45n";
+    sha256 = "0znwbv51vqf20p4isc3if4hqsgfav21rsqnsz1d8mixlmasy2i27";
   };
 
   # gimp, gui is still not working (TODO)

pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix

@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "iwlwifi-6000-ucode-9.221.4.1";
+
+  src = fetchurl {
+    url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+    sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b";
+  };
+
+  buildPhase = "true";
+
+  installPhase = ''
+    ensureDir "$out"
+    chmod -x *
+    cp * "$out"
+  '';
+
+  meta = {
+    description = "Firmware for the Intel 6000 Series wireless card";
+
+    longDescription = ''
+      This package provides the Intel 6000 Series wireless card
+      firmware. It contains the `iwlwifi-6000-4.ucode' file.
+    '';
+
+    homepage = http://intellinuxwireless.org/;
+  };
+}

pkgs/os-specific/linux/syslinux/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nasm, perl }:
 
 stdenv.mkDerivation rec {
-  name = "syslinux-4.02";
+  name = "syslinux-4.03";
   
   src = fetchurl {
     url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";
-    sha256 = "0zrk6magnrfa7nmdk2rll7xaym9rapwqqgy0wdh3cfscjmcw9kwm";
+    sha256 = "0f6s1cnibw6j0jh9bn5qsx3vsar9l1w9b3xfjkvzglgr4kinfmf6";
   };
 
   patches = [ ./perl-deps.patch ];
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   preBuild =
     ''
       substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
+      substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
       makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl)
     '';
 }

pkgs/os-specific/linux/upstart/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus, libnih }:
 
 stdenv.mkDerivation rec {
-  name = "upstart-0.6.6";
+  name = "upstart-0.6.7";
   
   src = fetchurl {
     url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz";
-    sha256 = "1cy962n4ljjxfxaigcnqsl9gq8j09j28g5jg19zk4lc7h1503d3s";
+    sha256 = "1f1pds27cadi6ycii1fkn5bbs1brjqxa2b45wfn03ikc2azqxlr9";
   };
 
   buildInputs = [ pkgconfig dbus libnih ];

pkgs/tools/archivers/sharutils/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "sharutils-4.10";
+  name = "sharutils-4.11";
 
   src = fetchurl {
     url = "mirror://gnu/sharutils/${name}.tar.bz2";
-    sha256 = "0q9g8ywsd5vwzzzvrgq3hzfqsdln9rhsqq0dhiwv2sr974c4xz5h";
+    sha256 = "0ry6qv0qnkfmkjdj8pd4qknbb4522yb97m0jd46zgv8g021ydqiy";
   };
 
   # GNU Gettext is needed on non-GNU platforms.

pkgs/tools/misc/parallel/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20110125";
+  name = "parallel-20110205";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0a5zah3s2h2jagmshz9w40whilh43cgzdpcw26isalq4282acajg";
+    sha256 = "0z1yl7mqs4z1nz5hkjr8agbnj2bpr2f4pq683lr9axa9m0pszzvj";
   };
 
   patchPhase =

pkgs/tools/misc/recutils/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gettext, emacs, curl, check, bc }:
 
 stdenv.mkDerivation rec {
-  name = "recutils-1.1";
+  name = "recutils-1.2";
 
   src = fetchurl {
     url = "mirror://gnu/recutils/${name}.tar.gz";
-    sha256 = "0qkgbkzc5wknkw26q78dxn6sbbixzj7d1xpj1wpg6lq40pxacdbi";
+    sha256 = "1y95niq6d06wyynrgkjs3bi1lj91v4qwdfam3sp31s4ki6vlaqkq";
   };
 
   doCheck = true;

pkgs/tools/networking/dhcp/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "dhcp-4.1.1-P1";
+  name = "dhcp-4.1.2-P1";
   
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${name}.tar.gz";
-    sha256 = "1nk36bk7yiqaj779czvlbxjs6jfn53qw7601171nx5mird806r1g";
+    sha256 = "1kcdsylyx0ai0wlmc6rc6b1qi2fsndqh1pvgvddd3i4hmbhi6vmz";
   };
 
   patches =
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   # due to an uninitialized variable.
   CFLAGS = "-g -O2 -Wall";
 
-  buildInputs = [makeWrapper];
+  buildInputs = [ makeWrapper ];
 
   postInstall =
     ''

pkgs/tools/package-management/disnix/DisnixWebService/default.nix

@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "DisnixWebService-0.2";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/792274/download/3/DisnixWebService-0.2.tar.bz2;
+    url = http://hydra.nixos.org/build/895081/download/4/DisnixWebService-0.2.tar.bz2;
-    sha256 = "1ccgrab896cs7bg5m99iam4cyvdj9q3gkmjkg9awqb710l9168sh";
+    sha256 = "1kxb5r52b0dd4z5v56j64iqvpcsxzw37ib7cp5fknj40qphay8wl";
   };
   buildInputs = [ apacheAnt ];
   PREFIX = ''''${env.out}'';

pkgs/tools/package-management/disnix/activation-scripts/default.nix

@@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null;
 assert enableEjabberdDump -> ejabberd != null;
 
 stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.2pre25619";
+  name = "disnix-activation-scripts-0.2pre25895";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/860730/download/1/disnix-activation-scripts-0.2pre25619.tar.gz;
+    url = http://hydra.nixos.org/build/895077/download/1/disnix-activation-scripts-0.2pre25895.tar.gz;
-    sha256 = "0lfix5mh0hcdb6jwz6pi92zi4k0xnvdksw17q8bj7x7vqpscq5s6";
+    sha256 = "0c6mi7v6jpjlhamcpf7i1axnrzidwbaayvq8glqfkza0c94yg4j9";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

pkgs/tools/package-management/disnix/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
 
 stdenv.mkDerivation {
-  name = "disnix-0.2pre25538";
+  name = "disnix-0.2pre25894";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/856742/download/4/disnix-0.2pre25538.tar.gz;
+    url = http://hydra.nixos.org/build/895051/download/4/disnix-0.2pre25894.tar.gz;
-    sha256 = "14cb5rhapsda2s22ys3d0i6qsfw4gnvc9483f5if3xr4hg6fgq0x";
+    sha256 = "0f8d2hnz67ykksw6l6izf06r9w7dkmlfb4dv6waxz9r7ylaardg2";
   };
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
                 ++ stdenv.lib.optional (!stdenv.isLinux) libiconv

pkgs/tools/package-management/disnix/disnixos/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, disnix, socat, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.1pre25628";
+  name = "disnixos-0.1pre25636";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/861183/download/1/disnixos-0.1pre25628.tar.gz;
+    url = http://hydra.nixos.org/build/895070/download/3/disnixos-0.1pre25636.tar.gz;
-    sha256 = "1wbd8x3j8mspv5v2w5vmfadby52337xpyhjll15a2wik1d8f19bk";
+    sha256 = "0pizbqzjb7kicb5ghqbmsg7rab3akk6yga4bfnrh3ly2yg6qgw6k";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;

pkgs/tools/package-management/nix/custom.nix

@@ -12,6 +12,7 @@
 , docbook5 ? null, docbook_xml_dtd_43 ? null 
 , boehmgc ? null
 , pkgconfig ? null
+, sqlite ? null
 , configureFlags ? []
 , lib
 , enableScripts ? []
@@ -35,6 +36,7 @@ stdenv.mkDerivation {
   	++ (if w3m != null then [w3m] else [])
   	++ (if libxml2 != null then [libxml2] else [])
   	++ (if boehmgc != null then [boehmgc] else [])
+  	++ (if sqlite != null then [sqlite] else [])
   	++ (if pkgconfig != null then [pkgconfig] else [])
   ;
 
@@ -50,6 +52,7 @@ stdenv.mkDerivation {
   configureFlags = ''
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
     --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
+    --with-sqlite=${sqlite}
     --disable-init-state
     ${toString configureFlags}
   '';

pkgs/tools/package-management/nix/sqlite.nix

@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
-, pkgconfig, boehmgc
-, storeDir ? "/nix/store"
-, stateDir ? "/nix/var"
-}:
-
-stdenv.mkDerivation rec {
-  name = "nix-1.0pre25179";
-
-  src = fetchurl {
-    url = "http://hydra.nixos.org/build/811883/download/4/${name}.tar.bz2";
-    sha256 = "4a6f7ca69428d24f253f8f199589d25fca1e7146a6591288392423634e3303f7";
-  };
-
-  buildInputs = [ perl curl openssl pkgconfig boehmgc ];
-
-  configureFlags = ''
-    --with-store-dir=${storeDir} --localstatedir=${stateDir}
-    --with-bzip2=${bzip2} --with-sqlite=${sqlite}
-    --disable-init-state
-    --enable-gc
-    CFLAGS=-O3 CXXFLAGS=-O3
-  '';
-
-  doCheck = true;
-
-  meta = {
-    description = "The Nix Deployment System";
-    homepage = http://nixos.org/;
-    license = "LGPLv2+";
-  };
-}

pkgs/tools/package-management/nix/unstable.nix

@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null
+{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
 , pkgconfig, boehmgc
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre24855";
+  name = "nix-1.0pre25886";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2";
+    url = "http://hydra.nixos.org/build/894162/download/4/${name}.tar.bz2";
-    sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932";
+    sha256 = "4513a6a42f485bed692ba2d34214383496f59064b9eb5d5ecec739dda703ddb3";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
-      --with-bzip2=${bzip2}
+      --with-bzip2=${bzip2} --with-sqlite=${sqlite}
       --disable-init-state
       --enable-gc
       CFLAGS=-O3 CXXFLAGS=-O3
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     configureFlags =
       ''
         --with-store-dir=${storeDir} --localstatedir=${stateDir}
-        --with-bzip2=${bzip2.hostDrv}
+        --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv}
         --disable-init-state
         CFLAGS=-O3 CXXFLAGS=-O3
       '';

pkgs/top-level/all-packages.nix

@@ -785,7 +785,7 @@ let
   httpfs2 = callPackage ../tools/filesystems/httpfs { };
 
   hydra = callPackage ../development/tools/misc/hydra { 
-    nix = nixSqlite ;  
+    nix = nixSqlite;  
   };
 
   iasl = callPackage ../development/compilers/iasl { };
@@ -2889,6 +2889,8 @@ let
 
   directfb = callPackage ../development/libraries/directfb { };
 
+  dotconf = callPackage ../development/libraries/dotconf { };
+
   dssi = callPackage ../development/libraries/dssi {};
 
   dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix {
@@ -3378,6 +3380,8 @@ let
 
   libarchive = callPackage ../development/libraries/libarchive { };
 
+  libass = callPackage ../development/libraries/libass { };
+
   libassuan1 = callPackage ../development/libraries/libassuan1 { };
 
   libassuan = callPackage ../development/libraries/libassuan { };
@@ -3552,6 +3556,8 @@ let
     libtool = libtool_1_5;
   };
 
+  libkate = callPackage ../development/libraries/libkate { };
+
   libksba = callPackage ../development/libraries/libksba { };
 
   libmad = callPackage ../development/libraries/libmad { };
@@ -3602,6 +3608,8 @@ let
 
   libogg = callPackage ../development/libraries/libogg { };
 
+  liboggz = callPackage ../development/libraries/liboggz { };
+
   liboil = callPackage ../development/libraries/liboil { };
 
   liboop = callPackage ../development/libraries/liboop { };
@@ -3648,6 +3656,8 @@ let
 
   libtiff = callPackage ../development/libraries/libtiff { };
 
+  libtiger = callPackage ../development/libraries/libtiger { };
+
   libtommath = callPackage ../development/libraries/libtommath { };
 
   libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { };
@@ -4040,6 +4050,8 @@ let
         # optional
   };
 
+  speechd = callPackage ../development/libraries/speechd { };
+
   speex = callPackage ../development/libraries/speex { };
 
   srtp = callPackage ../development/libraries/srtp {};
@@ -4755,6 +4767,8 @@ let
 
   iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };
 
+  iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { };
+
   kbd = callPackage ../os-specific/linux/kbd { };
 
   libcgroup = callPackage ../os-specific/linux/libcg { };
@@ -6346,6 +6360,13 @@ let
     inherit (gnome) gtk glib ORBit2 libbonobo libgnomeui GConf;
   };
 
+  mumble = callPackage ../applications/networking/mumble {
+    avahi = avahi.override {
+      qt4Support = true;
+      inherit qt4;
+    };
+  };
+
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
 
   msmtp = callPackage ../applications/networking/msmtp { };
@@ -7443,17 +7464,13 @@ let
     stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
   };
 
-  # The SQLite branch.
+  nixSqlite = nixUnstable;
-  nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix {
-    storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
-    stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
-  });
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
         autoconf libtool configureFlags enableScripts lib libxml2 boehmgc
-	pkgconfig flex bison;
+	pkgconfig flex bison sqlite;
       aterm = aterm25;
       db4 = db45;
       inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;

pkgs/top-level/release.nix

@@ -65,6 +65,9 @@ with (import ./release-lib.nix);
   dico = linux;
   dietlibc = linux;
   diffutils = all;
+  disnix = all;
+  disnixos = linux;
+  DisnixWebService = linux;
   docbook5 = all;
   docbook5_xsl = all;
   docbook_xml_dtd_42 = all;