Merge branch 'master' into x-updates

Conflicts: pkgs/development/compilers/vala/default.nix (it's different version) pkgs/development/libraries/cairo/default.nix (trivial)
2024-11-24 16:03:23 +00:00 · 2013-04-17 18:26:28 +02:00 · 2013-04-17 18:26:28 +02:00 · ec736312d4
commit ec736312d4
parent 6bd036d5f9 3f0ee819e2
58 changed files with 13065 additions and 2819 deletions
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:

 stdenv.mkDerivation rec {
-  name = "bitlbee-3.0.3";
+  name = "bitlbee-3.2";

  src = fetchurl {
    url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "09dgwfqznd2cnqraksivmh132nnl99gwgplynjmfsyyf6y4pbjl2";
+    sha256 = "1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030";
  };

  buildInputs = [ gnutls glib pkgconfig libotr ]
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@ -1,18 +1,19 @@
-{ stdenv, fetchurl, libotr, pidgin} :
+{ stdenv, fetchurl, libotr, pidgin, intltool } :

-stdenv.mkDerivation {
-  name = "pidgin-otr-3.2.0";
+stdenv.mkDerivation rec {
+  name = "pidgin-otr-4.0.0";
  src = fetchurl {
-    url = http://www.cypherpunks.ca/otr/pidgin-otr-3.2.0.tar.gz;
-    sha256 = "1cp6s565sid657lvmm7jrwl9wnk4ywsl8d9sp4iba36r0s5qaw08";
-  };
-
-  meta = {
-    description = "OTR plugin for Pidgin IM.";
-    homepage = http://www.cypherpunks.ca/otr;
+    url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
+    sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym";
  };

  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";

-  buildInputs = [libotr pidgin];
+  buildInputs = [ libotr pidgin intltool ];
+
+  meta = {
+    homepage = http://www.cypherpunks.ca/otr;
+    description = "Plugin for Pidgin 2.x which implements OTR Messaging";
+    license = "GPLv2";
+  };
 }
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus
+, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f";
+  src = fetchurl {
+    url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f";
+    name = "${name}.tar.gz";
+    sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify";
+
+  patchPhase = ''
+    sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \
+        -e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile
+    pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify
+  '';
+
+  buildPhase  = "make libskype.so libskype_dbus.so";
+
+  installPhase = ''
+    ensureDir $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
+    cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16
+    cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22
+    cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48
+    cp libskype.so libskype_dbus.so $out/lib/pidgin
+  '';
+
+  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
+
+  buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ];
+
+  meta = {
+    homepage = https://github.com/novas0x2a/skype4pidgin;
+    license = "GPLv3+";
+    description = "Plugin to use a running skype account through pidgin";
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@ -21,10 +21,10 @@
 } :

 stdenv.mkDerivation rec {
-  name = "pidgin-2.10.6";
+  name = "pidgin-2.10.7";
  src = fetchurl {
    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96";
+    sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb";
  };

  inherit nss ncurses;
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@ -0,0 +1,30 @@
+{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
+
+let
+  rev = "59ddcbe66a";
+in
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "irssi-otr-20130315-${rev}";
+  
+  src = fetchurl {
+    url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
+    name = "${name}.tar.gz";
+    sha256 = "095dak0d10j6cpkwlqmk967p1wypwzvqr4wdqvb30w14dbn8dy0d";
+  };
+
+  patchPhase = ''
+    sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am
+    sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac
+    sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am
+  '';
+
+  preConfigure = "sh ./bootstrap";
+
+  buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
+  
+  meta = {
+    homepage = https://github.com/cryptodotis/irssi-otr;
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@ -0,0 +1,55 @@
+{ stdenv, fetchurl, apacheAntOpenJDK, jre }:
+
+let
+  # The .gitmodules in freenet-official-20130413-eccc9b3198
+  # points to freenet-contrib-staging-ce3b7d5
+  freenet_ext = fetchurl {
+    url = https://downloads.freenetproject.org/latest/freenet-ext.jar;
+    sha1 = "507ab3f6ee91f47c187149136fb6d6e98f9a8c7f";
+  };
+
+  bcprov = fetchurl {
+    url = http://www.bouncycastle.org/download/bcprov-jdk15on-148.jar;
+    sha256 = "12129q8rmqwlvj6z4j0gc3w0hq5ccrkf2gdlsggp3iws7cp7wjw0";
+  };
+in
+stdenv.mkDerivation {
+  name = "freenet-official-20130413-eccc9b3198";
+
+  src = fetchurl {
+    url = https://github.com/freenet/fred-official/tarball/eccc9b3198;
+    name = "freenet-official-eccc9b3198.tar.gz";
+    sha256 = "0x0s8gmb95770l7968r99sq0588vf0n1687ivc2hixar19cw620y";
+  };
+
+  patchPhase = ''
+    cp ${freenet_ext} lib/freenet/freenet-ext.jar
+    cp ${bcprov} lib/bcprov.jar
+
+    sed '/antcall.*-ext/d' -i build.xml
+  '';
+
+  buildInputs = [ apacheAntOpenJDK jre ];
+
+  buildPhase = "ant package-only";
+
+  installPhase = ''
+    ensureDir $out/share/freenet $out/bin
+    cp lib/bcprov.jar $out/share/freenet
+    cp lib/freenet/freenet-ext.jar $out/share/freenet
+    cp dist/freenet.jar $out/share/freenet
+
+    cat <<EOF > $out/bin/freenet
+    ${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
+      -Xmx1024M freenet.node.NodeStarter
+    EOF
+    chmod +x $out/bin/freenet
+  '';
+
+  meta = { 
+    description = "Decentralised and censorship-resistant network";
+    homepage = https://freenetproject.org/;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@ -4,11 +4,11 @@
 , makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "gnunet-0.9.5";
+  name = "gnunet-0.9.5a";

  src = fetchurl {
    url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa";
+    sha256 = "1mxy1ikv44fia3cybpmiw298x5371a2qh8hr7pi55yg1xqbhfq0x";
  };

  buildInputs = [
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -51,7 +51,7 @@ rec {
      monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
      QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
      transformers transformersBase utf8String uuid wai waiLogger warp
-      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
+      xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic;
  };

  qgit = import ./qgit {
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -6,7 +6,7 @@
 , networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
 , random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
 , transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
-, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
+, yesod, yesodDefault, yesodForm, yesodStatic, regexTdfa
 }:

 let
@ -29,7 +29,7 @@ stdenv.mkDerivation {
    networkProtocolXmpp openssh QuickCheck random regexCompat rsync
    SafeSemaphore SHA stm text time transformers transformersBase utf8String
    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
-    yesodStatic which perl testpack regexTdfa ];
+    yesodStatic which perl regexTdfa ];

  configurePhase = ''
    makeFlagsArray=( PREFIX=$out CABAL=./Setup )
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@ -1,20 +1,16 @@
-{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse
-, MissingH, mtl, network, prettyShow
+{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse
+, MissingH, mtl, network, prettyShow, text
 }:

 cabal.mkDerivation (self: {
  pname = "github-backup";
-  version = "1.20120314";
-  src = fetchurl {
-    url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz";
-    sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy";
-    name = "github-backup-${self.pname}.tar.gz";
-  };
+  version = "1.20130414";
+  sha256 = "1s8s1kv4kj086kzq8iq28zyrlg65hrzg3563fw3dazfik73cmlcp";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
    extensibleExceptions filepath github hslogger IfElse MissingH mtl
-    network prettyShow
+    network prettyShow text
  ];
  meta = {
    homepage = "https://github.com/joeyh/github-backup";
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@ -43,7 +43,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
      libxml2 = {
        configureFlags = [
          "--with-libxml-dir=${libxml2}"
-          "--with-iconv-dir=${libiconv}"
+          #"--with-iconv-dir=${libiconv}"
          ];
        buildInputs = [ libxml2 ];
      };
--- a/pkgs/development/libraries/aacskeys/default.nix
+++ b/pkgs/development/libraries/aacskeys/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, jdk, premake}:
+{stdenv, fetchurl, openssl, jdk, premake3}:

 # Info on how to use / obtain aacs keys:
 # http://vlc-bluray.whoknowsmy.name/
@ -22,7 +22,7 @@ stdenv.mkDerivation {
    sha256 = "0d3zvwixpkixfkkc16wj37h2xbcq5hsqqhqngzqr6pslmqr67vnr";
  };

-  buildInputs = [openssl jdk premake];
+  buildInputs = [openssl jdk premake3];

  installPhase = ''
    ensureDir $out/{bin,lib,share/${baseName}}
--- a/pkgs/development/libraries/cairo/1.12.2.nix
+++ b/pkgs/development/libraries/cairo/1.12.2.nix
@ -5,7 +5,7 @@
 , gobjectSupport ? true, glib
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
-, gettext, libiconvOrEmpty
+, libiconvOrEmpty, libintlOrEmpty
 }:

 assert postscriptSupport -> zlib != null;
@ -23,10 +23,7 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ pkgconfig x11 fontconfig xlibs.libXrender ]
    ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
-
-    # On non-GNU systems we need GNU Gettext for libintl.
-    ++ stdenv.lib.optional (!stdenv.isLinux) gettext
-
+    ++ libintlOrEmpty
    ++ libiconvOrEmpty;

  propagatedBuildInputs =
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@ -7,7 +7,7 @@
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
 , expat
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null, mesa ? null
-, gettext, libiconvOrEmpty
+, libiconvOrEmpty, libintlOrEmpty
 }:

 assert postscriptSupport -> zlib != null;
@ -28,10 +28,7 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional (!stdenv.isDarwin) libXrender
    ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
    ++ stdenv.lib.optionals glSupport [ mesa ]
-
-    # On non-GNU systems we need GNU Gettext for libintl.
-    ++ stdenv.lib.optional (!stdenv.isLinux) gettext
-
+    ++ libintlOrEmpty
    ++ libiconvOrEmpty;

  propagatedBuildInputs =
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
  CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";

  # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-  buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake;
+  buildInputs = stdenv.lib.optional (!stdenv.isLinux) gnumake;

  enableParallelBuilding = true;
  doCheck = true;
--- a/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix
+++ b/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "cuda";
-  version = "0.5.0.1";
-  sha256 = "0gxkf97c4cm9d7kk0izgz3m44ycys1lcl4bq828c6l1wim1xz28b";
+  version = "0.5.0.2";
+  sha256 = "1if730wcww5qx5qki1ir0d576wwpwrh00krp1svgdlx2j50rmgq5";
  buildTools = [ c2hs ];
  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
  doCheck = false;
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "happstack-server";
-  version = "7.1.7";
-  sha256 = "1gd7qa224z04aya44fdrbhpiy5iw88wjcvqihz6l95ks9ilbzmg7";
+  version = "7.1.7.1";
+  sha256 = "1q897av0ynfh6jn4jhmmamkwda7zg36p4ncn9yic69calzvjpz72";
  buildDepends = [
    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
    html monadControl mtl network parsec sendfile syb systemFilepath
--- a/pkgs/development/libraries/haskell/split/0.2.1.3.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.3.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "split";
-  version = "0.2.1.3";
-  sha256 = "1s3aga7asxz495bx7i72a6fkdlz1zv20rrrqg1avj7b1sjn3gy9w";
+  version = "0.2.2";
+  sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
  testDepends = [ QuickCheck ];
  meta = {
    description = "Combinator library for splitting lists";
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@ -1,22 +1,27 @@
 { cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar
 , mwcRandom, primitive, QuickCheck, testFramework
 , testFrameworkHunit, testFrameworkQuickcheck2, vector
-, vectorAlgorithms
+, vectorAlgorithms, fetchurl
 }:

 cabal.mkDerivation (self: {
  pname = "statistics";
-  version = "0.10.2.0";
-  sha256 = "1sv0fhbi52maq9c4ni109m0051a1nndi3ncz9v29mkxqzyckrp9x";
+  version = "0.10.3.0";
+  sha256 = "1ay03y9z84mc4ai6i4g81v129rhg4146kad4ggb2gimbj6851fw1";
  buildDepends = [
    deepseq erf mathFunctions monadPar mwcRandom primitive vector
    vectorAlgorithms
  ];
  testDepends = [
-    erf HUnit ieee754 mathFunctions primitive QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms
+    erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck
+    testFramework testFrameworkHunit testFrameworkQuickcheck2 vector
+    vectorAlgorithms
  ];
  doCheck = false;
+  patches = [
+    (fetchurl { url = "https://github.com/bos/statistics/commit/6b88143c9f931dd4fa95c1f083999ae12dd01b55.patch";
+                sha256 = "0bl10qhp73cijxlpkjfmnkbl49jlj85xxvyhlca6jw7awcka6d2l"; })
+  ];
  meta = {
    homepage = "https://github.com/bos/statistics";
    description = "A library of statistical types, data, and functions";
--- a/pkgs/development/libraries/haskell/testpack/default.nix
+++ b/pkgs/development/libraries/haskell/testpack/default.nix
@ -1,17 +0,0 @@
-{ cabal, HUnit, mtl, QuickCheck, random }:
-
-cabal.mkDerivation (self: {
-  pname = "testpack";
-  version = "2.1.2.1";
-  sha256 = "1fm4dy9vs2whc48cr00ncqqzz6r5yp7bvgil86idbbgi8igld5j0";
-  buildDepends = [ HUnit mtl QuickCheck random ];
-  patches = [ ./support-recent-quickcheck.patch ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
-    description = "Test Utililty Pack for HUnit and QuickCheck";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
--- a/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch
+++ b/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch
@ -1,22 +0,0 @@
-diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
-index 01fac30..0de5526 100644
--- a/src/Test/HUnit/Tools.hs
-+++ b/src/Test/HUnit/Tools.hs
-@@ -128,7 +128,7 @@ Often used like this:
- >        q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
- -}
- qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
-+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest})
- 
- {- | Run verbose tests.  Example:
- 
-@@ -174,7 +174,7 @@ localquickCheckWithResult args p =
-               Just (rnd,_) -> return rnd
-      test MkState{ terminal          = tm
-                  , maxSuccessTests   = maxSuccess args
-                 , maxDiscardedTests = maxDiscard args
-+                 , maxDiscardedTests = 20000
-                  , computeSize       = case replay args of
-                                          Nothing    -> \n d -> (n * maxSize args)
-                                                          `div` maxSuccess args
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;

 stdenv.mkDerivation rec {
-  name = "libextractor-0.6.2";
+  name = "libextractor-1.0.1";

  src = fetchurl {
    url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "1pyh599717vjblyjch95r76afdxfhrzqr7nx1pz1davy5fpsw5aw";
+    sha256 = "1khy9s86vq6667h02zp2fvb16sqm27xlmr0xchgfxvsd6ascnl9j";
  };

  preConfigure =
--- a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
+++ b/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
@ -0,0 +1,29 @@
+From dc5f05eb934ebd285e01febb9a4018512db702b1 Mon Sep 17 00:00:00 2001
+From: David Goulet <dgoulet@ev0ke.net>
+Date: Sat, 19 Jan 2013 15:53:23 -0500
+Subject: [PATCH] Fix: pass opdata when sending message fragment
+
+The inject_message callback was missing the opdata when sending message
+fragments.
+
+Signed-off-by: David Goulet <dgoulet@ev0ke.net>
+---
+ src/message.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/message.c b/src/message.c
+index 7c39529..aa71df2 100644
+--- a/src/message.c
+++ b/src/message.c
+@@ -441,7 +441,7 @@ fragment:
+ 	/* Fragment and send according to policy */
+ 	if (!err && messagep && *messagep) {
+ 	    if (context) {
+-		err = fragment_and_send(ops, NULL, context, *messagep,
+		err = fragment_and_send(ops, opdata, context, *messagep,
+ 			fragPolicy, messagep);
+ 	    }
+ 	}
+-- 
+1.7.10.4
+
--- a/pkgs/development/libraries/libotr/3.2.nix
+++ b/pkgs/development/libraries/libotr/3.2.nix
@ -0,0 +1,11 @@
+{stdenv, fetchurl, libgcrypt}:
+
+stdenv.mkDerivation {
+  name = "libotr-3.2.0";
+  src = fetchurl {
+    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
+    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
+  };
+
+  propagatedBuildInputs = [libgcrypt];
+}
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@ -1,11 +1,27 @@
 {stdenv, fetchurl, libgcrypt}:

-stdenv.mkDerivation {
-  name = "libotr-3.2.0";
+stdenv.mkDerivation rec {
+  name = "libotr-4.0.0";
  src = fetchurl {
-    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
-    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
+    urls = [
+      "http://www.cypherpunks.ca/otr/${name}.tar.gz"
+      # The site is down at the time of updating to 4.0.0, so I add this url
+      http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz
+    ];
+    sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4";
  };

-  propagatedBuildInputs = [libgcrypt];
+  # Crashes without it, still not accepted upstream.
+  # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21
+  patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ];
+
+  NIX_LDFLAGS = "-lssp";
+
+  propagatedBuildInputs = [ libgcrypt ];
+
+  meta = {
+    homepage = "http://www.cypherpunks.ca/otr/";
+    license = "LGPLv2.1";
+    description = "Library for Off-The-Record Messaging";
+  };
 }
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@ -1,11 +1,19 @@
-{pkgs, pkgs_i686}:
+{pkgs, pkgs_i686, version ? "3.1"}:

+let
+  titaniumexpr = if version == "2.1" then
+    ./titaniumsdk-2.1.nix
+  else if version == "3.1" then
+    ./titaniumsdk.nix
+  else
+    throw "Unknown Titanium SDK version: ${version}";
+in
 rec {
  androidenv = pkgs.androidenv;

  xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv else null;
-
-  titaniumsdk = import ./titaniumsdk.nix {
+  
+  titaniumsdk = import titaniumexpr {
    inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
  };
  
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@ -1,19 +1,23 @@
 { nixpkgs ? <nixpkgs>
 , system ? builtins.currentSystem
+, version ? "3.1"
 }:

 let
  pkgs = import nixpkgs { inherit system; };
  pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
+  versionString = pkgs.stdenv.lib.replaceChars [ "." ] [ "_" ] version;
 in
 rec {
  kitchensink_android = import ./kitchensink {
-    inherit (pkgs) fetchgit titaniumenv;
+    inherit (pkgs) fetchgit;
+    titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs;
    target = "android";
  };
  
  kitchensink_iphone = import ./kitchensink {
-    inherit (pkgs_darwin_x86_64) fetchgit titaniumenv;
+    inherit (pkgs_darwin_x86_64) fetchgit;
+    titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs_darwin_x86_64;
    target = "iphone";
  };
  
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@ -3,7 +3,7 @@
 androidenv.emulateApp {
  name = "kitchensink";
  app = kitchensink;
-  platformVersion = "8";
+  platformVersion = "16";
  useGoogleAPIs = true;
  package = "com.appcelerator.kitchensink";
  activity = "KitchensinkActivity";
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@ -1,12 +1,12 @@
-{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "8" ]}:
+{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ]}:

 titaniumenv.buildApp {
  name = "KitchenSink";
  appId = "com.appcelerator.kitchensink";
  src = fetchgit {
    url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "0f2c0b818034cc4e6867f0aa2afc98bf77dbff02";
-    sha256 = "de31496cfb5625d7a193bbbc32a8021e4094ffab20ae13ef2e1583b0394d7c60";
+    rev = "b68757ef6639e3da564e21038dc9c1aee1f80907";
+    sha256 = "17yabdkl0p6pf2a2lcgw1kid2smwc8rnpx0i9fa4avj6930cbh5i";
  };
  
  inherit target androidPlatformVersions;
--- a/pkgs/development/mobile/titaniumenv/fixso.sed
+++ b/pkgs/development/mobile/titaniumenv/fixso.sed
@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()|
--- a/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
+++ b/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, 'libtiprofiler.so'), lib_dest_dir + 'libtiprofiler.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiprofiler.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiprofiler.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()\n|
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-2.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-2.1.nix
@ -0,0 +1,60 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "titanium-mobilesdk-2.1.4.v20121109124659";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.4.v20121109124659-linux.zip;
+    sha1 = "381eb4b06b5a261ddf336c52d4714e5626142697";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.4.v20121109124659-osx.zip;
+    sha1 = "1cef5803f0c7b7bb35feb88d3f91bbb191e3953e";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    yes y | unzip $src
+    
+    # Fix shebang header for python scripts
+    
+    find . -name \*.py | while read i
+    do
+        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+    done
+   
+    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+    # Yes, I know it's nasty :-)
+    
+    cd mobilesdk/*/*/android
+    
+    sed -i -f ${./fixtiverify.sed} builder.py
+    sed -i -f ${./fixselfruntimev8.sed} builder.py
+    sed -i -f ${./fixnativelibs.sed} builder.py
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+      ''
+      else ""}
+    
+    # Wrap builder script
+    
+    wrapProgram `pwd`/builder.py \
+      --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \
+      --prefix PATH : ${jdk}/bin \
+      --prefix JAVA_HOME : ${jdk}
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+  '';
+}
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@ -1,18 +1,16 @@
-{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:

 stdenv.mkDerivation {
-  name = "titanium-mobilesdk-2.1.5.v20121112144658";
-  src = if src == null then
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-      url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip;
-      sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd";
-    }
-    else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip;
-      sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c";
-    }
-    else throw "Platform: ${stdenv.system} not supported!"
-  else src;
+  name = "titanium-mobilesdk-3.1.0.v20130415184552";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-linux.zip;
+    sha1 = "7a8b34b92f6c3eff33eefb9a1b6b0d2e3670001d";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-osx.zip;
+    sha1 = "e0ed7e399a104e0838e245550197bf787a66bf98";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
  
  buildInputs = [ unzip makeWrapper ];
  
@ -34,7 +32,8 @@ stdenv.mkDerivation {
    cd mobilesdk/*/*/android
    
    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixselfruntimev8.sed} builder.py
+    sed -i -f ${./fixtiprofiler.sed} builder.py
+    sed -i -f ${./fixso.sed} builder.py
    sed -i -f ${./fixnativelibs.sed} builder.py
    
    # Patch some executables
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, which }:
+{ fetchurl, stdenv, guile, which, libffi }:

 let version = "5.17"; in

@ -10,7 +10,7 @@ let version = "5.17"; in
      sha256 = "065mg9gfb605wxbsk3inf93528ygcjgg6j8ml51691f6ghj363ff";
    };

-    buildInputs = [ guile which ];
+    buildInputs = [ guile which libffi ];

    patchPhase =
      '' for i in $(find -name \*.in)
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+let baseName = "premake";
+  version  = "3.7";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
+    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+  };
+
+  buildInputs = [unzip];
+
+  installPhase = ''
+    install -Dm755 bin/premake $out/bin/premake
+  '';
+
+  meta = {
+    homepage = http://industriousone.com/premake;
+    description = "A simple build configuration and project generation tool using lua";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/pkgs/development/tools/misc/premake/default.nix
@ -1,21 +1,25 @@
 {stdenv, fetchurl, unzip}:

 let baseName = "premake";
-    version  = "3.7";
+  version  = "4.3";
 in

 stdenv.mkDerivation {
  name = "${baseName}-${version}";

  src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
-    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+    url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip";
+    sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
  };

  buildInputs = [unzip];

+  buildPhase = ''
+    make -C build/gmake.unix/
+  '';
+
  installPhase = ''
-    install -Dm755 bin/premake $out/bin/premake
+    install -Dm755 bin/release/premake4 $out/bin/premake4
  '';

  meta = {
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, python, zlib, v8, utillinux }:

 stdenv.mkDerivation rec {
-  version = "0.8.15";
+  version = "0.8.23";
  name = "nodejs-${version}";

  src = fetchurl {
    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1ccjaw0lqspnrmzcb9jbnh1mf74ny7874m2q4vz83q7kdnf66n0p";
+    sha256 = "17gdvv0q95v5dn9mbwrm3pxcchfgmlwa7pamwsam9hpdi9ik491q";
  };

  configureFlags = [
--- a/pkgs/development/web/plone/4.1.6.nix
+++ b/pkgs/development/web/plone/4.1.6.nix
--- a/pkgs/development/web/plone/4.2.5.nix
+++ b/pkgs/development/web/plone/4.2.5.nix
--- a/pkgs/development/web/plone/default.nix
+++ b/pkgs/development/web/plone/default.nix
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@ -183,19 +183,25 @@
    url = http://www.tcl.tk/software/tcltk/license.html;
  };

-  unfree = {
-    shortName = "unfree";
-    fullName = "unfree non-redistributable license";
-  };
+  unfree = "unfree";

-  unfreeRedistributable = {
-    shortName = "unfree-redistributable";
-    fullName = "unfree redistributable license";
-  };
+  unfreeRedistributable = "unfree-redistributable";

  zlib = {
    shortName = "zlib";
    fullName = "zlib license";
    url = http://www.gzip.org/zlib/zlib_license.html;
  };
+
+  zpt20 = {
+    shortName = "ZPT2.0";
+    fullName = "Zope Public License 2.0";
+    url = "http://old.zope.org/Resources/License/ZPL-2.0";
+  };
+
+  zpt21 = {
+    shortName = "ZPT2.1";
+    fullName = "Zope Public License 2.1";
+    url = "http://old.zope.org/Resources/License/ZPL-2.1";
+  };
 }
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@ -231,7 +231,7 @@ in
 import ./generic.nix (

  rec {
-    version = "3.0.72";
+    version = "3.0.73";

    preConfigure = ''
      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -239,7 +239,7 @@ import ./generic.nix (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "17whpcxibn6z1i1zjwx0vim33al9vgjp3jlvmam06qlxrl4i2q6w";
+      sha256 = "1advdnl37jypiv1vyq5b3qapw2vbncm5d7wfc8far9vgvj8hwsqz";
    };

    config = configWithPlatform stdenv.platform;
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@ -245,7 +245,7 @@ in
 import ./generic.nix (

  rec {
-    version = "3.4.39";
+    version = "3.4.40";
    testing = false;

    preConfigure = ''
@ -254,7 +254,7 @@ import ./generic.nix (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "16k1ssink1ka3593vgr1nzywc8laag58k0qz4hx0ad0sa0f7kz38";
+      sha256 = "16gsqkzhb362lq51wp1j5k9z9mzwhzfnvfc0h2c6wqnk6rwzms9b";
    };

    config = configWithPlatform stdenv.platform;
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@ -252,7 +252,7 @@ in
 import ./generic.nix (

  rec {
-    version = "3.8.6";
+    version = "3.8.7";
    testing = false;

    preConfigure = ''
@ -261,7 +261,7 @@ import ./generic.nix (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "036i1hx2b49ssymw3xv73dz628n5yxbsngbfvsp4l7ww6brria5g";
+      sha256 = "1d6k2dlh0zh64i92jnhx60353jhkiynfy6hnrby34sajfshl01jl";
    };

    config = configWithPlatform stdenv.platform;
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@ -1,34 +1,33 @@
 { stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }:

 stdenv.mkDerivation rec {
-  name = "lxc-0.8.0";
+  name = "lxc-0.9.0";

  src = fetchurl {
    url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
-    sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a";
+    sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy";
  };

  buildInputs = [ libcap apparmor perl docbook2x ];

  patches = [
-   ./dont-run-ldconfig.patch
-   ./fix-documentation-build.patch
-   ./fix-sgml-documentation.patch
+    ./dont-run-ldconfig.patch
+    ./install-localstatedir-in-store.patch
+    ./support-db2x.patch
  ];

  preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";

-  configureFlags = "--localstatedir=/var";
-
-  postInstall = ''
-    cd "$out/lib"
-    lib=liblxc.so.?.*
-    ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
-  '';
+  configureFlags = [
+    "--localstatedir=/var"
+    "--enable-doc"
+    "--enable-tests"
+    "--enable-apparmor"
+  ];

  meta = {
    homepage = "http://lxc.sourceforge.net";
-    description = "lightweight virtual system mechanism";
+    description = "userspace tools for Linux Containers, a lightweight virtualization system";
    license = stdenv.lib.licenses.lgpl21Plus;

    longDescription = ''
--- a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
+++ b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
@ -1,24 +1,22 @@
-diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am
--- lxc-0.7.5-orig/src/lxc/Makefile.am	2011-07-25 00:27:10.000000000 +0200
-+++ lxc-0.7.5/src/lxc/Makefile.am	2011-09-26 09:58:03.479916848 +0200
-@@ -115,7 +115,7 @@
- 
- install-exec-local: install-soPROGRAMS
+diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.am lxc-0.9.0/src/lxc/Makefile.am
+--- lxc-0.9.0-orig/src/lxc/Makefile.am	2013-04-15 10:50:22.898102973 +0200
+++ lxc-0.9.0/src/lxc/Makefile.am	2013-04-15 10:50:44.264862808 +0200
+@@ -193,7 +193,6 @@
+ 	mkdir -p $(DESTDIR)$(datadir)/lxc
+ 	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
 	mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
 -	/sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
-+	: /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
 	cd $(DESTDIR)$(libdir); \
+ 	ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \
 	ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
- 
-diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in
--- lxc-0.7.5-orig/src/lxc/Makefile.in	2011-08-11 19:02:19.000000000 +0200
-+++ lxc-0.7.5/src/lxc/Makefile.in	2011-09-26 09:58:18.812685181 +0200
-@@ -1322,7 +1322,7 @@
- 
- install-exec-local: install-soPROGRAMS
+diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.in lxc-0.9.0/src/lxc/Makefile.in
+--- lxc-0.9.0-orig/src/lxc/Makefile.in	2013-04-15 10:50:22.898102973 +0200
+++ lxc-0.9.0/src/lxc/Makefile.in	2013-04-15 10:51:08.755810177 +0200
+@@ -1519,7 +1519,6 @@
+ 	mkdir -p $(DESTDIR)$(datadir)/lxc
+ 	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
 	mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
 -	/sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
-+	: /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
 	cd $(DESTDIR)$(libdir); \
+ 	ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \
 	ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
- 
--- a/pkgs/os-specific/linux/lxc/fix-documentation-build.patch
+++ b/pkgs/os-specific/linux/lxc/fix-documentation-build.patch
@ -1,40 +0,0 @@
-diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am lxc-0.7.5/doc/Makefile.am
--- lxc-0.7.5-orig/doc/Makefile.am	2011-02-14 09:14:07.000000000 +0100
-+++ lxc-0.7.5/doc/Makefile.am	2011-09-26 09:53:02.192817940 +0200
-@@ -30,13 +30,13 @@
- 
- 
- %.1 : %.sgml 
-	docbook2man -w all $<
-+	docbook2man $<
- 
- %.5 : %.sgml 
-	docbook2man -w all $<
-+	docbook2man $<
- 
- %.7 : %.sgml 
-	docbook2man -w all $<
-+	docbook2man $<
- 
- lxc-%.sgml : common_options.sgml see_also.sgml
- 
-diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in lxc-0.7.5/doc/Makefile.in
--- lxc-0.7.5-orig/doc/Makefile.in	2011-08-11 19:02:18.000000000 +0200
-+++ lxc-0.7.5/doc/Makefile.in	2011-09-26 09:53:13.835401448 +0200
-@@ -786,13 +786,13 @@
- 
- 
- @ENABLE_DOCBOOK_TRUE@%.1 : %.sgml 
-@ENABLE_DOCBOOK_TRUE@	docbook2man -w all $<
-+@ENABLE_DOCBOOK_TRUE@	docbook2man $<
- 
- @ENABLE_DOCBOOK_TRUE@%.5 : %.sgml 
-@ENABLE_DOCBOOK_TRUE@	docbook2man -w all $<
-+@ENABLE_DOCBOOK_TRUE@	docbook2man $<
- 
- @ENABLE_DOCBOOK_TRUE@%.7 : %.sgml 
-@ENABLE_DOCBOOK_TRUE@	docbook2man -w all $<
-+@ENABLE_DOCBOOK_TRUE@	docbook2man $<
- 
- @ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml
- 
--- a/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch
+++ b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch
@ -1,291 +0,0 @@
-diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in
-index 7092f16..021da41 100644
--- a/doc/lxc-attach.sgml.in
-+++ b/doc/lxc-attach.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in
-index 5acd313..856a544 100644
--- a/doc/lxc-cgroup.sgml.in
-+++ b/doc/lxc-cgroup.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in
-index bf0efd9..eeb0039 100644
--- a/doc/lxc-checkpoint.sgml.in
-+++ b/doc/lxc-checkpoint.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in
-index 606c868..62f9e07 100644
--- a/doc/lxc-console.sgml.in
-+++ b/doc/lxc-console.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in
-index a3cca83..d59106d 100644
--- a/doc/lxc-create.sgml.in
-+++ b/doc/lxc-create.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-@@ -141,6 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 	    filesystem) of size SIZE rather than the default, which is 1G.
- 	  </para>
- 	</listitem>
-+      </varlistentry>
- 
-       <varlistentry>
- 	<term>
-diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in
-index e75de57..05f53d6 100644
--- a/doc/lxc-destroy.sgml.in
-+++ b/doc/lxc-destroy.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
-index 77d132a..1e58bef 100644
--- a/doc/lxc-execute.sgml.in
-+++ b/doc/lxc-execute.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in
-index 798ccf4..f0d0485 100644
--- a/doc/lxc-freeze.sgml.in
-+++ b/doc/lxc-freeze.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in
-index 5bec922..1f48820 100644
--- a/doc/lxc-kill.sgml.in
-+++ b/doc/lxc-kill.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
-index 3ffd4f8..b11d211 100644
--- a/doc/lxc-ls.sgml.in
-+++ b/doc/lxc-ls.sgml.in
-@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
- ]>
-diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
-index 9d8711c..b492968 100644
--- a/doc/lxc-monitor.sgml.in
-+++ b/doc/lxc-monitor.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in
-index bb7b5a6..05ed59f 100644
--- a/doc/lxc-ps.sgml.in
-+++ b/doc/lxc-ps.sgml.in
-@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
- ]>
-diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in
-index eb556d9..d158cc7 100644
--- a/doc/lxc-restart.sgml.in
-+++ b/doc/lxc-restart.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
-index 4504d58..f268185 100644
--- a/doc/lxc-start.sgml.in
-+++ b/doc/lxc-start.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
-index d15e649..51179c4 100644
--- a/doc/lxc-stop.sgml.in
-+++ b/doc/lxc-stop.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in
-index bb00d85..3f8f59b 100644
--- a/doc/lxc-unfreeze.sgml.in
-+++ b/doc/lxc-unfreeze.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
-index 97a4c39..0c7c589 100644
--- a/doc/lxc-wait.sgml.in
-+++ b/doc/lxc-wait.sgml.in
-@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
-index 9edabf8..daa2ff8 100644
--- a/doc/lxc.conf.sgml.in
-+++ b/doc/lxc.conf.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
- ]>
-diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
-index 1b30fed..d98ca21 100644
--- a/doc/lxc.sgml.in
-+++ b/doc/lxc.sgml.in
-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
- -->
- 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- 
- <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
- ]>
-@@ -280,7 +280,7 @@ rootfs
-       </para>
- 
-       <programlisting>
-
-+<![CDATA[
-    ---------
-   | STOPPED |<---------------
-    ---------                 |
-@@ -305,7 +305,7 @@ rootfs
-    ----------                |
-        |                     |
-         ---------------------
-
-+]]>
-       </programlisting>
-     </refsect2>
- 
-@@ -570,7 +570,7 @@ rootfs
- 	to the background.
- 
- 	<programlisting>
-
-+<![CDATA[
- 	  # launch lxc-wait in background
- 	  lxc-wait -n foo -s STOPPED &
- 	  LXC_WAIT_PID=$!
-@@ -583,7 +583,7 @@ rootfs
- 	  # is STOPPED
- 	  wait $LXC_WAIT_PID
- 	  echo "'foo' is finished"
-
-+]]>
- 	</programlisting>
-       </para>
-     </refsect2>
--- a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
+++ b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
@ -0,0 +1,28 @@
+diff -ubr lxc-0.9.0-orig/Makefile.am lxc-0.9.0/Makefile.am
+--- lxc-0.9.0-orig/Makefile.am	2013-04-15 10:50:22.899103057 +0200
+++ lxc-0.9.0/Makefile.am	2013-04-15 10:58:41.189504254 +0200
+@@ -25,8 +25,8 @@
+ pcdata_DATA = lxc.pc
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(LXCPATH)
+-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
+	$(MKDIR_P) $(out)$(LXCPATH)
+	$(MKDIR_P) $(out)$(localstatedir)/cache/lxc
+ 
+ ChangeLog::
+ 	@touch ChangeLog
+diff -ubr lxc-0.9.0-orig/Makefile.in lxc-0.9.0/Makefile.in
+--- lxc-0.9.0-orig/Makefile.in	2013-04-15 10:50:22.899103057 +0200
+++ lxc-0.9.0/Makefile.in	2013-04-15 10:58:58.817870957 +0200
+@@ -805,8 +805,8 @@
+ 
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(LXCPATH)
+-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
+	$(MKDIR_P) $(out)$(LXCPATH)
+	$(MKDIR_P) $(out)$(localstatedir)/cache/lxc
+ 
+ ChangeLog::
+ 	@touch ChangeLog
--- a/pkgs/os-specific/linux/lxc/support-db2x.patch
+++ b/pkgs/os-specific/linux/lxc/support-db2x.patch
@ -0,0 +1,29 @@
+diff -ubr lxc-0.9.0-orig/configure lxc-0.9.0/configure
+--- lxc-0.9.0-orig/configure	2013-04-15 10:50:22.899103057 +0200
+++ lxc-0.9.0/configure	2013-04-15 11:08:08.696539776 +0200
+@@ -4792,7 +4792,7 @@
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5
+ $as_echo_n "checking for docbook2x-man... " >&6; }
+-	for name in docbook2x-man db2x_docbook2man; do
+	for name in docbook2x-man db2x_docbook2man docbook2man; do
+ 		if "$name" --help >/dev/null 2>&1; then
+ 			db2xman="$name"
+ 			break;
+@@ -8353,4 +8353,3 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+diff -ubr lxc-0.9.0-orig/configure.ac lxc-0.9.0/configure.ac
+--- lxc-0.9.0-orig/configure.ac	2013-04-15 10:50:22.896102806 +0200
+++ lxc-0.9.0/configure.ac	2013-04-15 11:07:52.399582819 +0200
+@@ -67,7 +67,7 @@
+ 	db2xman=""
+ 
+ 	AC_MSG_CHECKING(for docbook2x-man)
+-	for name in docbook2x-man db2x_docbook2man; do
+	for name in docbook2x-man db2x_docbook2man docbook2man; do
+ 		if "$name" --help >/dev/null 2>&1; then
+ 			db2xman="$name"
+ 			break;
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@ -1,13 +1,13 @@
 {stdenv, fetchurl, x11, mesa}:

-let version = "8.0.1"; in
+let version = "8.1.0"; in

 stdenv.mkDerivation {
  name = "glxinfo-${version}";

  src = fetchurl {
    url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
-    sha256 = "1lbp1llpx0hl5k79xb653yvjvk9mlikj73r8xjzyxqqp1nrg5isb";
+    sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";
  };

  buildInputs = [x11 mesa];
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, glib }:

 let
-  name = "nbd-3.2";
+  name = "nbd-3.3";
 in
 stdenv.mkDerivation {
  inherit name;

  src = fetchurl {
    url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "e297c1883133f04a55d8e9527a2e4344e577a54046cf81694ffabe13f73793db";
+    sha256 = "068cm0lkw67g7vj95kqxwb9z15c0jbsfbmjjl5zfx7mbvhc5f443";
  };

  buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@ -1,6 +1,6 @@
 { fetchurl, stdenv, texinfo, perl
 , XMLSAX, XMLParser, XMLNamespaceSupport
-, groff, libxml2, libxslt, gnused, libiconv, opensp
+, groff, libxml2, libxslt, gnused, libiconvOrEmpty, opensp
 , docbook_xml_dtd_43
 , makeWrapper }:

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
                  XMLSAX XMLParser XMLNamespaceSupport opensp
-  	        ] ++ (if libiconv != null then [libiconv] else []);
+                ] ++ libiconvOrEmpty;

  postConfigure = ''
    # Broken substitution is used for `perl/config.pl', which leaves literal
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -433,11 +433,19 @@ let
  apg = callPackage ../tools/security/apg { };

  xcodeenv = callPackage ../development/mobile/xcodeenv { };
-
-  titaniumenv = import ../development/mobile/titaniumenv {
+  
+  titaniumenv_2_1 = import ../development/mobile/titaniumenv {
+    inherit pkgs;
+    pkgs_i686 = pkgsi686Linux;
+    version = "2.1";
+  };
+  
+  titaniumenv_3_1 = import ../development/mobile/titaniumenv {
    inherit pkgs;
    pkgs_i686 = pkgsi686Linux;
  };
+  
+  titaniumenv = titaniumenv_3_1;

  inherit (androidenv) androidsdk_4_1;

@ -689,7 +697,6 @@ let

  docbook2x = callPackage ../tools/typesetting/docbook2x {
    inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
-    libiconv = if stdenv.isDarwin then libiconv else null;
  };

  dosfstools = callPackage ../tools/filesystems/dosfstools { };
@ -847,13 +854,9 @@ let
    guile = guile_1_8;
  };

-  gnugrep =
-    # Use libiconv only on non-GNU platforms (we can't test with
-    # `stdenv ? glibc' at this point.)
-    let gnu = stdenv.isLinux; in
-      callPackage ../tools/text/gnugrep {
-        libiconv = if gnu then null else libiconv;
-      };
+  gnugrep = callPackage ../tools/text/gnugrep {
+    libiconv = libiconvOrNull;
+  };

  gnulib = callPackage ../development/tools/gnulib { };

@ -3319,7 +3322,11 @@ let
  pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { });
  pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });

-  premake = callPackage ../development/tools/misc/premake { };
+  premake3 = callPackage ../development/tools/misc/premake/3.nix { };
+
+  premake4 = callPackage ../development/tools/misc/premake { };
+
+  premake = premake4;

  pstack = callPackage ../development/tools/misc/gdb/pstack.nix { };

@ -4323,6 +4330,9 @@ let

  libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv;

+  # On non-GNU systems we need GNU Gettext for libintl.
+  libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
+
  libid3tag = callPackage ../development/libraries/libid3tag { };

  libidn = callPackage ../development/libraries/libidn { };
@ -4419,6 +4429,8 @@ let

  libotr = callPackage ../development/libraries/libotr { };

+  libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
+
  libp11 = callPackage ../development/libraries/libp11 { };

  libpar2 = callPackage ../development/libraries/libpar2 { };
@ -5332,9 +5344,18 @@ let
    python = python27;
  });

-  plone43Packages = recurseIntoAttrs (import ../development/web/plone {
+  plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.6.nix {
+    inherit pkgs;
+    pythonPackages = python27Packages;
+  });
+
+  plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.5.nix {
+    inherit pkgs;
+    pythonPackages = python27Packages;
+  });
+
+  plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.0.nix {
    inherit pkgs;
-    python = python27;
    pythonPackages = python27Packages;
  });

@ -6651,6 +6672,7 @@ let
    # For some reason, TLS support is broken when using GnuTLS 3.0 (can't
    # connect to jabber.org, for instance.)
    gnutls = gnutls2;
+    libotr = libotr_3_2;
  };

  blender = callPackage  ../applications/misc/blender {
@ -7066,6 +7088,8 @@ let
    jre = jdk;
  };

+  freenet = callPackage ../applications/networking/p2p/freenet { };
+
  freepv = callPackage ../applications/graphics/freepv { };

  xfontsel = callPackage ../applications/misc/xfontsel { };
@ -7317,6 +7341,8 @@ let

  irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };

+  irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
+
  bip = callPackage ../applications/networking/irc/bip { };

  jack_capture = callPackage ../applications/audio/jack-capture { };
@ -7771,6 +7797,9 @@ let
    usePulseAudio = config.pulseaudio or true;
  };

+  skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
+
+
  skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };

  st = callPackage ../applications/misc/st { };
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -150,7 +150,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
    regexBase    = self.regexBase_0_93_2;       # 7.6 ok
    regexCompat  = self.regexCompat_0_95_1;     # 7.6 ok
    regexPosix   = self.regexPosix_0_95_2;      # 7.6 ok
-    split        = self.split_0_2_1_3;          # 7.6 ok
+    split        = self.split_0_2_2;            # 7.6 ok
    stm          = self.stm_2_4_2;              # 7.6 ok
    syb          = self.syb_0_4_0;              # 7.6 ok
    text         = self.text_0_11_2_3;          # 7.6 ok
@ -684,7 +684,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
  cuda_0_4_1_1 = callPackage ../development/libraries/haskell/cuda/0.4.1.1.nix {
    inherit (pkgs.linuxPackages) nvidia_x11;
  };
-  cuda_0_5_0_1 = callPackage ../development/libraries/haskell/cuda/0.5.0.1.nix {
+  cuda_0_5_0_2 = callPackage ../development/libraries/haskell/cuda/0.5.0.2.nix {
    inherit (pkgs.linuxPackages) nvidia_x11;
  };
  cuda = self.cuda_0_4_1_1;
@ -1708,8 +1708,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
  SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};

  split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
-  split_0_2_1_3 = callPackage ../development/libraries/haskell/split/0.2.1.3.nix {};
-  split = self.split_0_2_1_3;
+  split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {};
+  split = self.split_0_2_2;

  stbImage = callPackage ../development/libraries/haskell/stb-image {};

@ -1775,8 +1775,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {};

-  testpack = callPackage ../development/libraries/haskell/testpack {};
-
  texmath = callPackage ../development/libraries/haskell/texmath {};

  text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {};
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@ -1541,13 +1541,15 @@ rec {
  };

  DBIxClass = buildPerlPackage {
-    name = "DBIx-Class-0.08204";
+    name = "DBIx-Class-0.08210";
    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GE/GETTY/DBIx-Class-0.08204.tar.gz;
-      sha256 = "0pghq6b60fyffb233hdk9qi47wcbf2sgp08679v9nxh4i5qp49gx";
+      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08210.tar.gz;
+      sha256 = "0sajw5j3zpgf44zaif5sp98xpkdfmzfn76c8anljfx48qh7r22y4";
    };
    buildInputs = [ DBDSQLite PackageStash TestException TestWarn ];
    propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ];
+    # !!! tests broken with latest sqlite, see http://lists.scsys.co.uk/pipermail/dbix-class/2013-April/011271.html
+    doCheck = false;
    meta = {
      homepage = http://www.dbix-class.org/;
      description = "Extensible and flexible object <-> relational mapper";
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -544,34 +544,30 @@ pythonPackages = python.modules // rec {
  # });


-  buildout = buildPythonPackage rec {
-    name = "buildout-${version}";
-    version = "1.7.0";
+  buildout = zc_buildout;
+  buildout152 = zc_buildout152;
+
+  zc_buildout = zc_buildout171;
+  zc_buildout171 = buildPythonPackage rec {
+    name = "zc.buildout-1.7.1";

    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz";
-      md5 = "4e3b521600e475c56a0a66459a5fc7bb";
+      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
+      md5 = "8834a21586bf2be53dc412002241a996";
    };

-   # TODO: consider if this patch should be an option
-   # It makes buildout useful in a nix profile, but this alters the default functionality
-   patchPhase = ''
-     sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py
-   '';
-
   meta = {
-      homepage = http://www.buildout.org/;
+      homepage = "http://www.buildout.org";
      description = "A software build and configuration system";
+      license = pkgs.lib.licenses.zpt21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
    };
  };
-
-
-  buildout152 = buildPythonPackage rec {
-    name = "buildout-${version}";
-    version = "1.5.2";
+  zc_buildout152 = buildPythonPackage rec {
+    name = "zc.buildout-1.5.2";

    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
      md5 = "87f7b3f8d13926c806242fd5f6fe36f7";
    };

@ -582,8 +578,10 @@ pythonPackages = python.modules // rec {
   '';

   meta = {
-      homepage = http://www.buildout.org/;
+      homepage = "http://www.buildout.org";
      description = "A software build and configuration system";
+      license = pkgs.lib.licenses.zpt21;
+      maintainers = [ stdenv.lib.maintainers.garbas ];
    };
  };

--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -341,7 +341,6 @@ mapTestOn {
    Tensor = supportedSystems;
    terminfo = supportedSystems;
    testFramework = supportedSystems;
-    testpack = supportedSystems;
    texmath = supportedSystems;
    text = supportedSystems;
    thLift = supportedSystems;
				`@ -0,0 +1 @@`
				`s\|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)\|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()\|`