Merge branch 'master' into stdenv-updates

ssp is disabled for glibc-2.13 unconditionally

VERSION

@@ -1 +1 @@
-0.14
+1.0

doc/package-notes.xml

@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-introduction">
+         xml:id="chap-package-notes">
 
 <title>Package Notes</title>
 

doc/release-notes.xml

@@ -5,6 +5,21 @@
 <title>Nixpkgs Release Notes</title>
 
 
+<section><title>Release 0.14 (June 4, 2012)</title>
+
+<para>In preparation for the switch from Subversion to Git, this
+release is mainly the prevent the Nixpkgs version number from going
+backwards.  (This would happen because prerelease version numbers
+produced for the Git repository are lower than those for the
+Subversion repository.)</para>
+
+<para>Since the last release, there have been thousands of changes and
+new packages by numerous contributors.  For details, see the commit
+logs.</para>
+
+</section>
+
+
 <section><title>Release 0.13 (February 5, 2010)</title>
 
 <para>As always, there are many changes.  Some of the most important

pkgs/applications/audio/ardour/ardour3.nix

@@ -6,16 +6,17 @@
 , python }:
 
 let
-  rev = "11483";
+  # Ardour 3 Beta 4a
+  rev = "12406";
 in
 
 stdenv.mkDerivation {
   name = "ardour3-svn-${rev}";
 
   src = fetchsvn {
-    url = http://subversion.ardour.org/svn/ardour2/tags/3.0-beta3;
+    url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
     inherit rev;
-    sha256 = "02az11lvfbln475np9jyfkdlrkpp1pszjmk6gl75wq6ws08dd7rd";
+    sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk";
   };
 
   buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec

pkgs/applications/audio/audacious/default.nix

@@ -4,19 +4,19 @@
 }:
 
 let
-  version = "3.2.1";
+  version = "3.2.2";
 in
 stdenv.mkDerivation {
   name = "audacious-${version}";
 
   src = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-    sha256 = "064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3";
+    sha256 = "1vj2f3jq67r9wc3s8p51w8338cjhidj3lpxmzyh31lrfikj21766";
   };
 
   pluginsSrc = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-    sha256 = "5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d";
+    sha256 = "1z5p4ny0kzszaki4f1fgrvcr0q1j6i19847jhplc07nl1rvycdy6";
   };
 
   # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.

pkgs/applications/audio/sonic-visualiser/default.nix

@@ -1,21 +1,24 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
-{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo,
+{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
-libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate,
+, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-libsndfile, makeWrapper, pulseaudio, qt4, redland, rubberband, vampSDK
+, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland
+, rubberband, vampSDK 
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "sonic-visualiser-1.8";
+  name = "sonic-visualiser-${version}";
+  version = "1.9";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.8.tar.gz;
+    url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
-    sha256 = "16ik6q9n92wljvnqcv7hyzb9v3yp3ixxp6df9kasf53fii973dh7";
+    sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
   };
 
   buildInputs =
     [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      pkgconfig
       # optional
       jackaudio
       # portaudio
@@ -46,8 +49,10 @@ stdenv.mkDerivation {
     description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber 
+    maintainers = 
-      stdenv.lib.maintainers.goibhniu ];
+      [ stdenv.lib.maintainers.marcweber 
+        stdenv.lib.maintainers.goibhniu 
+      ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/audio/spotify/default.nix

@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.6.6.10"; in
+let version = "0.8.3.278"; 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}.gbd39032.58-1_i386.deb";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_i386.deb";
-        sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523";
+        sha256 = "7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_amd64.deb";
-        sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c";
+        sha256 = "a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e";
       }
     else throw "Spotify not supported on this platform.";
 

pkgs/applications/audio/yoshimi/default.nix

@@ -5,11 +5,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "0.060.10";
+  version = "0.060.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0y67w7y515hx2bi5gfjgsw1hdah1bdrrvcfmqyjsvn7jbd0q47v1";
+    sha256 = "14javywkw6af9z9c7jr06rzdgzncyaz2ab6f0v0k6bgdndlcgslc";
   };
 
   buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
@@ -18,13 +18,6 @@ stdenv.mkDerivation  rec {
 
   preConfigure = "cd src";
 
-  patches = [
-    (fetchurl {
-      url = http://patch-tracker.debian.org/patch/series/dl/yoshimi/0.060.10-3/02-fluid_1.3.patch;
-      sha256 = "1sywirbaaw4zhn5ypga27j02qvrvqjwv3lw8kvzyj575q4c4qnri";
-    })
-  ];
-
   cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
 
   meta = with stdenv.lib; {

pkgs/applications/editors/emacs-24/default.nix

@@ -9,19 +9,19 @@ assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-24.0.94";
+  name = "emacs-24.1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
+    url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "1dgy53dxpnwrn6h3i3z8fpcyasms0wlvhqfyih4cwkz712var393";
+    sha256 = "eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c";
   };
 
-  buildInputs = 
+  buildInputs =
     [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
       libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
-    ] 
+    ]
     ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
     ++ stdenv.lib.optional stdenv.isLinux dbus;
 
@@ -45,7 +45,7 @@ EOF
   doCheck = true;
 
   meta = {
-    description = "PRETEST: GNU Emacs 24.x, the extensible, customizable text editor";
+    description = "GNU Emacs 24, the extensible, customizable text editor";
 
     longDescription = ''
       GNU Emacs is an extensible, customizable text editor—and more.  At its
@@ -64,7 +64,7 @@ EOF
       separately.
     '';
 
-    homepage = http://www.gnu.org/software/emacs/;
+    homepage = "http://www.gnu.org/software/emacs/";
     license = "GPLv3+";
 
     maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];

pkgs/applications/editors/emacs-modes/js2/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
-  name = "js2-mode-0-20120130";
+  name = "js2-mode-0-20120601";
 
   src = fetchgit {
     url = "git://github.com/mooz/js2-mode.git";
-    rev = "4c008b1987aa53769899e24808b6d74b41b4ff40";
+    rev = "81bcbf7df7077db27facf0470cf9e31c18b8333e";
-    sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be";
+    sha256 = "1bec62816ec9d5f5882832902020573d95d038fff25b17bf1975b84a3ab535c3";
   };
 
   buildInputs = [ emacs ];

pkgs/applications/editors/emacs-modes/proofgeneral/default.nix

@@ -22,6 +22,9 @@ stdenv.mkDerivation (rec {
        # @image{ProofGeneral} fails, so remove it.
        sed -i '94d' doc/PG-adapting.texi
        sed -i '101d' doc/ProofGeneral.texi
+
+       # Emacs 24 compatibility.
+       sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
     '';
 
   preBuild = ''

pkgs/applications/editors/kile/default.nix

@@ -1,16 +1,19 @@
 {stdenv, fetchurl, kdelibs, cmake, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kile-2.1";
+  name = "kile-2.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/kile/${name}.tar.bz2";
-    sha256 = "0ag6ya0625w34hpk0bpkjyi0ydw699zbkf86vwc19mh9cb0n0aic";
+    sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
   };
 
   buildNativeInputs = [ cmake gettext ];
   buildInputs = [ kdelibs ];
 
+  # for KDE 4.7 the nl translations fail since kile-2.1.2
+  preConfigure = "rm -r translations/nl";
+
   meta = {
     description = "An integrated LaTeX editor for KDE";
     homepage = http://kile.sourceforge.net;

pkgs/applications/editors/leksah/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "leksah";
-  version = "0.12.0.3";
+  version = "0.12.1.2";
-  sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd";
+  sha256 = "01gang44cdm9xg1dx1273prkhcniidagm2r90qh4v5mrdq8139v0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/applications/graphics/digikam/default.nix

@@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
 shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-2.5.0";
+  name = "digikam-2.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
+    sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
   };
 
   buildNativeInputs = [ cmake automoc4 pkgconfig ];
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
   # Make digikam find some FindXXXX.cmake
   KDEDIRS="${marble}:${qjson}";
 
-  patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];
-
   meta = {
     description = "Photo Management Program";
     license = "GPL";

pkgs/applications/graphics/digikam/ftbfs-libkipi.patch

@@ -1,68 +0,0 @@
-commit 25cc9c9876a5233bd630105d0110319892d4e18c
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Tue Jan 3 15:16:37 2012 +0100
-
-    enable checkall and clearall buttons only with libkipi version 1.4.0
-    BUGS: 290496
-
-diff --git a/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/core/utilities/setup/setupplugins.cpp
-+++ b/core/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
- 
-     panel->setLayout(mainLayout);
- 
-+#if KIPI_VERSION < 0x010400
-+    d->checkAllBtn->setVisible(false);
-+    d->clearBtn->setVisible(false);
-+#endif
-+
-     initPlugins();
- 
-     // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotCheckAll();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
- void SetupPlugins::slotClear()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotClear();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
-diff --git a/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/core/utilities/setup/setupplugins.h
-+++ b/core/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General

pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch

@@ -1,33 +0,0 @@
-commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de
-Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date:   Wed Jan 18 05:07:13 2012 +0400
-
-    Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR
-    
-    Some projects (e.g., digikam) include snapshots of this library into their
-    release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR.
-
-diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt
-index f19b28b..4310a74 100644
---- a/extra/libkvkontakte/CMakeLists.txt
-+++ b/extra/libkvkontakte/CMakeLists.txt
-@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include )
- 
- 
- # === Closer to the code, close to the body ===
--set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
-+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
- include(MacroLibrary)
-@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http:
- add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- 
- include_directories(
--  ${CMAKE_SOURCE_DIR}
--  ${CMAKE_BINARY_DIR}
-+  ${CMAKE_CURRENT_SOURCE_DIR}
-+  ${CMAKE_CURRENT_BINARY_DIR}
-   ${KDE4_INCLUDES}
-   ${QJSON_INCLUDE_DIR}
- )

pkgs/applications/graphics/gimp/2.8.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
+, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff
+, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
+, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
+
+stdenv.mkDerivation rec {
+  name = "gimp-2.8.0";
+  
+  src = fetchurl {
+    url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
+    md5 = "28997d14055f15db063eb92e1c8a7ebb";
+  };
+  
+  buildInputs = 
+    [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
+      freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit
+      libmng librsvg libwmf zlib libzip ghostscript aalib jasper
+      python pygtk libart_lgpl libexif gettext 
+    ];
+
+  passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
+
+  #configureFlags = [ "--disable-print" ];
+
+  # "screenshot" needs this.
+  NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
+
+  meta = {
+    description = "The GNU Image Manipulation Program";
+    homepage = http://www.gimp.org/;
+    license = "GPL";
+  };
+}

pkgs/applications/graphics/tesseract/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtiff }:
+{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }:
 
 let
   f = lang : sha256 : let
@@ -18,14 +18,21 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "tesseract-3.0.0";
+  name = "tesseract-3.0.1";
 
   src = fetchurl {
-    url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz;
+    url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz;
-    sha256 = "111r9hy1rcs2ch4kdi9dkzwch3xg38vv379sf3cjpkswkigx8clw";
+    sha256 = "c24b0bd278291bc93ab242f93841c1d8743689c943bd804afbc5b898dc0a1c9b";
   };
 
-  buildInputs = [ libtiff ];
+  buildInputs = [ autoconf automake libtool leptonica libpng libtiff ];
+
+  preConfigure = ''
+      ./autogen.sh
+      substituteInPlace "configure" \
+        --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \
+                  'LIBLEPT_HEADERSDIR=${leptonica}/include'
+  '';
 
   postInstall = extraLanguages;
 

pkgs/applications/graphics/zgrviewer/default.nix

@@ -0,0 +1,30 @@
+{stdenv, fetchurl, jre, unzip}:
+stdenv.mkDerivation rec {
+  version = "0.8.2";
+  pname = "zgrviewer";
+  name="${pname}-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip";
+    sha256 = "a76b9865c1490a6cfc08911592a19c15fe5972bf58e017cb31db580146f069bb";
+  };
+  buildInputs = [jre unzip];
+  buildPhase = "";
+  installPhase = ''
+    mkdir -p "$out"/{bin,lib/java/zvtm/plugins,share/doc/zvtm}
+
+    cp overview.html *.license.* "$out/share/doc/zvtm"
+
+    cp -r target/* "$out/lib/java/zvtm/"
+
+    echo '#!/bin/sh' > "$out/bin/zgrviewer"
+    echo "java -jar '$out/lib/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer"
+    chmod a+x "$out/bin/zgrviewer"
+  '';
+  meta = {
+    # Quicker to unpack locally than load Hydra
+    platforms = [];
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    license = with stdenv.lib.licenses; lgpl21Plus;
+    description = "GraphViz graph viewer/navigator";
+  };
+}

pkgs/applications/misc/bitcoin/default.nix

@@ -1,30 +1,24 @@
 { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.6.2";
   name = "bitcoin-${version}";
 
   src = fetchurl {
-    url = " https://github.com/bitcoin/bitcoin/tarball/v${version}";
+    url = "mirror://sourceforge/bitcoin/bitcoin-0.6.2-linux.tar.gz";
-    sha256 = "1i9wnbjf9yrs9rq5jnh9pk1x5j982qh3xpjm05z8dgd3nympgyy8";
+    sha256 = "0yhgqz98hmmn6ljk23rd48jsjfvzdii27370vazhbgvjwj8giais";
   };
 
   buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
 
-  unpackCmd = "tar xvf $curSrc";
+  configurePhase = ''
-
-  buildPhase = ''
-    qmake
-    make
     cd src
-    make -f makefile.unix
+    qmake
-    cd ..
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     cp bitcoin-qt $out/bin
-    cp src/bitcoind $out/bin
   '';
 
   meta = { 

pkgs/applications/misc/gnome_terminator/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-terminator-0.96";
+  
+  src = fetchurl {
+    url = "https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz";
+    sha256 = "d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201";
+  };
+  
+  buildInputs =
+    [ python pygtk vte gettext intltool makeWrapper
+    ];
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    python setup.py --without-icon-cache install --prefix=$out
+    for i in $(cd $out/bin && ls); do
+        wrapProgram $out/bin/$i \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+    done
+  '';
+
+  meta = {
+    description = "Gnome terminal emulator with support for tiling and tabs.";
+    homepage = http://www.tenshu.net/p/terminator.html;
+    license = "GPLv2";
+  };
+}

pkgs/applications/misc/ikiwiki/default.nix

@@ -12,14 +12,14 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20120419";
+  version = "3.20120516";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "0d4fd709f4b3d33336d2dfa27f08e1473019d87869d9c1ffcb77f3ca9c434eaf";
+    sha256 = "b75097d4f4db79a16f8b74bc4e7f824a586e0e150ecf18103888bbe553a41eb0";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

pkgs/applications/misc/lyx/default.nix

@@ -4,25 +4,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.0.3";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
-    sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
+    sha256 = "1j2sl22w41h4vrgnxv2n0s7d11k6zchjbggjw3ai9yxcahvrj72f";
   };
 
   buildInputs = [texLive qt python makeWrapper pkgconfig ];
 
-  # don't ask me why it can't find libX11.so.6
+  meta = {
-  postInstall = ''
+    description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
-    wrapProgram $out/bin/lyx \
+    homepage = "http://www.lyx.org";
-      --prefix LD_LIBRARY_PATH ":" ${libX11}/lib
+    license = "GPL2";
-  '';
+    maintainers = [ stdenv.lib.maintainers.neznalek ];
-
+    platforms = stdenv.lib.platforms.linux;
-  meta = { 
-      description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
-      homepage = "http://www.lyx.org";
-      license = "GPL2";
   };
 }

pkgs/applications/misc/stardict/stardict-3.0.3-compositelookup_cpp.patch

@@ -0,0 +1,19 @@
+This patch is from OpenSUSE .src.rpm for the following crash on startup:
+
+ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
+
+--- dict/src/lib/compositelookup.cpp
++++ dict/src/lib/compositelookup.cpp
+@@ -50,8 +50,10 @@
+ void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
+ {
+ 	NetDictRequest request(dict_id, key);
+-	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
+-	NetDictRequests.push_back(request);
++	if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
++	{
++	  NetDictRequests.push_back(request);
++	}
+ }
+ 
+ /* returns true if got expected response */

pkgs/applications/misc/stardict/stardict-3.0.3-correct-glib-include.patch

@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/396219
+
+--- dict/src/tomboykeybinder.h
++++ dict/src/tomboykeybinder.h
+@@ -21,7 +21,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 

pkgs/applications/misc/stardict/stardict-3.0.3-entry.patch

@@ -0,0 +1,20 @@
+warning: key "Encoding" in group "Desktop Entry" is deprecated
+error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension
+error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools
+
+--- dict/data/stardict.desktop.in
++++ dict/data/stardict.desktop.in
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=StarDict
+ _Comment=Lookup words
+ Exec=stardict
+ Terminal=false
+ Type=Application
+-Icon=stardict.png
++Icon=stardict
+ StartupNotify=true
+-Categories=Utility;Dictionary;
++Categories=Utility;Office;TextTools;Dictionary;
+ X-GNOME-DocPath=stardict/stardict.xml

pkgs/applications/misc/stardict/stardict-3.0.3-gcc46.patch

@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/362299
+
+--- dict/stardict-plugins/stardict-wordnet-plugin/scene.h
++++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h
+@@ -25,6 +25,8 @@
+ #ifndef __PHYSICS_H__
+ #define __PHYSICS_H__
+ 
++#include <cstddef>
++
+ #include "partic.h"
+ #include "spring.h"
+ 

pkgs/applications/misc/stardict/stardict-3.0.3-overflow.patch

@@ -0,0 +1,26 @@
+This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for:
+
+warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default]
+
+--- tools/src/myspell2dic.c
++++ tools/src/myspell2dic.c
+@@ -132,7 +132,7 @@ if (argc<3) 
+ 
+ fprintf(stderr, "Enter grammar language [Spanish]: ");
+ fflush(stderr);
+-fgets(lang, 100, stdin);
++fgets(lang, 50, stdin);
+ if ((p=strchr(lang, '\n'))!=NULL) *p=0;
+ if (*lang==0) strcpy(lang, "Spanish");
+ 
+--- tools/src/ooo2dict.c
++++ tools/src/ooo2dict.c
+@@ -71,7 +71,7 @@ current2=malloc(10000);
+ 
+ fprintf(stderr, "Enter thesaurus language [WordNet_English]: ");
+ fflush(stderr);
+-fgets(lang, 100, stdin);
++fgets(lang, 50, stdin);
+ if ((p=strchr(lang, '\n'))!=NULL) *p=0;
+ if (*lang==0) strcpy(lang, "WordNet_English");
+ F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt");

pkgs/applications/misc/stardict/stardict-3.0.3-zlib-1.2.5.2.patch

@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/401887
+
+diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp
+index 16770a3..a4299e7 100644
+--- a/lib/src/libcommon.cpp
++++ b/lib/src/libcommon.cpp
+@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name)
+ 		return EXIT_FAILURE;
+ 	}
+ 	while(true) {
+-		len = gzread(get_impl(in), buf, buffer_size);
++		len = gzread((gzFile)get_impl(in), buf, buffer_size);
+ 		if(len < 0) {
+ 			g_critical(read_file_err, arch_file_name, "");
+ 			return EXIT_FAILURE;
+@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path)
+ 		return res;
+ 	}
+ }
++
++int gzclose_compat(void * file)
++{
++    return gzclose ((gzFile)file);
++}
+diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h
+index 10f13b4..bdcbf2f 100644
+--- a/lib/src/libcommon.h
++++ b/lib/src/libcommon.h
+@@ -187,8 +187,9 @@ namespace clib {
+ 	typedef ResourceWrapper<FILE, FILE*, int, fclose> File;
+ }
+ 
++extern int gzclose_compat(void * file);
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.

pkgs/applications/misc/stardict/stardict.nix

@@ -0,0 +1,46 @@
+{stdenv, fetchurl, pkgconfig, gtk, glib, zlib, libxml2, intltool, gnome_doc_utils, libgnomeui, scrollkeeper, mysql, pcre, which, libxslt}:
+stdenv.mkDerivation rec {
+  name= "stardict-3.0.3";
+
+  src = fetchurl {
+    url = "http://stardict-3.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv";
+  };
+
+  buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt];
+
+  postPatch = ''
+    # mysql hacks: we need dynamic linking as there is no libmysqlclient.a
+    substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/'
+    substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]'
+    substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/'
+    substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so'
+    substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so'
+
+    # a list of p0 patches from gentoo devs
+    patch -p0 < ${./stardict-3.0.3-overflow.patch}
+    patch -p0 < ${./stardict-3.0.3-gcc46.patch}
+    patch -p0 < ${./stardict-3.0.3-compositelookup_cpp.patch}
+    patch -p0 < ${./stardict-3.0.3-correct-glib-include.patch}
+    patch -p0 < ${./stardict-3.0.3-entry.patch}
+
+    # disable the xsltproc internet query
+    substituteInPlace dict/help/Makefile.am --replace 'xsltproc -o' 'xsltproc --nonet -o'
+    substituteInPlace dict/help/Makefile.in --replace 'xsltproc -o' 'xsltproc --nonet -o'
+  '';
+
+  # another gentoo patch: a p1 patch
+  patches = [ ./stardict-3.0.3-zlib-1.2.5.2.patch ];
+
+  configurePhase = ''
+    ./configure --disable-spell --disable-gucharmap --disable-festival --disable-espeak --disable-scrollkeeper --prefix=$out
+  '';
+
+  meta = {
+    description = "stardict";
+    homepage = "A international dictionary supporting fuzzy and glob style matching";
+    license = "LGPL3";
+    maintainers = with stdenv.lib.maintainers; [qknight];
+  };
+}
+

pkgs/applications/misc/xfontsel/default.nix

@@ -2,7 +2,7 @@
 # at http://www.x.org/releases/individual/.
 # That is why this expression is not inside pkgs.xorg
 
-{stdenv, fetchurl, libX11, pkgconfig, libXaw}:
+{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}:
 stdenv.mkDerivation rec {
   name = "xfontsel-1.0.2";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
   };
 
-  buildInputs = [libX11 pkgconfig libXaw];
+  buildInputs = [libX11 makeWrapper pkgconfig libXaw];
 
   # Without this, it gets Xmu as a dependency, but without rpath entry
   NIX_LDFLAGS = "-lXmu";
@@ -19,8 +19,10 @@ stdenv.mkDerivation rec {
   # This will not make xfontsel find its app-defaults, but at least the $out
   # directory will contain them.
   # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
-  preInstall = ''
+  installPhase = ''
-    installFlags="appdefaultdir=$out/share/X11/app-defaults"
+    make install appdefaultdir=$out/share/X11/app-defaults
+    wrapProgram $out/bin/xfontsel \
+      --set XAPPLRESDIR $out/share/X11/app-defaults
   '';
 
   meta = {

pkgs/applications/misc/xmobar/default.nix

@@ -1,18 +1,21 @@
 { cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
-, X11, X11Xft
+, wirelesstools, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.14";
+  version = "0.15";
-  sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
+  sha256 = "1wa141bf3krzr8qcd9cyix3cflbw1yr1l3299ashjs7skqnjadcl";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     filepath mtl parsec stm time utf8String X11 X11Xft
   ];
-  extraLibraries = [ libXrandr ];
+  extraLibraries = [ libXrandr wirelesstools ];
-  configureFlags = "-fwith_xft";
+  configureFlags = "-fwith_xft -fwith_iwlib";
+  patchPhase = ''
+    sed -i -e 's|mtl ==.*$|mtl,|' xmobar.cabal
+  '';
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
     description = "A Minimalistic Text Based Status Bar";

pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch

@@ -0,0 +1,14 @@
+diff --git a/printing/printing.gyp b/printing/printing.gyp
+index 19fa1b2..f11d76e 100644
+--- a/printing/printing.gyp
++++ b/printing/printing.gyp
+@@ -26,6 +26,9 @@
+       'include_dirs': [
+         '..',
+       ],
++      'cflags': [
++        '-Wno-deprecated-declarations',
++      ],
+       'sources': [
+         'backend/print_backend.cc',
+         'backend/print_backend.h',

pkgs/applications/networking/browsers/chromium/default.nix

@@ -1,62 +1,187 @@
-{ GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
+{ stdenv, getConfig, fetchurl, makeWrapper, which
-, fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes
-, glib, gtk, gdk_pixbuf, pango
-, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst, libXcomposite
-, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
-, stdenv, unzip, zlib, pam, pcre, udev }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
+# default dependencies
+, bzip2, flac, speex
+, libevent, expat, libjpeg
+, libpng, libxml2, libxslt
+, xdg_utils, yasm, zlib
 
-stdenv.mkDerivation rec {
+, python, perl, pkgconfig
-  name = "chromium-19.0.1061.0-pre${version}";
+, nspr, udev, krb5
+, utillinux, alsaLib
+, gcc, bison, gperf
+, glib, gtk, dbus_glib
+, libXScrnSaver, libXcursor, mesa
 
-  # To determine the latest revision, get
+# optional dependencies
-  # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
+, libgnome_keyring # config.gnomeKeyring
-  # For the version number, see ‘about:version’.
+, gconf # config.gnome
-  version = "124950";
+, libgcrypt # config.gnome || config.cups
-  
+, nss, openssl # config.openssl
-  src =
+, pulseaudio # config.pulseaudio
-    if stdenv.system == "x86_64-linux" then
+, libselinux # config.selinux
-      fetchurl {
+}:
-        url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
-        sha256 = "4472bf584a96e477e2c17f96d4452dd41f4f34ac3d6a9bb4c845cf15d8db0c73";
-      }
-    else if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
-        sha256 = "6e8a49d9917ee26b67d14cd10b85711c3b9382864197ba02b3cfe8e636d3d69c";
-      }
-    else throw "Chromium is not supported on this platform.";
 
-  phases = "unpackPhase installPhase";
+let
+  mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default);
 
-  buildInputs = [ makeWrapper unzip ];
+  config = mkConfigurable {
+    selinux = false;
+    nacl = false;
+    openssl = true;
+    gnome = false;
+    gnomeKeyring = false;
+    proprietaryCodecs = true;
+    cups = false;
+    pulseaudio = getConfig ["pulseaudio"] true;
+  };
 
-  libPath =
+  sourceInfo = import ./source.nix;
-    stdenv.lib.makeLibraryPath
+
-       [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
+  mkGypFlags = with stdenv.lib; let
-         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXcomposite
+    sanitize = value:
-         libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
+      if value == true then "1"
-         libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
+      else if value == false then "0"
-         glib gtk gdk_pixbuf pango
+      else "${value}";
-         pam udev
+    toFlag = key: value: "-D${key}=${sanitize value}";
-       ];
+  in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
+
+  gypFlagsUseSystemLibs = {
+    use_system_bzip2 = true;
+    use_system_flac = true;
+    use_system_libevent = true;
+    use_system_libexpat = true;
+    use_system_libjpeg = true;
+    use_system_libpng = true;
+    use_system_libxml = true;
+    use_system_speex = true;
+    use_system_ssl = true;
+    use_system_stlport = true;
+    use_system_xdg_utils = true;
+    use_system_yasm = true;
+    use_system_zlib = true;
+
+    use_system_harfbuzz = false;
+    use_system_icu = false;
+    use_system_libwebp = false; # See chromium issue #133161
+    use_system_skia = false;
+    use_system_sqlite = false; # See chromium issue #22208
+    use_system_v8 = false;
+  };
+
+  defaultDependencies = [
+    bzip2 flac speex
+    libevent expat libjpeg
+    libpng libxml2 libxslt
+    xdg_utils yasm zlib
+  ];
+
+in stdenv.mkDerivation rec {
+  name = "${packageName}-${version}";
+  packageName = "chromium";
+
+  version = sourceInfo.version;
+
+  src = fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.sha256;
+  };
+
+  buildInputs = defaultDependencies ++ [
+    which makeWrapper
+    python perl pkgconfig
+    nspr udev
+    (if config.openssl then openssl else nss)
+    utillinux alsaLib
+    gcc bison gperf
+    krb5
+    glib gtk dbus_glib
+    libXScrnSaver libXcursor mesa
+  ] ++ stdenv.lib.optional config.gnomeKeyring libgnome_keyring
+    ++ stdenv.lib.optionals config.gnome [ gconf libgcrypt ]
+    ++ stdenv.lib.optional config.selinux libselinux
+    ++ stdenv.lib.optional config.cups libgcrypt
+    ++ stdenv.lib.optional config.pulseaudio pulseaudio;
+
+  opensslPatches = stdenv.lib.optional config.openssl openssl.patches;
+
+  prePatch = "patchShebangs .";
+
+  patches = stdenv.lib.optional (!config.selinux) ./enable_seccomp.patch
+         ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch
+         ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch;
+
+  postPatch = stdenv.lib.optionalString config.openssl ''
+    cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+  '';
+
+  gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
+    linux_use_gold_binary = false;
+    linux_use_gold_flags = false;
+    proprietary_codecs = false;
+    use_gnome_keyring = config.gnomeKeyring;
+    use_gconf = config.gnome;
+    use_gio = config.gnome;
+    use_pulseaudio = config.pulseaudio;
+    disable_nacl = !config.nacl;
+    use_openssl = config.openssl;
+    selinux = config.selinux;
+    use_cups = config.cups;
+  } // stdenv.lib.optionalAttrs config.proprietaryCodecs {
+    # enable support for the H.264 codec
+    proprietary_codecs = true;
+    ffmpeg_branding = "Chrome";
+  } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") {
+    target_arch = "x64";
+  } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") {
+    target_arch = "ia32";
+  });
+
+  buildType = "Release";
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
+  '';
+
+  makeFlags = let
+    CC = "${gcc}/bin/gcc";
+    CXX = "${gcc}/bin/g++";
+  in [
+    "CC=${CC}"
+    "CXX=${CXX}"
+    "CC.host=${CC}"
+    "CXX.host=${CXX}"
+    "LINK.host=${CXX}"
+  ];
+
+  buildFlags = [
+    "BUILDTYPE=${buildType}"
+    "library=shared_library"
+    "chrome"
+  ];
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -vp "$out/libexec/${packageName}"
-    mkdir -p $out/libexec/chrome
+    cp -v "out/${buildType}/"*.pak "$out/libexec/${packageName}/"
+    cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/${packageName}/"
 
-    cp -R * $out/libexec/chrome
+    cp -v "out/${buildType}/chrome" "$out/libexec/${packageName}/${packageName}"
 
-    strip $out/libexec/chrome/chrome
+    mkdir -vp "$out/bin"
-    
+    makeWrapper "$out/libexec/${packageName}/${packageName}" "$out/bin/${packageName}"
-    ${patchelf}/bin/patchelf \
-      --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \
-      $out/libexec/chrome/chrome
 
-    makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \
+    mkdir -vp "$out/share/man/man1"
-      --prefix LD_LIBRARY_PATH : "${pcre}/lib:${nss}/lib"
+    cp -v "out/${buildType}/chrome.1" "$out/share/man/man1/${packageName}.1"
+
+    for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
+      num_and_suffix="''${icon_file##*logo_}"
+      icon_size="''${num_and_suffix%.*}"
+      logo_output_path="$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps"
+      mkdir -vp "$logo_output_path"
+      cp -v "$icon_file" "$logo_output_path/${packageName}.png"
+    done
   '';
 
   meta =  with stdenv.lib; {

pkgs/applications/networking/browsers/chromium/enable_seccomp.patch

@@ -0,0 +1,20 @@
+diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h
+index a07d6f3..a622a35 100644
+--- a/content/common/seccomp_sandbox.h
++++ b/content/common/seccomp_sandbox.h
+@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() {
+   // TODO(evan): turn on for release too once we've flushed out all the bugs,
+   // allowing us to delete this file entirely and just rely on the "disabled"
+   // switch.
+-#ifdef NDEBUG
+-  // Off by default; allow turning on with a switch.
+-  return CommandLine::ForCurrentProcess()->HasSwitch(
+-      switches::kEnableSeccompSandbox);
+-#else
+   // On by default; allow turning off with a switch.
+   return !CommandLine::ForCurrentProcess()->HasSwitch(
+       switches::kDisableSeccompSandbox);
+-#endif  // NDEBUG
+ }
+ #endif  // SECCOMP_SANDBOX
+ 

pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch

@@ -0,0 +1,12 @@
+diff --git a/media/media.gyp b/media/media.gyp
+index 2a8c6c6..66ca767 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -399,6 +399,7 @@
+             ['use_pulseaudio == 1', {
+               'cflags': [
+                 '<!@(pkg-config --cflags libpulse)',
++                '-Wno-array-bounds',
+               ],
+               'link_settings': {
+                 'libraries': [

pkgs/applications/networking/browsers/chromium/source.nix

@@ -0,0 +1,5 @@
+{
+  version = "21.0.1179.1";
+  url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1179.1.tar.bz2";
+  sha256 = "1ynm1dv8nwjg6a0absid1g3r62y0mpb74pmal8g9nmqb92rlkdnc";
+}

pkgs/applications/networking/browsers/chromium/update.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
+
+get_newest_version()
+{
+    curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*</h;${
+    g;s/^.*<Key>chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p
+    }';
+}
+
+cd "$(dirname "$0")";
+
+version="$(get_newest_version)";
+
+if [ -e source.nix ]; then
+    oldver="$(sed -n 's/^ *version *= *"\([^"]\+\)".*$/\1/p' source.nix)";
+    if [ "x$oldver" = "x$version" ]; then
+        echo "Already the newest version: $version" >&2;
+        exit 1;
+    fi;
+fi;
+
+url="${bucket_url%/}/chromium-$version.tar.bz2";
+
+sha256="$(nix-prefetch-url "$url")";
+
+cat > source.nix <<EOF
+{
+  version = "$version";
+  url = "$url";
+  sha256 = "$sha256";
+}
+EOF

pkgs/applications/networking/browsers/firefox/11.0.nix

@@ -1,181 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "11.0";
-  
-  xulVersion = "11.0"; # this attribute is used by other packages
-
-  
-  src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    md5 = "4b07acf47857aff72776d805409cdd1b";
-  };
-  
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      # "--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      "--enable-system-sqlite"
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer" 
-      "--disable-updater"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-    
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
-        xlibs.libXScrnSaver xlibs.scrnsaverproto
-        xlibs.libXext xlibs.xextproto sqlite unzip
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    enableParallelBuilding = true;
-      
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":" 
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-      '';
-
-    # !!! Temporary hack.
-    preBuild =
-      ''
-        export NIX_ENFORCE_PURITY=
-      '';
-
-    installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/bin/xulrunner \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
-
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      mv xulrunner ../lib/$libDir/
-
-      for i in $out/lib/$libDir/*; do 
-          file $i;
-          if file $i | grep executable &>/dev/null; then 
-              echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
-              chmod a+x "$out/bin/$(basename "$i")";
-          fi;
-      done;
-      for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
-              patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done;
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-      
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman yasm mesa sqlite file unzip
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-        "--disable-elf-hack"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":" 
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-        for j in $out/bin/*; do 
-	    i="$(readlink "$j")";
-            file $i;
-            if file $i | grep executable &>/dev/null; then 
-	        rm "$out/bin/$(basename "$i")"
-                echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
-                chmod a+x "$out/bin/$(basename "$i")"
-            fi;
-        done;
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}

pkgs/applications/networking/browsers/firefox/13.0.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip
+, yasm, mesa, sqlite, unzip, makeWrapper
 
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "10.0.2";
+  firefoxVersion = "13.0.1";
   
-  xulVersion = "10.0.2"; # this attribute is used by other packages
+  xulVersion = "13.0.1"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "d9b459d915d4638a48b3e249fcbaf7cafc27e834";
+    sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1";
   };
   
   commonConfigureFlags =
@@ -35,7 +35,7 @@ rec {
       "--with-system-nspr"
       # "--with-system-nss"
       # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
+      # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
       "--enable-system-sqlite"
       "--disable-crashreporter"
       "--disable-tests"
@@ -56,7 +56,7 @@ rec {
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
         alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
         xlibs.libXScrnSaver xlibs.scrnsaverproto
-        xlibs.libXext xlibs.xextproto sqlite unzip
+        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       ];
 
     configureFlags =
@@ -75,7 +75,11 @@ rec {
         }' ';'
 
         export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-      '';
+
+        mkdir ../objdir
+        cd ../objdir
+        configureScript=../mozilla-release/configure
+      ''; # */
 
     # !!! Temporary hack.
     preBuild =
@@ -104,10 +108,13 @@ rec {
               echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
               chmod a+x "$out/bin/$(basename "$i")";
           fi;
-      done;
+      done
-      for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
+      for i in $out/lib/$libDir/*.so; do
-              patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done;
+      done
+      for i in $out/lib/$libDir/{xpcshell,plugin-container}; do
+          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
+      done
       rm -f $out/bin/run-mozilla.sh
     ''; # */
 

pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix

@@ -40,18 +40,18 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "google-talk-plugin-2.8.5.0";
+  name = "google-talk-plugin-2.9.10.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
-        sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh";
+        sha256 = "1dma067h7qj8rbcnm0n7wy3wd1clkysq9xj4kaxijbb5zrw06k3q";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm";
-        sha256 = "0sclsj6mcaynkw28kipgmcj6sx5vbyrz1rwwyx89ll48n46k65ya";
+        sha256 = "02ymhhbfby0sn9132cvdr6jp9c7sk6hfg0jwg1fc3kzjg7q3y7fs";
       }
     else throw "Google Talk does not support your platform.";
 

pkgs/applications/networking/browsers/opera/default.nix

@@ -13,18 +13,18 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "opera-11.51-1087";
+  name = "opera-11.64-1403";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "${mirror}/linux/1151/${name}.i386.linux.tar.bz2";
+        url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz";
-        sha256 = "1baaim404g8nwd7knbl1p1ardpx36ib5159nkvqfnnavfyhkinp2";
+        sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "${mirror}/linux/1151/${name}.x86_64.linux.tar.xz";
+        url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz";
-        sha256 = "1bciqyfhhdywaasj717by1a975ywf672r3pv9cw9bn0b90pgp933";
+        sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

pkgs/applications/networking/browsers/vimprobable2/default.nix

@@ -2,10 +2,10 @@
   pkgconfig, webkit }:
 
 stdenv.mkDerivation {
-  name = "vimprobable2-1.0.0";
+  name = "vimprobable2-1.0.2";
   src = fetchurl {
-    url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.0.tar.bz2";
+    url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.2.tar.bz2";
-    sha256 = "1jlx8ssgk42vg1d70n0aa86lr5zixdkkagmcxjc4c7pjvh8vq3gn";
+    sha256 = "19gwlfv0lczbns73xg3637q7ixly62y3ijccnv0m1bqaqxjl4v8x";
   };
   buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
   installPhase = ''

pkgs/applications/networking/instant-messengers/skype/default.nix

@@ -5,11 +5,11 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "skype-2.2.0.35";
+  name = "skype-4.0.0.7";
 
   src = fetchurl {
     url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm";
+    sha256 = "0mrswawqsv53mfghqlj1bzq0jfswha6b0c06px7snd85pd4gn5fn";
   };
 
   buildInputs = 

pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix

@@ -2,11 +2,11 @@
 , sqlite, libsoup, libnice, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.15.4";
+  name = "telepathy-gabble-0.16.0";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "0rgqxsdcxds0ljcc01f9ifav26y80p4my37wqzkicr9hmv54h98s";
+    sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf";
   };
 
   buildNativeInputs = [pkgconfig libxslt];

pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }:
+
+stdenv.mkDerivation rec {
+  pname = "telepathy-haze";
+  name = "${pname}-0.6.0";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    sha256 = "1qrgmcr8ga6nvaz9hhn0mv0p7v799wsawrg3k5l791cgxx5carz2";
+  };
+
+  buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
+
+  buildNativeInputs = [ pkgconfig libxslt ];
+
+  meta = {
+    description = "A Telepathy connection manager based on libpurple";
+    platforms = stdenv.lib.platforms.gnu; # Random choice
+  };
+}

pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix

@@ -1,13 +0,0 @@
-[
-{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0i4x4z6w4l9ngx0j258p2vjmsnsdn8hckq7cfld1iliq6fxb1vwv";}
-{name="ktp-approver";key="approver";sha256="0nj89jsina8b736sygxia8jmz6l81n6j0ffin8cpqbp9mczzpv9f";}
-{name="ktp-auth-handler";key="auth_handler";sha256="1fggj8aa56m7ycwi4q44kfzlx6gfigk0zaq8lhms4wdhm6736fhs";}
-{name="ktp-common-internals";key="common_internals";sha256="196f6gkfb3w11qdbamwvkq6hxk2zbdc3js53mh352yhmdyf3cya6";}
-{name="ktp-contact-applet";key="contact_applet";sha256="1vhv78qcyna1r4lmzpixb2a0p973ywjyi1izy8jf1vfhy3kk28dw";}
-{name="ktp-contact-list";key="contact_list";sha256="15gnm09j4g6ip7vgisayd3ixv2sryjazakzkfksxfkdxl3mgfzg3";}
-{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1mq48clrlqwbg08211pr7hm24kagjzd8zs287mk9xl2wbv70jgc1";}
-{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1p47dks5cvda4i8xhij01z1qmcv2vw27az0la15rhzqlf8kh4sam";}
-{name="ktp-presence-applet";key="presence_applet";sha256="1npr59g42yxb67dnplingqa2paaxdw60p99kilbvw15chfbrh47r";}
-{name="ktp-send-file";key="send_file";sha256="1961zh4b1bamjyqw3wkm2aclx5sbfbr84i3x7lvfr74vw6cky8mc";}
-{name="ktp-text-ui";key="text_ui";sha256="184zyw6l779nkgpc5dx9lcmh543kmr4ay8cvm8vsnrsknn6p0dgp";}
-]

pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix

@@ -0,0 +1,13 @@
+[
+{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1lkqiwibxabg5p3k8l0zyzjyysi56dvbbcxp1sybd81hmxf6fzxh";}
+{name="ktp-approver";key="approver";sha256="0bw3i8av55n93ac6phvar03b6rz34wbqrzx7l2vd48d0y5ib0j6m";}
+{name="ktp-auth-handler";key="auth_handler";sha256="0kby9935df474b7jvzzg7v3zvrgml5caf96ps4dcrcvyz91ckd1y";}
+{name="ktp-common-internals";key="common_internals";sha256="1g22b0g9g14dsdl0qkdglgkf26c3pjc96q19kj2kai1i644i8k5h";}
+{name="ktp-contact-applet";key="contact_applet";sha256="0iwr202snsm72xjxv1jb9z24j8ikdx6ljaz5v9i0ha8f8rb1vrp5";}
+{name="ktp-contact-list";key="contact_list";sha256="06y1cw2kkn6ig5qnmzl7bdz9nghpv2c83c9vf9glgbxf77qfg3ms";}
+{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1cdnl4sn34lmm7h7qv8rrkp7ia5gcg2704fqhvpv8n8gxwwhrc1a";}
+{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1ccihqk0pg28v2q6p9dx37ql7hnwdz2060jf1s6p9yyd27fc4is0";}
+{name="ktp-presence-applet";key="presence_applet";sha256="0zgl8z81kmy2a03kzgvvqlr244cw9gw2kfrph1d6ax8zk4fqvxnz";}
+{name="ktp-send-file";key="send_file";sha256="1d1j0klp8dvmldn5c19zqfsxcm5hbaq5fxikpjg0q3j9ib8yh9la";}
+{name="ktp-text-ui";key="text_ui";sha256="0qikjh8ywlnwkfr4nd4hc9b15b824simhdj3n62yd87pmkk3avw6";}
+]

pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix

@@ -0,0 +1,16 @@
+[
+{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1a312cfm1i8ipqp0r09zfhlk7vacp006pbhwwvyf0sgracizr0cp";}
+{name="ktp-approver";key="approver";sha256="0wfpwlk5f3n37xl619jzjxmgrq81qnr9kg9m955zbcad2jsx3z35";}
+{name="ktp-auth-handler";key="auth_handler";sha256="1q5jjj3np3kg7py28jb74q8lpi6camw7907950igpnwzbzmacxwa";}
+{name="ktp-call-ui";key="call_ui";sha256="08k59q0gf6fq0mmz72akiqkldqy6grw1gs7jz44gzmr82jvaqjb3";}
+{name="ktp-common-internals";key="common_internals";sha256="1cmil7wp6rgqzl0bciphqmvdzipm856c45kx2mzrk6n1vnl9l500";}
+{name="ktp-contact-applet";key="contact_applet";sha256="1j42yqq06bkpfb4jgm88qqbwnz9538ys5aghyfg147jr50h9pk8k";}
+{name="ktp-contact-list";key="contact_list";sha256="1ndpr2z99clmy8f7l8l6ws7bljmmqvfrb5f0nrym91lyvcdz7sb2";}
+{name="ktp-contact-runner";key="contact_runner";sha256="1v8mcp8q1cfmxdg65qqh159q9pynz3pc3y0ycr6hn1nrgxncs48k";}
+{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0dj2if34wxajwylgfxwd5chvxk63lxmsq52sc039dsj9p174cp3y";}
+{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0p873h6cjdinfinfz1cggyw611v2gllmkvzczszxnl8q2hcprx96";}
+{name="ktp-presence-applet";key="presence_applet";sha256="1y8yhbbjp9qgycn93lqd6ss7jln1hpxa0dnqgirijfjn15c20nfl";}
+{name="ktp-send-file";key="send_file";sha256="0sacvda2xs5g7w2xca9p6z61f2w69sgw0g3sj2fazrsm0x7a0z0d";}
+{name="ktp-text-ui";key="text_ui";sha256="1xsslwaisk90wa45rgps3500wl1fbxq4qp6njljf4qbysyw4wfdb";}
+{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="1398iyb72grhwwi0idxdwj1qdi2s02cp2wvjv72wvv3vyfwb51kn";}
+]

pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch

@@ -1,24 +0,0 @@
-commit eaf09e1242408ac8652ba3ffd1d698326e4b2360
-Author: Rohan Garg <rohangarg@kubuntu.org>
-Date:   Wed Feb 8 00:19:19 2012 +0530
-
-    Do not use CMake 2.8 just yet
-    
-    CMake 2.8 has some scope issues which cause the pofile target to
-    interfere while building translations in the tarball releases.
-    Not requiring CMake 2.8 fixes the build issue.
-    
-    BUGS: 292593 293030
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b34038..50e94f3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,5 @@
- project(ktp-contact-applet)
- 
--cmake_minimum_required(VERSION 2.8)
--
- set(CMAKE_MODULE_PATH
-     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-     ${CMAKE_MODULE_PATH}

pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix

@@ -1,18 +1,34 @@
-{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, gettext, pkgconfig
+{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs
-, qt_gstreamer }:
+, pkgconfigUpstream , qt_gstreamer, telepathy_glib, telepathy_logger, qjson, flex, bison }:
 
 let
-  version = "0.3.0";
+  pkgconfig = pkgconfigUpstream;
+  version = "0.4.0";
   manifest = import (./. + "/${version}.nix");
+
   overrides = {
-    presence_applet = x : (x // { patches = [ ./presence-applet-po.patch ]; });
+    telepathy_logger_qt = x : x // {
-    contact_applet = x: (x // { patches = [ ./contact-applet-po.patch ]; });
+      NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0";
+    };
   };
+
+  extraBuildInputs = {
+    auth_handler = [ qjson ];
+    call_ui = [ qt_gstreamer telepathy_glib ];
+    contact_applet = [ kde_workspace ];
+    telepathy_logger_qt = [ telepathy_logger qt_gstreamer ];
+    text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ];
+  };
+
+  extraBuildNativeInputs = {
+    telepathy_logger_qt = [ flex bison ];
+  };
+
   ktpFun = { name, key, sha256 }:
   {
     name = key;
     value = stdenv.mkDerivation (
-      (if builtins.hasAttr key overrides then builtins.getAttr key overrides else (x: x))
+      (stdenv.lib.attrByPath [ key ] (x : x) overrides)
       {
         name = "${name}-${version}";
 
@@ -21,9 +37,10 @@ let
           inherit sha256;
         };
 
-        buildNativeInputs = [ gettext pkgconfig ];
+        buildNativeInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraBuildNativeInputs);
         buildInputs = [ kdelibs telepathy_qt ]
-          ++ stdenv.lib.optional (name != "ktp-common-internals") common_internals;
+          ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
+          ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);
 
         meta = {
           inherit (kdelibs.meta) platforms;
@@ -33,26 +50,10 @@ let
     );
   };
 
-  stable = builtins.listToAttrs (map ktpFun manifest);
+  ktp = builtins.listToAttrs (map ktpFun manifest);
-  unstable = {
-    call_ui = stdenv.mkDerivation {
-      name = "ktp-call-ui-20120314";
-
-      src = fetchgit {
-        url = git://anongit.kde.org/ktp-call-ui;
-        rev = "3587166d1ace83b115e113853514a7acc04d9d86";
-        sha256 = "0yv386rqy4vkwmd38wvvsrbam59sbv5k2lwimv96kf93xgkp5g0l";
-      };
-
-      buildInputs = [ kdelibs telepathy_qt common_internals qt_gstreamer ];
-      buildNativeInputs = [ gettext pkgconfig ];
-    };
-  };
-  common_internals = pkgs.common_internals;
-  pkgs = unstable // stable;
 in
-pkgs // {
+ktp // {
   inherit version;
   recurseForDerivations = true;
-  full = stdenv.lib.attrValues stable;
+  full = stdenv.lib.attrValues ktp;
 }

pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch

@@ -1,24 +0,0 @@
-commit bf59d0488708eb57ca91a9b6d0ce8951b99ba778
-Author: Rohan Garg <rohangarg@kubuntu.org>
-Date:   Wed Feb 8 01:19:42 2012 +0530
-
-    Do not use CMake 2.8 just yet
-    
-    CMake 2.8 has some scope issues which cause the pofile target to
-    interfere while building translations in the tarball releases.
-    Not requiring CMake 2.8 fixes the build issue.
-    
-    BUG: 292593
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e2c1de..80add26 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,5 @@
- project(ktp-presence-applet)
- 
--cmake_minimum_required(VERSION 2.8)
--
- set(CMAKE_MODULE_PATH
-     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-     ${CMAKE_MODULE_PATH}

pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh

@@ -1,38 +1,38 @@
 #!/bin/sh
 
 usage() {
-	echo "$0 version|directory"
+  echo "$0 version|directory"
 }
 
 download() {
-	URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src
+  URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src
-	destdir=$2
+  destdir=$2
-	if test -n "$KDE_FULL_SESSION"; then
+  if test -n "$KDE_FULL_SESSION"; then
-		kioclient copy $URL $destdir
+    kioclient copy $URL $destdir
-	else
+  else
-		mkdir $destdir
+    mkdir $destdir
-		lftp -c "open $URL; lcd $destdir; mget -c *"
+    lftp -c "open $URL; lcd $destdir; mget -c *"
-	fi
+  fi
 }
 
 if [[ -d $1 ]]; then
-	directory=$1
+  directory=$1
-	version=$(ls $directory/* | head -n1 |
+  version=$(ls $directory/* | head -n1 |
-		sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,")
+    sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,")
-	echo "Version $version"
+  echo "Version $version"
 else
-	version=$1
+  version=$1
-	directory=src-$version
+  directory=src-$version
-	download $version $directory
+  download $version $directory
 fi
 
-packages=$(ls $directory/* | sed -e "s,$directory/ktp-\\(.*\\)-$version.*,\\1,")
+packages=$(ls $directory/* | sed -e "s,$directory/\\(.*\\)-$version.*,\\1,")
 echo $packages
 exec >$version.nix
 echo "["
-for pkg in $packages; do
+for name in $packages; do
-	hash=$(nix-hash --flat --type sha256 --base32 $directory/ktp-$pkg-$version.*)
+  hash=$(nix-hash --flat --type sha256 --base32 $directory/$name-$version.*)
-	echo "{name=\"ktp-${pkg}\";key=\"${pkg//-/_}\";sha256=\"${hash}\";}"
+  key=${name#ktp-}
+  echo "{name=\"${name}\";key=\"${key//-/_}\";sha256=\"${hash}\";}"
 done
-echo "]"
+echo "]"
-

pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
-  name = "${project}-0.2.12";
+  name = "${project}-0.4.0";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
-    sha256 = "1681m1j6vqzy089fnbfpz9i8jsg64fq6x6kf25b9p2090dnqrkj3";
+    sha256 = "1rb58ipz56c9bac8b31md5gk1fw7jim8x9dx3cm5gmxg2q3apd86";
   };
 
   buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ];

pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.11.0";
+  name = "${pname}-5.12.0";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "19fz1lrsvrm0p58wkxhjn7xyickz8bgzks4mkhlvgp692ypvvppm";
+    sha256 = "0xsycjk2l19h026adqms8ik7c2xj9j9rba76znfh46ryaijyn2k6";
   };
 
   buildInputs = [ telepathy_glib ];

pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib
+{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
 , python, sofia_sip }:
 
 stdenv.mkDerivation rec {
   pname = "telepathy-rakia";
-  name = "${pname}-0.7.3";
+  name = "${pname}-0.7.4";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
-    sha256 = "1jnxlx135c660vb1n2vpg6ci2ps0rbrp3244jgchik3g6q5vwbb4";
+    sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
   };
 
-  buildNativeInputs = [pkgconfig libxslt python];
+  buildNativeInputs = [pkgconfigUpstream libxslt python];
   buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
 
   meta = {

pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix

@@ -1,19 +1,19 @@
 { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
-, libuuid, gnutls, sqlite, pkgconfig }:
+, libuuid, gnutls, sqlite, pkgconfigUpstream }:
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
-  name = "${pname}-0.7.2";
+  name = "${pname}-0.8.0";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "0vahmqi78pbmsn472kijl3d4rshz07pmihxk5xkp99hvbqd4mb1f";
+    sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m";
   };
 
   buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
     sqlite ];
 
-  buildNativeInputs = [ libxslt pkgconfig ];
+  buildNativeInputs = [ libxslt pkgconfigUpstream ];
 
   configureFlags = "--disable-avahi-tests";
 

pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, tkabber}:
+
+stdenv.mkDerivation rec {
+  name = "tkabber-plugins-${version}";
+  version = "0.11.1";
+
+  src = fetchurl {
+    url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.gz";
+    sha256 = "0jxriqvsckbih5a4lpisxy6wjw022wsz5j5n171gz0q3xw19dbgz";
+  };
+
+  configurePhase = ''
+    mkdir -p $out/bin
+    sed -e "s@/usr/local@$out@" -i Makefile
+  '';
+
+  buildInputs = [tkabber];
+}

pkgs/applications/networking/instant-messengers/tkabber/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, bwidget, cacert, makeWrapper, x11 }:
+
+stdenv.mkDerivation rec {
+  name = "tkabber-0.11.1";
+
+  src = fetchurl {
+    url = "http://files.jabber.ru/tkabber/tkabber-0.11.1.tar.gz";
+    sha256 = "19xv555cm7a2gczdalf9srxm39hmsh0fbidhwxa74a89nqkbf4lv";
+  };
+
+  defaultTheme = "ocean-deep";
+
+  patchPhase = ''
+    substituteInPlace login.tcl --replace \
+      "custom::defvar loginconf(sslcacertstore) \"\"" \
+      "custom::defvar loginconf(sslcacertstore) \"${cacert}/etc/ca-bundle.crt\""
+
+    sed -i '/^if.*load_default_xrdb/,/^}$/ {
+        s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@
+    }' tkabber.tcl
+  '';
+
+  configurePhase = ''
+    mkdir -p $out/bin
+    sed -e "s@/usr/local@$out@" -i Makefile
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/tcltk\ ${tcllib}/lib/tcllib${tcllib.version}\ ${tcltls}/lib/tls${tcltls.version}"
+  '';
+
+  buildInputs = [tcl tk tcllib tcltls bwidget x11 makeWrapper];
+
+  meta = {
+    homepage = "http://tkabber.jabber.ru/";
+    description = "A GUI client for the XMPP (Jabber) instant messaging protocol";
+  };
+}

pkgs/applications/networking/irc/weechat/default.nix

@@ -1,18 +1,26 @@
-{stdenv, fetchurl, ncurses, openssl, perl, python, aspell}:
+{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
+, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "weechat-0.3.2";
+  version = "0.3.7";
+  name = "weechat-${version}";
 
   src = fetchurl {
-    url = http://weechat.org/files/src/weechat-0.3.2.tar.gz;
+    url = "http://weechat.org/files/src/${name}.tar.gz";
-    sha256 = "0ds548fmiv2fg69amhyg1v1rgyw51rqlp64p3rmsbm1lkcwwmivc";
+    sha256 = "1bphyhx5rnirga5l42z4lijw68qx724gffic1z60jdwfxc5dxknl";
   };
 
-  buildInputs = [ncurses perl python openssl aspell];
+  buildInputs = 
+    [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
+      libgcrypt ruby lua5 tcl guile
+    ];
 
   meta = {
     homepage = http://http://www.weechat.org/;
     description = "A fast, light and extensible chat client";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-     
+

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -1,21 +1,21 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null
-, perl, pcre, gmime, gettext, intltool
+, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify
 }:
 
 assert spellChecking -> gtkspell != null;
 
-let version = "0.135"; in
+let version = "0.138"; in
 
 stdenv.mkDerivation {
   name = "pan-${version}";
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
-    sha1 = "6cd93facf86615761279113badd7462e59399ae4";
+    sha1 = "8ad70d0b2bfb771eb7af1f973af6520f9998591a";
   };
 
-  buildInputs = [ pkgconfig gtk perl gmime gettext intltool ]
+  buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ]
     ++ stdenv.lib.optional spellChecking gtkspell;
 
   enableParallelBuilding = true;

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

@@ -1,22 +1,22 @@
 { stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, gtkClient ? true, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "transmission-2.31";
+  name = "transmission-2.52";
-  
+
   src = fetchurl {
-    url = "http://download.transmissionbt.com/files/${name}.tar.bz2";
+    url = "http://download.transmissionbt.com/files/${name}.tar.xz";
-    sha256 = "0z0npasbrbii5qnjyk31v0kfr04kwm57dmnl2542bpx615q212zk";
+    sha256 = "05sfq5h3731xc9a1k5r1q4gbs9yk0dr229asfxjjgg0lw1xzppdw";
   };
-  
+
   buildInputs = [ pkgconfig openssl curl intltool libevent ] ++
                 stdenv.lib.optional gtkClient gtk;
-  
+
   configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk";
 
   postInstall = ''
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
-  
+
   meta = {
     description = "A fast, easy and free BitTorrent client";
     longDescription = ''

pkgs/applications/office/calligra/default.nix

@@ -4,11 +4,11 @@
 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.3.92";
+  name = "calligra-2.4.2";
 
   src = fetchurl {
-    url = "mirror://kde/unstable/${name}/${name}.tar.bz2";
+    url = "mirror://kde/stable/${name}/${name}.tar.bz2";
-    sha256 = "1ad7vzdhfkv48xhs9p84mwpq8zsdiajz3qjng3h2rswd88sgrblg";
+    sha256 = "14wi8mr87aas12f75qi6p8x0pij365sbz4c737qhh4302fh8fsqg";
   };
 
   buildNativeInputs = [ cmake perl pkgconfig ];

pkgs/applications/office/gnumeric/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl
+, bzip2, glib, goffice, gtk3, intltool, libglade, libgsf, libxml2
+, pango, pkgconfig, scrollkeeper, zlib
+}:
+
+stdenv.mkDerivation {
+  name = "gnumeric-1.11.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz;
+    sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72";
+  };
+
+  configureFlags = "--disable-component";
+
+  buildInputs = [
+    bzip2 glib goffice gtk3 intltool libglade libgsf libxml2
+    pango pkgconfig scrollkeeper zlib
+  ];
+
+  meta = {
+    description = "The GNOME Office Spreadsheet";
+    license = "GPLv2+";
+    homepage = http://projects.gnome.org/gnumeric/;
+  };
+}

pkgs/applications/office/hledger-interest/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
-  version = "1.4";
+  version = "1.4.1";
-  sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
+  sha256 = "05mzqmnr9c4zmss0f2aac4qh4s954nbkimv924d31q2lisdddvw8";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal hledgerLib mtl time ];

pkgs/applications/office/kbibtex/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, kdelibs, libxslt, popplerQt4 }:
+
+stdenv.mkDerivation rec {
+  pname = "kbibtex";
+  version = "0.4";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://download.gna.org/${pname}/${version}/${name}.tar.bz2";
+    sha256 = "1hq0az0dp96195z26wjfwj9ynd57pfv13f1xcl5vbsswcjfrczws";
+  };
+
+  patchPhase = ''
+    sed -e '25i#include <QModelIndex>' -i src/gui/preferences/settingsabstractwidget.h
+    '';
+
+  buildInputs = [ kdelibs libxslt popplerQt4 ];
+}

pkgs/applications/office/skrooge/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "skrooge-1.1.1";
+  name = "skrooge-1.3.0";
 
   src = fetchurl {
     url = "http://skrooge.org/files/${name}.tar.bz2";
-    sha256 = "0qkd1hay7lglb0b4iw3arlwgm0yr8x789x7zf815skxvfhdaclv5";
+    sha256 = "1sfzzn9xz01c0095w4scckiiwv2gfbaxx05h7ds5n02a113w53kz";
   };
 
   buildInputs = [ kdelibs grantlee qca2 libofx ];

pkgs/applications/office/zanshin/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kdelibs, kdepimlibs, boost }:
 
 stdenv.mkDerivation rec {
-  name = "zanshin-0.2.2";
+  name = "zanshin-0.2.1";
 
   src = fetchurl {
-    url = "http://files.kde.org/zanshin/zanshin-0.2.0.tar.bz2";
+    url = "http://files.kde.org/zanshin/${name}.tar.bz2";
-    sha256 = "0kskk8rj4bwx5zywxw0h2lgl7byw9dxzdcafb6xp5cvdkjkg9j87";
+    sha256 = "155k72vk7kw0p0x9dhlky6q017kanzcbwvp4dpf1hcbr1dsr55fx";
   };
 
   buildInputs = [ kdelibs kdepimlibs boost ];

pkgs/applications/science/logic/coq/default.nix

@@ -1,10 +1,16 @@
-# TODO:
+# - coqide compilation can be disabled by setting lablgtk to null;
-# - coqide compilation should be optional or (better) separate;
 
-{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
+{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
 
-let
+let 
-  version = "8.3pl3";
+  version = "8.3pl4";
+  buildIde = lablgtk != null;
+  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  idePatch = if buildIde then ''
+    substituteInPlace scripts/coqmktop.ml --replace \
+    "\"-I\"; \"+lablgtk2\"" \
+    "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
+  '' else "";
 in
 
 stdenv.mkDerivation {
@@ -12,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0ivrafwr4p8pklb9wfq3zyai19xdk05xr3q16xqk4q9pfad9w9dg";
+    sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
   };
 
   buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
@@ -21,9 +27,10 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     configureFlagsArray=(
+      -opt
       -camldir ${ocaml}/bin
       -camlp5dir $(ocamlfind query camlp5)
-      -lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -opt -coqide opt
+      ${ideFlags}
     )
   '';
 
@@ -36,17 +43,16 @@ stdenv.mkDerivation {
     RM=$(type -tp rm)
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    substituteInPlace scripts/coqmktop.ml --replace \
+    ${idePatch}
-      "\"-I\"; \"+lablgtk2\"" \
-      "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
   '';
 
   # This post install step is needed to build ssrcoqide from the ssreflect package
   # It could be made optional, but I see little harm in including it in the default
   # distribution -- roconnor
-  postInstall = ''
+  # This will likely no longer be necessary for coq >= 8.4. -- roconnor
+  postInstall = if buildIde then ''
    cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
-  '';
+  '' else "";
 
   meta = {
     description = "Coq proof assistant";
@@ -58,5 +64,6 @@ stdenv.mkDerivation {
     '';
     homepage = "http://coq.inria.fr";
     license = "LGPL";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
 }

pkgs/applications/science/logic/hol_light/default.nix

@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20120427";
+  name = "hol_light-20120529";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "134";
+    rev = "141";
-    sha256 = "91e7575eeac37a1fbd127eabe99f736b9e1a19fb7b1a0fa27cf31b66edad4b17";
+    sha256 = "a11d7e5db7c6035a2debcf9e73f43c6322389aeac5bc4d123ebf58918052a57f";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

pkgs/applications/science/logic/ssreflect/default.nix

@@ -2,11 +2,11 @@
 # - coq needs to be invoked with the explicit path to the ssreflect theory
 #   e.g. coqide -R ~/.nix-profile/lib/coq/user-contrib/ ''
 
-{stdenv, fetchurl, ocaml, camlp5, coq}:
+{stdenv, fetchurl, ocaml, camlp5, coq, makeWrapper}:
 
 let
   pname = "ssreflect";
-  version = "1.3pl1";
+  version = "1.3pl4";
   name = "${pname}-${version}";
   webpage = http://www.msr-inria.inria.fr/Projects/math-components;
 in
@@ -16,22 +16,29 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/${name}.tar.gz";
-    sha256 = "0ykrhqb68aanl5d4dmn0vnx8m34gg0jsbdhwx2852rqi7r00b9ri";
+    sha256 = "1ha3iiqq79pgll5ra9z0xdi3d3dr3wb9f5vsm4amy884l5anva02";
   };
 
-  buildInputs = [ ocaml camlp5 coq ];
+  buildInputs = [ ocaml camlp5 coq makeWrapper ];
+
+  patches = [ ./static.patch ];
 
-  # this fails
-  /*
   postBuild = ''
     cd src
     coqmktop -ide -opt ssreflect.cmx -o ../bin/ssrcoqide
+    cd ..
   '';
-  */
 
   installPhase = ''
     COQLIB=$out/lib/coq make -f Makefile.coq install -e
     mkdir -p $out/bin
+    cp bin/* $out/bin
+    for i in $out/bin/*; do
+      wrapProgram "$i" \
+        --add-flags "-R" \
+        --add-flags "$out/lib/coq/user-contrib/Ssreflect" \
+        --add-flags "Ssreflect"
+    done
   '';
 
   meta = {
@@ -43,5 +50,6 @@ stdenv.mkDerivation {
     '';
     homepage = webpage;
     license = "CeCILL B FREE SOFTWARE LICENSE or CeCILL FREE SOFTWARE LICENSE";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
 }

pkgs/applications/science/logic/ssreflect/static.patch

@@ -0,0 +1,33 @@
+--- ssreflect1.3pl4/Make	(revision 3823)
++++ ssreflect1.3pl4/Make	(working copy)
+@@ -1,18 +1,18 @@
+ ## Uncomment for static linking
+ ## <static>
+-#
+-#-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq
+-#-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte
+-#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
+-#SSRCOQ = bin/ssrcoq
+-#
++
++-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq
++-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte
++-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
++SSRCOQ = bin/ssrcoq
++
+ ## </static>
+ 
+ ## Uncomment for dynamic linking
+ ## <dynamic>
+-
+--I src
+-
++#
++#-I src
++#
+ ## </dynamic>
+ 
+ ## What follows should be left untouched by the final user of ssreflect
+Common subdirectories: old/src and new/src
+Common subdirectories: old/test and new/test
+Common subdirectories: old/theories and new/theories

pkgs/applications/science/math/ginac/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cln, pkgconfig, readline }:
+
+stdenv.mkDerivation rec {
+  name = "ginac-1.6.2";
+
+  src = fetchurl {
+    url = "${meta.homepage}/${name}.tar.bz2";
+    sha256 = "1pivcqqaf142l6vrj2azq6dxrcyzhag4za2dwicb4gsb09ax4d0g";
+  };
+
+  propagatedBuildInputs = [ cln ];
+  buildInputs = [ readline ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  configureFlags = "--disable-rpath";
+
+  meta = {
+    description = "GiNaC is Not a CAS";
+    homepage = http://www.ginac.de/;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/applications/version-management/darcs/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "darcs";
-  version = "2.8.0";
+  version = "2.8.1";
-  sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l";
+  sha256 = "1fz9k9zihb0fz0w2y55iqa1fd604nxzz48r62sx3ixxn8qqsvrd1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/applications/version-management/git-and-tools/default.nix

@@ -39,14 +39,14 @@ rec {
   gitFull = appendToName "full" (git.override {
     svnSupport = true;
     guiSupport = true;
-    sendEmailSupport = stdenv.isDarwin == false;
+    sendEmailSupport = !stdenv.isDarwin;
   });
 
   gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
+    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh;
-    inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
+    inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
       HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
-      QuickCheck2 bloomfilter editDistance;
+      QuickCheck bloomfilter editDistance;
   };
 
   qgit = import ./qgit {

pkgs/applications/version-management/git-and-tools/git-annex/default.nix

@@ -1,26 +1,26 @@
 { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
 , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
-, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
+, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
-, IfElse, bloomfilter, editDistance
+, IfElse, bloomfilter, editDistance, openssh
 }:
 
 let
-  version = "3.20120430";
+  version = "3.20120614";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "74540ef25461b91acc2e1733ade169e54492fa96370f6ec22554524078e0c7dd";
+    sha256 = "ecb3b144a75a2eeb27061c46f3300c5117a5df260dddb36349eb8e75b6eebb16";
     name = "git-annex-${version}.tar.gz";
   };
 
   buildInputs = [
     curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
-    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
+    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck
     rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
-    editDistance
+    editDistance openssh
   ];
 
   checkTarget = "test";

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -8,15 +8,19 @@
 }:
 
 let
-  version = "1.7.9.5";
+
+  version = "1.7.11";
+  
   svn = subversionClient.override { perlBindings = true; };
+  
 in
+
 stdenv.mkDerivation {
   name = "git-${version}";
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "0nap6z8kfl61hx0h64ylk0x8786fxk31prdv7zk14ljbihs55p9x";
+    sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3";
   };
 
   patches = [ ./docbook2texi.patch ];
@@ -36,7 +40,7 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      notSupported(){
+      notSupported() {
         echo -e "#\!/bin/sh\necho '`basename $1` not supported, $2'\nexit 1" > "$1"
         chmod +x $1
       }
@@ -68,11 +72,11 @@ stdenv.mkDerivation {
         for i in ${builtins.toString perlLibs} ${svn}; do
           gitperllib=$gitperllib:$i/lib/perl5/site_perl
         done
-        wrapProgram "$out/libexec/git-core/git-svn"     \
+        wrapProgram $out/libexec/git-core/git-svn     \
-                     --set GITPERLLIB "$gitperllib"     \
+                     --set GITPERLLIB "$gitperllib"   \
                      --prefix PATH : "${svn}/bin" ''
        else '' # replace git-svn by notification script
-        notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set"
+        notSupported $out/libexec/git-core/git-svn "reinstall with config git = { svnSupport = true } set"
        '')
 
    + (if sendEmailSupport then
@@ -81,10 +85,10 @@ stdenv.mkDerivation {
         for i in ${builtins.toString smtpPerlLibs}; do
           gitperllib=$gitperllib:$i/lib/perl5/site_perl
         done
-        wrapProgram "$out/libexec/git-core/git-send-email"     \
+        wrapProgram $out/libexec/git-core/git-send-email \
                      --set GITPERLLIB "$gitperllib" ''
        else '' # replace git-send-email by notification script
-        notSupported $out/bin/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
+        notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
        '')
 
    + ''# Install man pages and Info manual

pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchgit, qt4, subversion, apr}:
 
 stdenv.mkDerivation rec {
-  name = "svn2git-kde";
+  name = "svn2git-kde-1.0.5";
 
   src = fetchgit {
     url = http://git.gitorious.org/svn2git/svn2git.git;
-    rev = "197979b6a641b8b5fa4856c700b1235491c73a41";
+    rev = "149d6c6e14a1724c96999328683a9264fc508264";
-    sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613";
+    sha256 = "818673fe751b00a42b6ed3e78a783549fb09b5245a01dee47b3dded667bfc582";
   };
 
   buildPhase = ''

pkgs/applications/version-management/subversion/default.nix

@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.4";
+  version = "1.7.5";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "57a3cd351c1dbedddd020e7a1952df6cd2674527";
+    sha1 = "05c079762690d5ac1ccd2549742e7ef70fa45cf1";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

pkgs/applications/video/kdenlive/default.nix

@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext
+{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon
-, qimageblitz, qjson, shared_mime_info, soprano, pkgconfig }:
+, mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano
+, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "kdenlive-${version}";
-  version = "0.8.2.1";
+  version = "0.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kdenlive/${name}.tar.gz";
+    url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2";
-    sha256 = "a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717";
+    sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1";
   };
 
-  patches = [ ./qtgl-header-change.patch ];
+  buildInputs = 
-
+    [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext
+      qjson shared_mime_info soprano pkgconfig 
-    qimageblitz qjson shared_mime_info soprano pkgconfig ];
+    ];
 
   meta = {
     description = "Free and open source video editor";

pkgs/applications/video/kdenlive/qtgl-header-change.patch

@@ -1,14 +0,0 @@
-Correct for changed Qt opengl includes.
-Reference: http://www.kdenlive.org/mantis/view.php?id=2396
-
-diff -Naur kdenlive-0.8.2.1.orig//src/videoglwidget.cpp kdenlive-0.8.2.1/src/videoglwidget.cpp
---- kdenlive-0.8.2.1.orig//src/videoglwidget.cpp	2012-01-24 00:04:53.588121469 -0430
-+++ kdenlive-0.8.2.1/src/videoglwidget.cpp	2012-01-24 00:05:32.817410938 -0430
-@@ -2,6 +2,7 @@
- #include <QtGui>
- #include <QtOpenGL>
- #include "videoglwidget.h"
-+#include "GL/glu.h"
- 
- #ifndef GL_TEXTURE_RECTANGLE_EXT
- #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV

pkgs/applications/video/mkvtoolnix/default.nix

@@ -11,17 +11,19 @@
 , zlib
 , ruby
 , gettext
+, pkgconfig
+, curl
 }:
 
 stdenv.mkDerivation rec {
-  name = "mkvtoolnix-4.4.0";
+  name = "mkvtoolnix-5.6.0";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
-    sha256 = "0apgmah1d4dh5x1phr4n5vgwmy0w1nym9pydzh4kdgcs167l8n6l";
+    sha256 = "1hzwf4zaamny3qzmd6hyhy4hy9l67s3fjvznbi0avw0ad7g05i89";
   };
 
-  buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext ];
+  buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
 
   configureFlags = "--with-boost-libdir=${boost}/lib";
   buildPhase = ''

pkgs/applications/virtualization/virtualbox/default.nix

@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let version = "4.1.12"; in
+let version = "4.1.16"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "00hx7cl8n4qdmipxxx8a96x8yw6yim9bz3fjbyzcrs8yls0r2jsf";
+    sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n";
   };
 
   buildInputs =

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
-let version = "4.1.12"; in
+let version = "4.1.16"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}";
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "0if2q188zf608p1dkq6pd46dafhslqcxmfpmarypbd68k7fi7kkx";
+    sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit makeWrapper ];

pkgs/applications/window-managers/compton/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, pkgconfig, libXcomposite, libXfixes, libXdamage
+, libXrender, libXext }:
+stdenv.mkDerivation rec {
+  name = "compton-20120507";
+  src = fetchgit {
+    url = git://github.com/chjj/compton.git;
+    rev = "d52f7a06dbc55d92e061f976730952177edac739";
+    sha256 = "0f7600a841c4c77d181b54bc14cf7d90d0bad25aa5edbade320ca8b9946f14eb";
+  };
+  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
+  buildFlagsArray = ["CFLAGS=-O3 -fomit-frame-pointer"];
+  installFlags = "PREFIX=$(out)";
+  meta = {
+    homepage = http://www.x.org/;
+    description = "A fork of XCompMgr, a sample compositing manager for X servers";
+    longDescription = ''
+      A fork of XCompMgr, which is a  sample compositing manager for X servers
+      supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables
+      basic eye-candy effects. This fork adds additional features, such as additional
+      effects, and a fork at a well-defined and proper place.
+    '';
+    license = "bsd";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/window-managers/i3/lock.nix

@@ -2,11 +2,11 @@
   pam, libX11, libev, cairo }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-2.4";
+  name = "i3lock-2.4.1";
 
   src = fetchurl {
     url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
+    sha256 = "4d29e66841138de562e71903d31ecaaefd8ecffe5e68da0d6c8d560ed543047c";
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11

pkgs/applications/window-managers/i3/status.nix

@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
+{ fetchurl, stdenv, confuse, yajl, alsaLib, wirelesstools
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.4";
+  name = "i3status-2.5.1";
 
   src = fetchurl {
     url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
+    sha256 = "7734efdf79a77617023f1e6d80080251eab3a05defb67313283568511d3e58f2";
   };
 
-  buildInputs = [ confuse alsaLib wirelesstools ];
+  buildInputs = [ confuse yajl alsaLib wirelesstools ];
 
   makeFlags = "all";
   installFlags = "PREFIX=\${out}";

pkgs/applications/window-managers/xcompmgr/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage
-, libXrender }:
+, libXrender, libXext }:
 stdenv.mkDerivation rec {
-  name = "xcompmgr-1.1.5";
+  name = "xcompmgr-1.1.6";
   src = fetchurl {
     url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
-    sha256 = "bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571";
+    sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";
   };
-  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender ];
+  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
   meta = {
     homepage = http://www.x.org/;
     description = "A sample compositing manager for X servers";

pkgs/applications/window-managers/xmonad/xmonad-extras.nix

@@ -1,15 +1,16 @@
-{ cabal, hint, HList, libmpd, mtl, network, parsec, random
+{ cabal, hint, libmpd, mtl, network, parsec, random, regexPosix
-, regexPosix, split, X11, xmonad, xmonadContrib
+, split, X11, xmonad, xmonadContrib
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmonad-extras";
-  version = "0.10.1";
+  version = "0.10.1.1";
-  sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27";
+  sha256 = "1pkp9z58w2x8yhxhvm5nifxb1qcajv52ji53n77rjhpysvrgq5m7";
   buildDepends = [
-    hint HList libmpd mtl network parsec random regexPosix split X11
+    hint libmpd mtl network parsec random regexPosix split X11 xmonad
-    xmonad xmonadContrib
+    xmonadContrib
   ];
+  configureFlags = "-f-with_hlist";
   meta = {
     homepage = "http://projects.haskell.org/xmonad-extras";
     description = "Third party extensions for xmonad with wacky dependencies";

pkgs/build-support/fetchgit/nix-prefetch-git

@@ -1,8 +1,8 @@
 #! /bin/sh -e
 
-url=$1
+url=
-rev=$2
+rev=
-expHash=$3
+expHash=
 hashType=$NIX_HASH_ALGO
 deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE
 leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT
@@ -189,21 +189,19 @@ clone(){
 clone_user_rev() {
     local dir="$1"
     local url="$2"
-    local rev="$3"
+    local rev="${3:-HEAD}"
 
     # Perform the checkout.
     case "$rev" in
         HEAD|refs/*)
             clone "$dir" "$url" "" "$rev" 1>&2;;
-        [0-9a-f]*)
+        *)
             if test -z "$(echo $rev | tr -d 0123456789abcdef)"; then
                 clone "$dir" "$url" "$rev" "" 1>&2;
             else
                 echo 1>&2 "Bad commit hash or bad reference.";
                 exit 1;
             fi;;
-        "")
-            clone "$dir" "$url" "" "HEAD" 1>&2;;
     esac
 
     # Allow doing additional processing before .git removal

pkgs/build-support/kernel/make-initrd.sh

@@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*)
 
 # Put the closure in a gzipped cpio archive.
 mkdir -p $out
-(cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd)
+(cd root && find * -print0 | cpio -o -H newc --null | gzip -9 > $out/initrd)
 
 if [ -n "$makeUInitrd" ]; then
     mv $out/initrd $out/initrd.gz

pkgs/build-support/release/debian-build.nix

@@ -65,6 +65,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         --fstrans=${if fsTranslation then "yes" else "no"} \
         --requires="${concatStringsSep "," debRequires}" \
         --provides="${concatStringsSep "," debProvides}" \
+        ${optionalString (src ? version) "--pkgversion=$(echo ${src.version} | tr _ -)"} \
         make install
 
       mkdir -p $out/debs

pkgs/build-support/release/rpm-build.nix

@@ -26,24 +26,22 @@ vmTools.buildRPM (
     ''; # */
 
     postInstall = ''
+      declare -a rpms rpmNames
       for i in $out/rpms/*/*.rpm; do
         if echo $i | grep -vq "\.src\.rpm$"; then
           echo "file rpm $i" >> $out/nix-support/hydra-build-products
-          
+          rpms+=($i)
-          echo "installing $i..."
+          rpmNames+=("$(rpm -qp "$i")")
-          rpm -ip "$i" --excludepath /nix/store
         fi
       done
 
+      echo "installing ''${rpms[*]}..."
+      rpm -ip ''${rpms[*]} --excludepath /nix/store
+
       eval "$postRPMInstall"
       
-      for i in $out/rpms/*/*.rpm; do
+      echo "uninstalling ''${rpmNames[*]}..."
-        if echo $i | grep -vq "\.src\.rpm$"; then
+      rpm -e ''${rpmNames[*]}
-          rpmName="$(rpm -qp "$i")"
-          echo "uninstalling $rpmName..."
-          rpm -e "$rpmName"
-        fi
-      done
 
       for i in $out/rpms/*/*.src.rpm; do
         echo "file srpm $i" >> $out/nix-support/hydra-build-products

pkgs/build-support/upstream-updater/urls-from-page.sh

@@ -4,9 +4,11 @@ url="$1"
 protocol="${url%%:*}"
 path="${url#$protocol://}"
 server="${path%%/*}"
+basepath="${path%/*}"
 relpath="${path#$server}"
  
 echo "URL: $url" >&2
 
 curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]="([^"]*)"/\n+\1\n-/g' | \
-  sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g"
+  sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \
+  sed -re 's~^[^:]*$~'"$protocol://$basepath/&~"

pkgs/build-support/vm/default.nix

@@ -1300,7 +1300,7 @@ rec {
       fullName = "Debian 6.0.4 Squeeze (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
-        sha256 = "5686732aa690d80ba4c390af3f7b9ba3c3c8c17861c89bca3a3694c403d7b7e6";
+        sha256 = "1aih4n1iz4gzzm5cy1j14mpx8i25jj1237994j33k7dm0gnqgr2w";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
@@ -1311,7 +1311,7 @@ rec {
       fullName = "Debian 6.0.4 Squeeze (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
-        sha256 = "525f919bb48a4d2d0cb3a4fb5b0d4338e7936f68753ca945358ea1c3792ea7b7";
+        sha256 = "1gb3im7kl8dwd7z82xj4wb5g58r86fjj8cirvq0ssrvcm9bqaiz7";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

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

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.38";
+  name = "man-pages-3.41";
   
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
-    sha256 = "10ha41yj5v3rjy73x8kpn65srbcy0iz399vv149bh12lvyv67kvy";
+    sha256 = "1fldlsw51al9cvmz8dixrfv2j80bamjd5bzxsa66cvhc48n8p2nf";
   };
 
   preBuild =

pkgs/data/fonts/dosemu-fonts/default.nix

@@ -0,0 +1,34 @@
+{stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}:
+
+stdenv.mkDerivation {
+  name = "dosemu-fonts";
+
+  src = fetchurl {
+    url = mirror://sourceforge/dosemu/dosemu-1.4.0.tgz;
+    sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
+  };
+
+  configurePhase = "true";
+  buildPhase = "true";
+
+  buildInputs = [bdftopcf mkfontdir mkfontscale];
+
+  installPhase = ''
+    fontPath="$out/share/fonts/X11/misc/dosemu"
+    mkdir -p "$fontPath"
+    for i in etc/*.bdf; do
+      fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz"
+      echo -n "Installing font $fontOut..." >&2
+      bdftopcf $i | gzip -c -9 > "$fontOut"
+      echo " done." >&2
+    done
+    cp etc/dosemu.alias "$fontPath/fonts.alias"
+    cd "$fontPath"
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = {
+    description = "Various fonts from the DOSEmu project";
+  };
+}

pkgs/data/fonts/ubuntu-font-family/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ubuntu-font-family-0.80";
+  buildInputs = [unzip];
+
+  src = fetchurl {
+    url = "http://font.ubuntu.com/download/${name}.zip";
+    sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out/share/fonts/ubuntu
+      cp *.ttf $out/share/fonts/ubuntu
+    '';
+
+  meta = {
+    description = "Ubuntu Font Family";
+    longDescription = "The Ubuntu typeface has been specially
+    created to complement the Ubuntu tone of voice. It has a
+    contemporary style and contains characteristics unique to
+    the Ubuntu brand that convey a precise, reliable and free attitude.";
+    homepage = http://font.ubuntu.com/;
+    license = "free";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.antono ];
+  };
+}

pkgs/desktops/gnome-2/bindings/gnome-python/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "2.28";
+  name = "gnome-python-${version}.1";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2";
+    sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
+  };
+
+  phases = "unpackPhase configurePhase buildPhase installPhase";
+
+  # You should be using WAF instead; see the file INSTALL.WAF
+  configurePhase = ''
+    python waf configure --prefix=$out
+  '';
+
+  buildPhase = ''
+    python waf build
+  '';
+
+  installPhase = ''
+    python waf install
+  '';
+
+  buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus ];
+
+  doCheck = false;
+
+  meta = {
+    homepage = "http://projects.gnome.org/gconf/";
+    description = "Python wrapper for gconf";
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}

pkgs/desktops/gnome-2/default.nix

@@ -111,4 +111,6 @@
 
   libglademm = callPackage ./bindings/libglademm { };
 
+  gnome_python = callPackage ./bindings/gnome-python { };
+
 }