Merge branch 'master' into stdenv-updates.

There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.
2024-11-01 15:11:25 +00:00 · 2013-06-11 12:11:25 +02:00 · 2013-06-11 12:11:25 +02:00 · 6b1ebeccf2
commit 6b1ebeccf2
parent a3cc980193 c662109f8a
172 changed files with 4164 additions and 1333 deletions
--- a/maintainers/scripts/copy-tarball.sh
+++ b/maintainers/scripts/copy-tarball.sh
@ -1,6 +1,6 @@
 #! /bin/sh -e

-distDir=/data/webserver/tarballs
+distDir=${NIX_TARBALLS_CACHE:-/tarballs}

 url="$1"
 file="$2"
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@ -11,7 +11,7 @@ let
 in

 stdenv.mkDerivation {
-  name = "ardour3";
+  name = "ardour-3.0";

  src = fetchgit {
    url = git://git.ardour.org/ardour/ardour.git;
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@ -1,20 +1,32 @@
 { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
-  libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame,
-  expat, id3lib, ffmpeg, portaudio
+  libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
+  expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */
  }:

 stdenv.mkDerivation rec {
-  version = "2.0.2";
+  version = "2.0.3";
  name = "audacity-${version}";

  src = fetchurl {
-    url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
-    sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc";
+    url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz";
+    sha256 = "1k4bbxhpfl80vm3gm3jxqly0syqjij5kwziy4xyq2c8aj2miwj1f";
  };
-  buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
-                  libvorbis libmad flac id3lib ffmpeg gettext ];
+
+  preConfigure = /* we prefer system-wide libs */ ''
+    mv lib-src lib-src-rm
+    mkdir lib-src
+    mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/
+    rm -r lib-src-rm/
+  '';
+
+  buildInputs = [
+    pkgconfig gettext wxGTK gtk expat alsaLib
+    libsndfile soxr libid3tag
+    ffmpeg libmad lame libvorbis flac
+  ]; #ToDo: soundtouch, detach sbsms

  dontDisableStatic = true;
+  doCheck = true;

  meta = {
    description = "Sound editor with graphical UI";
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@ -12,7 +12,7 @@
 }:

 stdenv.mkDerivation {
-  name = "csound5.18.02";
+  name = "csound-5.18.02";

  enableParallelBuilding = true;

--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, libao, faad2, libmad, readline, json_c, libgcrypt, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "pianobar-2013.05.19";
+
+  src = fetchurl {
+    url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
+    sha256 = "cf88e82663d2b0aa4d73e761506eac4f3e7bc789b57d92377acd994d785e1046";
+  };
+
+  buildInputs = [
+    pkgconfig libao faad2 libmad json_c libgcrypt gnutls
+  ];
+
+  makeFlags="PREFIX=$(out)";
+
+  CC = "gcc";
+  CFLAGS = "-std=c99";
+
+  meta = {
+    description = "A console front-end for Pandora.com";
+    homepage = "http://6xq.net/projects/pianobar/";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.unfree;
+  };
+}
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@ -1,12 +1,12 @@
-{ stdenv, fetchgit, emacs }:
+{ stdenv, fetchurl, emacs }:

-stdenv.mkDerivation {
-  name = "haskell-mode-2.8.0.29-gae3e4499d2";
+stdenv.mkDerivation rec {
+  name = "haskell-mode-2.9.1-102-g8d4b965";

-  src = fetchgit {
-    url = "http://github.com/haskell/haskell-mode.git";
-    rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a";
-    sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae";
+  src = fetchurl {
+    url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f";
+    sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a";
+    name = "${name}.tar.gz";
  };

  buildInputs = [emacs];
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix
@ -11,7 +11,7 @@ in
    src = fetchsvn {
      url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee";
      rev = revision;
-      sha256 = "1qj5cv74dp6nf6060jyvnlcbmc4sz8a09806gwa1zfiwz6mm9zrs";
+      sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz";
    };

    patchFlags = "-p1 --ignore-whitespace";
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
  src = fetchurl {
    # XXX: Upstream URL is not versioned, which might eventually break this.
    url = "http://www.neilvandyke.org/quack/quack.el";
-    sha256 = "1w3p03f1f3l2nldxc7dig1kkgbbvy5j7zid0cfmkcrpp1qrcsqic";
+    sha256 = "1q5bsllxkibiddwp32306flqm8s3caffnpbqz5ka260avllp4jj5";
  };

  buildInputs = [ emacs ];
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@ -4,10 +4,11 @@ stdenv.mkDerivation rec {
  name = "session-management-for-emacs-2.2a";
  
  src = fetchurl {
-    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
-    sha256 = "0i01dnkizs349ahyybzy0mjzgj52z65rxynsj2mlw5mm41sbmprp";
+    url = "http://downloads.sourceforge.net/project/emacs-session/session/2.2a/session-2.2a.tar.gz";
+#    url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
+    sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
  };
-  
+
  buildInputs = [emacs];
  
  installPhase = ''
--- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix
@ -0,0 +1,27 @@
+{ stdenv, fetchurl, emacs }:
+
+# this package installs the emacs-mode which
+# resides in the ocaml compiler sources.
+
+let version = "2.0.6";
+
+in stdenv.mkDerivation {
+  name = "tuareg-mode-${version}";
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.6.tar.gz;
+    sha256 = "ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189";
+  }; 
+
+  buildInputs = [ emacs ];
+
+  installPhase = ''
+    ensureDir "$out/share/emacs/site-lisp"
+    cp *.el *.elc  "$out/share/emacs/site-lisp"
+  '';
+
+  meta = {
+    homepage = http://caml.inria.fr;
+    description = "OCaml mode package for Emacs";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@ -1,14 +1,38 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
-args: with args;
+args@{source ? "latest", ...}: with args;
+
+
 let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+composableDerivation {} (fix: {

    name = "vim_configurable-7.3";

-    src = args.fetchurl {
-      url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2;
-      sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
+    enableParallelBuilding = true; # test this
+
+    src = 
+      builtins.getAttr source {
+      "default" =
+        # latest release
+        args.fetchurl {
+            url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2;
+            sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
+          };
+      "vim-nox" =
+          {
+            # vim nox branch: client-server without X by uing sockets
+            # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; }
+            src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; });
+            name = "vim-nox-hg-2082fc3";
+            # END
+          }.src;
+      "latest" = {
+        # vim latest usually is vim + bug fixes. So it should be very stable
+         # REGION AUTO UPDATE: { name="vim"; type="hg"; url="https://vim.googlecode.com/hg"; }
+         src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-hg-7f98896.tar.bz2"; sha256 = "efcb8cc5924b530631a8e5fc2a0622045c2892210d32d300add24aded51866f1"; });
+         name = "vim-hg-7f98896";
+         # END
+      }.src;
    };

    configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
@ -54,6 +78,7 @@ composableDerivation {} {
    cscopeSupport    = config.vim.cscope or false;
    # add .nix filetype detection and minimal syntax highlighting support
    ftNixSupport     = config.vim.ftNix or true;
+    netbeansSupport = config.netbeans or true; # eg envim is using it
  };

  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
@ -85,4 +110,5 @@ composableDerivation {} {
    homepage = "www.vim.org";
  };

-}
+})
+
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@ -0,0 +1,30 @@
+{stdenv, fetchurl, jre}:
+
+stdenv.mkDerivation {
+  name = "alchemy-007-alpha";
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = http://al.chemy.org/files/Alchemy-007.tar.gz;
+    sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b";
+  };
+
+  installPhase = ''
+    ensureDir $out/bin $out/share
+    cp -a . $out/share/alchemy
+    cat >> $out/bin/alchemy << EOF
+    #!/bin/sh
+    cd $out/share/alchemy
+    ${jre}/bin/java -jar Alchemy.jar "$@"
+    EOF
+    chmod +x $out/bin/alchemy
+  '';
+
+  meta = {
+    description = "Drawing application";
+    homepage = http://al.chemy.org/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "soxr-0.1.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
+    sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw";
+  };
+
+  preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src'';
+
+  buildInputs = [ cmake ];
+
+  meta = {
+    description = "An audio resampling library";
+    homepage = http://soxr.sourceforge.net;
+    license = "LGPLv2.1+";
+  };
+}
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.1";
+  name = "gphoto2-2.5.2";

  src = fetchurl {
    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad";
+    sha256 = "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf";
  };

  nativeBuildInputs = [ pkgconfig gettext ];
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@ -3,10 +3,11 @@
  randrproto, xcbutil, xf86vidmodeproto }:

 stdenv.mkDerivation rec {
-  name = "redshift";
+  pname = "redshift";
  version = "1.6";
+  name = "${pname}-${version}";
  src = fetchurl {
-    url = "http://launchpad.net/${name}/trunk/${version}/+download/${name}-${version}.tar.bz2";
+    url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
    sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi";
  };

@ -25,4 +26,4 @@ stdenv.mkDerivation rec {
    license = "GPLv3+";
    homepage = "http://jonls.dk/redshift";
  }; 
-}
+}
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ b/pkgs/applications/misc/vanitygen/default.nix
@ -0,0 +1,38 @@
+{ fetchurl, stdenv, openssl, pcre }:
+
+stdenv.mkDerivation rec {
+  version = "0.21";
+  name = "vanitygen-${version}";
+
+  src = fetchurl {
+    name = "vanitygen-${version}.tar.gz";
+    url = "https://github.com/samr7/vanitygen/tarball/0.21";
+    sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv";
+  };
+
+  buildInputs = [ openssl pcre ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp vanitygen $out/bin
+    cp keyconv $out/bin/vanitygen-keyconv
+  '';
+
+  meta = {
+      description = "Bitcoin vanity address generator";
+      longDescription= ''
+        Vanitygen can search for exact prefixes or regular expression
+        matches, so you can generate Bitcoin addresses that starts
+        with the needed mnemonic.
+
+        Vanitygen can generate regular bitcoin addresses, namecoin
+        addresses, and testnet addresses.
+
+        When searching for exact prefixes, vanitygen will ensure that
+        the prefix is possible, will provide a difficulty estimate,
+        and will run about 30% faster.
+      '';
+      homepage = "https://github.com/samr7/vanitygen";
+      license = "AGPLv3";
+  };
+}
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@ -1,15 +1,15 @@
-{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
-, wirelesstools, X11, X11Xft
+{ cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
+, utf8String, wirelesstools, X11, X11Xft
 }:

 cabal.mkDerivation (self: {
  pname = "xmobar";
-  version = "0.17";
-  sha256 = "0ahb3xqxcfvpgxyb901bpl4i56mnslzwplcqxrr13glngcl7d25s";
+  version = "0.18";
+  sha256 = "08kk0yjx51vjrvvvd34hv8v80dsh8kjv150qf413ikaff0i28v7w";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
-    filepath mtl parsec stm time utf8String X11 X11Xft
+    filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
  ];
  extraLibraries = [ libXrandr wirelesstools ];
  configureFlags = "-fwith_xft -fwith_iwlib";
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@ -3,7 +3,7 @@
 let inherit (composableDerivation) edf wwf; in

 composableDerivation.composableDerivation {} ( fixed : {
-  name = "yate2";
+  name = "yate-2.2.0_1";

  src = fetchurl {
    url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@ -6,13 +6,13 @@
    sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k";
  };
  beta = {
-    version = "28.0.1500.20";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.20.tar.xz";
-    sha256 = "1q4qsgixh9q5akjnk614k942kxshi81v4xvm40f7rxzns88qbfrz";
+    version = "28.0.1500.36";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.36.tar.xz";
+    sha256 = "1bz9w46ps8gj056hfwbcj4myyxyr7y759nagz9idraia8116m3pp";
  };
  stable = {
-    version = "27.0.1453.93";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93.tar.xz";
-    sha256 = "0h5d4v7003y3h6rg48dn6cswp6zzj9zdcci3cl9cbb3j9ldc1n3d";
+    version = "27.0.1453.110";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.110.tar.xz";
+    sha256 = "1y61shbzrkcv70x9zyj559g2yyp40hi9y59f7wwx5g076lsaxsw5";
  };
 }
--- a/pkgs/applications/networking/browsers/firefox/20.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/20.0.nix
@ -135,7 +135,6 @@ rec {
      [ "--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";
--- a/pkgs/applications/networking/browsers/firefox/21.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/21.0.nix
@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;

 rec {

-  firefoxVersion = "19.0.2";
+  firefoxVersion = "21.0";

-  xulVersion = "19.0.2"; # this attribute is used by other packages
+  xulVersion = "21.0"; # this attribute is used by other packages


  src = fetchurl {
@ -27,7 +27,7 @@ rec {
        # Fall back to this url for versions not available at releases.mozilla.org.
        "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
    ];
-    sha1 = "d108d356225379a86d69a4906c706289135f6342";
+    sha1 = "e63b5488eaec1956947f59609d5839332ba7ffe1";
  };

  commonConfigureFlags =
@ -41,7 +41,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" # <-- doesn't build
+      "--enable-system-cairo"
      "--enable-system-sqlite"
      "--disable-crashreporter"
      "--disable-tests"
@ -72,6 +72,10 @@ rec {

    enableParallelBuilding = true;

+    patches = [
+      ./system-cairo.patch # accepted upstream, probably in 22
+    ];
+
    preConfigure =
      ''
        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
@ -129,13 +133,16 @@ rec {
        xlibs.pixman yasm mesa sqlite file unzip pysqlite
      ];

+    patches = [
+      ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
+    ];
+
    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";
@ -160,6 +167,10 @@ rec {
        rm firefox
        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
        chmod a+x firefox
+
+        # Put chrome.manifest etc. in the right place.
+        mv browser/* .
+        rmdir browser
      ''; # */

    meta = {
--- a/pkgs/applications/networking/browsers/firefox/disable-reporter.patch
+++ b/pkgs/applications/networking/browsers/firefox/disable-reporter.patch
@ -0,0 +1,20 @@
+# from:
+# - https://www.linuxquestions.org/questions/linux-from-scratch-13/blfs-xulrunner-firefox-21-0-and-search-4175462532/
+# - http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg17359.html
+
+--- mozilla-release/browser/base/content/browser.js.orig	2013-05-11 16:19:21.000000000 -0300
+++ mozilla-release/browser/base/content/browser.js	2013-06-07 00:39:16.114862388 -0300
+@@ -3559,10 +3559,12 @@
+    */
+   recordSearchInHealthReport: function (engine, source) {
+ #ifdef MOZ_SERVICES_HEALTHREPORT
+-    let reporter = Cc["@mozilla.org/datareporting/service;1"]
+    /*let reporter = Cc["@mozilla.org/datareporting/service;1"]
+                      .getService()
+                      .wrappedJSObject
+                      .healthReporter;
+    */
+       return;
+ 
+     // This can happen if the FHR component of the data reporting service is
+     // disabled. This is controlled by a pref that most will never use.
--- a/pkgs/applications/networking/browsers/firefox/system-cairo.patch
+++ b/pkgs/applications/networking/browsers/firefox/system-cairo.patch
@ -0,0 +1,73 @@
+# HG changeset patch
+# From: https://hg.mozilla.org/mozilla-central/rev/52b02042b27f
+# User Connor Behan <connor.behan@gmail.com>
+# Date 1370038985 -7200
+# Node ID 52b02042b27f75acbcb2bd4822bedb00ab680e67
+# Parent  08ed531fed70978385cf9253bbc8389b0abe76ca
+Bug 722975: Unbreak builds using --with-system-cairo. r=bas
+
+diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
+--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
+@@ -548,23 +548,31 @@ struct SourceSurfaceUserData
+   BackendType mBackendType;
+ };
+ 
+ void SourceBufferDestroy(void *srcSurfUD)
+ {
+   delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
+ }
+ 
+#if MOZ_TREE_CAIRO
+ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+ {
+   gfxImageSurface* origSurf =
+     static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
+ 
+   origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
+#else
+void SourceSnapshotDetached(void *nullSurf)
+{
+  gfxImageSurface* origSurf = static_cast<gfxImageSurface*>(nullSurf);
+  origSurf->SetData(&kSourceSurface, NULL, NULL);
+}
+#endif
+ 
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+ {
+   void *userData = aSurface->GetData(&kSourceSurface);
+ 
+   if (userData) {
+     SourceSurfaceUserData *surf = static_cast<SourceSurfaceUserData*>(userData);
+@@ -667,24 +675,28 @@ gfxPlatform::GetSourceSurfaceForSurface(
+       }
+ 
+       srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(),
+                                                            imgSurface->Stride(),
+                                                            size, format);
+ 
+     }
+ 
+#if MOZ_TREE_CAIRO
+     cairo_surface_t *nullSurf =
+ 	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+     cairo_surface_set_user_data(nullSurf,
+                                 &kSourceSurface,
+                                 imgSurface,
+                                 NULL);
+     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+     cairo_surface_destroy(nullSurf);
+#else
+    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", (const unsigned char*) "data", 4, SourceSnapshotDetached, imgSurface.get());
+#endif
+   }
+ 
+   SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
+   srcSurfUD->mBackendType = aTarget->GetType();
+   srcSurfUD->mSrcSurface = srcBuffer;
+   aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy);
+ 
+   return srcBuffer;
+
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@ -0,0 +1,15 @@
+{ stdenv, fetchurl, openssl, lua, pcre }:
+
+stdenv.mkDerivation rec {
+  name = "imapfilter-2.5.4";
+  
+  src = fetchurl {
+    url = "https://github.com/lefcha/imapfilter/archive/v2.5.4.tar.gz";
+    sha256 = "e5a9ee0e57e16d02ff2cbb37b67202a514121d2eb7fc63863174644ca8248769";
+  };
+
+  makeFlagsArray = "PREFIX=$(out)";
+  
+  propagatedBuildInputs = [ openssl pcre lua ];
+}
+
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@ -0,0 +1,33 @@
+{stdenv, fetchurl, openssl, pkgconfig
+, withPerl ? false, perl
+, withPython ? false, python3
+, withTcl ? false, tcl
+, withCyrus ? true, cyrus_sasl
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "znc-1.0";
+  src = fetchurl {
+    url = "http://znc.in/releases/${name}.tar.gz";
+    sha256 = "0ah6890ngvj97kah3x7fd8yzi6dpdgrxw1b2skj2cyv98bd3jmd8";
+  };
+
+  buildInputs = [ openssl pkgconfig ]
+    ++ optional withPerl perl
+    ++ optional withPython python3
+    ++ optional withTcl tcl
+    ++ optional withCyrus cyrus_sasl;
+
+  configureFlags = optionalString withPerl "--enable-perl "
+    + optionalString withPython "--enable-python "
+    + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
+    + optionalString withCyrus "--enable-cyrus ";
+
+  meta = {
+    description = "Advanced IRC bouncer";
+    homepage = http://wiki.znc.in/ZNC;
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    license = "ASL2.0";
+  };
+}
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@ -23,7 +23,7 @@ rec {
    sha256 = sourceInfo.hash;
  };

-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.baseName}-${sourceInfo.version}";
  inherit buildInputs;

  /* doConfigure should be removed if not needed */
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@ -2,21 +2,22 @@
 # nettools needed for hostname

 let
-  name = "Isabelle2012";
+  dirname = "Isabelle2013";
  theories = ["HOL" "FOL" "ZF"];
 in

 stdenv.mkDerivation {
-  inherit name theories;
+  name = "isabelle-2013";
+  inherit dirname theories;

  src = fetchurl {
-    url = http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz;
-    sha256 = "1w2k5cg0d9hyigax0hwp6d84jnylb13ysk4x5kwl2412xryravxq";
+    url = http://isabelle.in.tum.de/dist/Isabelle2013_linux.tar.gz;
+    sha256 = "0l17s41hwzma0q2glpxrzic8i6mqd9b7awlpwhz0jkli7fj6ny7b";
  };

  buildInputs = [ perl polyml nettools ];

-  sourceRoot = name;
+  sourceRoot = dirname;

  patches = [ ./settings.patch ];

@ -40,8 +41,8 @@ stdenv.mkDerivation {

  installPhase = ''
    mkdir -p $out/bin
-    mv $TMP/$name $out
-    cd $out/$name
+    mv $TMP/$dirname $out
+    cd $out/$dirname
    bin/isabelle install -p $out/bin
  '';

--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@ -23,7 +23,7 @@ rec {
    sha256 = sourceInfo.hash;
  };

-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.baseName}-${sourceInfo.version}";
  inherit buildInputs;

  phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"];
--- a/pkgs/applications/science/logic/otter/default.nix
+++ b/pkgs/applications/science/logic/otter/default.nix
@ -12,7 +12,7 @@ let
  ];
 in
 stdenv.mkDerivation {
-  inherit (s) name version;
+  name = "${s.name}-${s.version}";
  inherit buildInputs;
  src = fetchurl {
    inherit (s) url sha256;
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl}:

 stdenv.mkDerivation {
-  name = "prover9";
+  name = "prover9-2009-11a";

  src = fetchurl {
    url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz;
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@ -0,0 +1,49 @@
+{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }:
+
+stdenv.mkDerivation rec {
+  name = "cgit-0.9.2";
+
+  src = fetchurl {
+    url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
+    sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08";
+  };
+
+  # cgit is is tightly coupled with git and needs a git source tree to build.
+  # The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version.
+  # IMPORTANT: Remember to check which git version cgit needs on every version
+  # bump.
+  gitSrc = fetchurl {
+    url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz;
+    sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi";
+  };
+
+  buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ];
+
+  # Give cgit a git source tree and pass configuration parameters (as make
+  # variables).
+  preBuild = ''
+    mkdir -p git
+    tar --strip-components=1 -xf "$gitSrc" -C git
+
+    makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/")
+  '';
+
+  # Install manpage.
+  postInstall = ''
+    # xmllint fails:
+    #make install-man
+
+    # bypassing xmllint works:
+    a2x --no-xmllint -f manpage cgitrc.5.txt
+    mkdir -p "$out/share/man/man5"
+    cp cgitrc.5 "$out/share/man/man5"
+  '';
+
+  meta = {
+    homepage = http://git.zx2c4.com/cgit/about/;
+    description = "Web frontend for git repositories";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
+  };
+}
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -42,17 +42,7 @@ rec {
    sendEmailSupport = !stdenv.isDarwin;
  });

-  gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl perl which ikiwiki curl bup git gnupg1 lsof openssh rsync;
-    inherit (haskellPackages) ghc aeson async blazeBuilder bloomfilter
-      caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dns
-      editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
-      hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
-      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;
-  };
+  gitAnnex = pkgs.haskellPackages.gitAnnex;

  qgit = import ./qgit {
    inherit fetchurl stdenv;
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -1,73 +1,57 @@
-{ stdenv, fetchurl, perl, which, ikiwiki, ghc, aeson, async, blazeBuilder
-, bloomfilter, bup, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
-, dataenc, DAV, dbus, dns, editDistance, extensibleExceptions, filepath, git
-, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, httpConduit, httpTypes, HUnit
-, IfElse, json, liftedBase, lsof, MissingH, monadControl, mtl, network
-, 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, regexTdfa
+{ cabal, aeson, async, blazeBuilder, bloomfilter, bup
+, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
+, dataenc, DAV, dbus, dlist, dns, editDistance
+, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet
+, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit
+, IfElse, json, lsof, MissingH, MonadCatchIOTransformers
+, monadControl, mtl, network, networkInfo, networkMulticast
+, networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa
+, rsync, SafeSemaphore, SHA, stm, text, time, transformers
+, unixCompat, utf8String, uuid, wai, waiLogger, warp, xmlConduit
+, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic
 }:

-let
-  version = "4.20130521";
-in
-stdenv.mkDerivation {
-  name = "git-annex-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/joeyh/git-annex/tarball/${version}";
-    sha256 = "0wa3sgw0xbqykl5r6ba0gannwj61y0h024glm0xjj97fy06b77i0";
-    name = "git-annex-${version}.tar.gz";
-  };
-
-  buildInputs = [ ghc aeson async blazeBuilder bloomfilter bup ikiwiki
-    caseInsensitive clientsession cryptoApi curl dataDefault dataenc DAV dbus
-    dns editDistance extensibleExceptions filepath git gnupg1 gnutls hamlet
-    hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase
-    lsof MissingH monadControl mtl network 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 which perl regexTdfa ];
-
-  configurePhase = ''
-    makeFlagsArray=( PREFIX=$out CABAL=./Setup )
-    patchShebangs .
-    ghc -O2 --make Setup
-    ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -f-webapp -fassistant -fdbus -finotify -fwebdav -fs3
-  '';
-
-  doCheck = true;
+cabal.mkDerivation (self: {
+  pname = "git-annex";
+  version = "4.20130601";
+  sha256 = "0l6jbi9r26w5h9hfg9v9qybqvijp4n7c9l1zd4ikxg2nqcc8j8ln";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson async blazeBuilder bloomfilter caseInsensitive clientsession
+    cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance
+    extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger
+    HTTP httpConduit httpTypes HUnit IfElse json MissingH
+    MonadCatchIOTransformers monadControl mtl network networkInfo
+    networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
+    SafeSemaphore SHA stm text time transformers unixCompat utf8String
+    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault
+    yesodForm yesodStatic
+  ];
+  buildTools = [ bup curl git gnupg1 lsof openssh rsync ];
+  configureFlags = "-fS3
+                    -fWebDAV
+                    -fInotify
+                    -fDbus
+                    -f-Assistant
+                    -f-Webapp
+                    -fPairing
+                    -fXMPP
+                    -fDNS
+                    -fProduction
+                    -fTDFA";
+  preConfigure = "patchShebangs .";
  checkPhase = ''
    export HOME="$NIX_BUILD_TOP/tmp"
    mkdir "$HOME"
+    cp dist/build/git-annex/git-annex git-annex
    ./git-annex test
  '';
-
  meta = {
    homepage = "http://git-annex.branchable.com/";
-    description = "Manage files with git without checking them into git";
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    longDescription = ''
-      Git-annex allows managing files with git, without checking the
-      file contents into git. While that may seem paradoxical, it is
-      useful when dealing with files larger than git can currently
-      easily handle, whether due to limitations in memory, checksumming
-      time, or disk space.
-
-      Even without file content tracking, being able to manage files
-      with git, move files around and delete files with versioned
-      directory trees, and use branches and distributed clones, are all
-      very handy reasons to use git. And annexed files can co-exist in
-      the same git repository with regularly versioned files, which is
-      convenient for maintaining documents, Makefiles, etc that are
-      associated with annexed files but that benefit from full revision
-      control.
-    '';
-
-    platforms = ghc.meta.platforms;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    description = "manage files with git, without checking their contents into git";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
  };
-}
+})
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
@ -1,7 +1,7 @@
 { fetchgit, stdenv, perl }:

 stdenv.mkDerivation {
-  name = "git2cl";
+  name = "git2cl-20080827";

  src = fetchgit {
    url = "git://repo.or.cz/git2cl.git";
--- a/pkgs/applications/video/kdenlive/default.nix
+++ b/pkgs/applications/video/kdenlive/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon
 , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano
-, pkgconfig, shared_desktop_ontologies }:
+, pkgconfig, shared_desktop_ontologies, libv4l }:

 stdenv.mkDerivation rec {
  name = "kdenlive-${version}";
@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
    sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x";
  };

-  buildInputs = 
+  buildInputs =
    [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz
-      qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies
+      qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies libv4l
    ];

+  enableParallelBuilding = true;
+
  meta = {
    description = "Free and open source video editor";
    license = "GPLv2+";
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@ -12,6 +12,7 @@ let
  sourceInfo = rec {
    url="http://www.i18nguy.com/unicode/andagii.zip";
    name="andagii";
+    version="1.0.2";
    hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1";
  };
 in
@ -21,7 +22,7 @@ rec {
    sha256 = sourceInfo.hash;
  };

-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.name}-${sourceInfo.version}";
  inherit buildInputs;

  /* doConfigure should be removed if not needed */
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@ -22,7 +22,7 @@ rec {
    sha256 = sourceInfo.hash;
  };

-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.name}-${sourceInfo.version}";
  inherit buildInputs;

  phaseNames = ["doUnpack" "installFonts"];
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt48 }:

 let
-  release = "4.10.3";
+  release = "4.10.4";

  # Need callPackageOrig to avoid infinite cycle
  kde = callPackageOrig ./kde-package {
--- a/pkgs/desktops/kde-4.10/kde-package/4.10.3.nix
+++ b/pkgs/desktops/kde-4.10/kde-package/4.10.3.nix
@ -1,399 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="0y8481jrb4bklwrcadska1rdqrbbknml6i9gcvkp8sibjnj0hz7y";}
-  {name="ark";value="0y4adimbsax8g5q9nffd22icskxpjcqhr4ws2p1857znlxxc9prh";}
-  {name="audiocd-kio";value="1pwfdb989yf5kjni8y2irzys8qdcw9ipwszmds7ss9ycdv1mc9p7";}
-  {name="blinken";value="1scywjdj6sjlzwbpxnarik3wypw7f6fcdmcgiql1sa1df1bdbh41";}
-  {name="bomber";value="0jxl93adfv3pf2xkkazh1yfkiixz49yhbg9kblnav44np9wydpzk";}
-  {name="bovo";value="0plm0g75qyx6lgdmzaml650nm7v1kjss5cq1v4dpmicahw9mgqfd";}
-  {name="cantor";value="05rd4jm5w9l4i16qrx5vqrszk666gzvmndn9w4f80jgzdsal0h45";}
-  {name="dragon";value="0xmxjicj8bg43d7mlmw5hwl5mqn9r2xm9kqh47cmlili9g90hklx";}
-  {name="ffmpegthumbs";value="0i4qbfa954qsirpq6ywwspfi7y26j8jkrx4x7h73ywqmilbw7gab";}
-  {name="filelight";value="0p840l6nw9hm25ndcr87g9pykhajzj99kzdqbirwancgj77rgn14";}
-  {name="granatier";value="0b50dnyvq0qgldg9jp9dsig0yh7xmmbfbza3vv6b0bwr8i7q3zcd";}
-  {name="gwenview";value="199yafvaz9bgd6wg49n9l5f90bvq61z0pc46h4p3fpfp0lp66r6p";}
-  {name="jovie";value="1fay1czn7s9412gh8dda889bcxcphclj66xd1snmxyq80avpyilr";}
-  {name="juk";value="0k9b745kqa3w3lzwibrh9aawpd1xdzqv6mf6ik9yy3r25wkj22sy";}
-  {name="kaccessible";value="13391w38l3k7b4il3spsrzniwiw1hq7lhqsl1wl2zfigz47hv288";}
-  {name="kactivities";value="00fdnw2rwpk8q6xgydwshawl23l76igdr6v8p69d5fmaj93nbqb8";}
-  {name="kajongg";value="1pkdjc54ydzxlbjp63s2cz5fzg56isrjyym0wlgiqlhgiqjf48qn";}
-  {name="kalgebra";value="09gsbn4aj4i52q670ginj0n2y26iqnsh12sh09642g9jkhdmigik";}
-  {name="kalzium";value="0rd3yz0q0158m158n20qmd9h0xmrc53wnhjc7g17lj2l605svkkv";}
-  {name="kamera";value="1s9znmi6ka8r2wyylp9pwlv3pg313yzc0k3j50c18c529nbx1dsx";}
-  {name="kanagram";value="0jxjz4zz7vivqdpm9c4lvi2pgvf5v16fhn0np8sdzaiv7rj2sl3j";}
-  {name="kapman";value="0f6nd2f56qy1c704451lxz57fzlnxry5njbid80wn8rv6c9c6m6k";}
-  {name="kate";value="07nchlm93860rwwbcllcj92w7p8dx06dimc6vclgn640d19j3ac2";}
-  {name="katomic";value="053l57z8l68r4vrrcj3rh4gn36f9qcqwysk0k34lh0szaii81qjw";}
-  {name="kblackbox";value="0lr7k2d0ml2aqga9md05kddm9zik7n18b622v57jim54id9i8iyl";}
-  {name="kblocks";value="1fylcrwaziksw2f17nbwmprk5psb5b292qwfc09y2i2ykx734gc8";}
-  {name="kbounce";value="0n7bgcldblmy9123ls5d7cpa7qajhpskpl0nv83n2dyfz4pa70dp";}
-  {name="kbreakout";value="13vjzna3n7m0hnc2glnz931j9pcwwzb4vnyhs6bjszrj422k6r5d";}
-  {name="kbruch";value="00a999gjzgd5cffjrkpdin8y9qqppir591w53yp1layvv080370j";}
-  {name="kcalc";value="0k84r6g0iz30g7ff39kgrcxx1xjnw6p5khzvikj79y9b56sd0g19";}
-  {name="kcharselect";value="0drah7js6r6zl6nii2bmpxhxzn78y04sqj013bzyblskqibxh0zz";}
-  {name="kcolorchooser";value="1crk5dxfxgyh3wz286hd69rhcf0s9jnq5pqcnhgcrsjpfjk9hahs";}
-  {name="kdeadmin";value="1iq93in2wvmqjgz1wqmr0vn9rd1pzdrl202n3qhass0rfm0vsv7w";}
-  {name="kdeartwork";value="0qcypdzyh5pqp70b2m32hqhcnv4gwpyawdhb2nphmgv64v9s2b8z";}
-  {name="kde-baseapps";value="1p2qfghvyi0pglp88p351c6lm54i3ibp7h2yxh27phwdi0j9lbzx";}
-  {name="kde-base-artwork";value="12zgimngxcp96bcw2mffrk6fsy34mbll5pp4blm3c59ya7b50nq1";}
-  {name="kdegraphics-mobipocket";value="1qcddcc5h3108i2xkp4ibjmgg3k0sxyr30i9nkbaawaid66l36lk";}
-  {name="kdegraphics-strigi-analyzer";value="0ixj0gqjdqrwqk0zc3p0kdkd0wg1rwkyxzndq459y8xpnbyn3pvi";}
-  {name="kdegraphics-thumbnailers";value="03pc1ybbnpybp85jc4gn45lr61q5x8yf541qnkap1mrs658f57d1";}
-  {name="kdelibs";value="1vrcawx3w5cdr4yapim0j2zx4lmlcpjg6866wd70bhp6fary1gaz";}
-  {name="kdenetwork";value="1xz57fb3dpllydi4jhbv5z5y710k2fdk1jl516ixihhbjbbr4phg";}
-  {name="kdepim";value="1myznqi7dggxkkd59vil16514biydrvlihksl8b3njfif2f4ifkj";}
-  {name="kdepimlibs";value="0r7qvq0rvkl5a76xq28f56fqd7hfxbin541qw9gniygnlddnhjvq";}
-  {name="kdepim-runtime";value="01cxrf9541fsga5c9fjzarzja2p58vrpwll6gx4dk49hmx1hwvjb";}
-  {name="kdeplasma-addons";value="1s1rxhd8apnww0z4hsawlvib126p3lj0m5jg29kgh4xwbkrwi2qa";}
-  {name="kde-runtime";value="01gjyhvymf0a0ishhdwy6mfvv20sj2b182q1r410miq5zjl3l79n";}
-  {name="kdesdk";value="1y4qxvcgl9zg0cqgaqc77hhpqlrbb6panpicarm766vas3pw78na";}
-  {name="kdetoys";value="0nspyll9if2jk8r2b65z9hahwcawmyhkl3pfi38drxqxzaqkpcq0";}
-  {name="kde-wallpapers";value="1ik0lmkzyml63dgh6inv3qa9wbj3ylk2rjkfafmqc2anzsgpjmxk";}
-  {name="kdewebdev";value="05g308cl6njl5vrnks2jv87xvqwphppfgy9mkgmm7brwkk0n25ny";}
-  {name="kde-workspace";value="17g4zjf6sich990i8s22m54i534p4hyzbbnc2566vv6w74pxnw6q";}
-  {name="kdf";value="1r19lfsxps177nc5ys4mqfa8y43b4rcsj4wiigvry6vmwvxnqy4j";}
-  {name="kdiamond";value="0hd4zn8xyk12idkwjv0h4rlfzdyx0m03i054h99z2ls4vfxixb6v";}
-  {name="kfloppy";value="037gng2bx7lv7zki7n56yxbcqrl4aj4y2zn1milm5dv1r33ga4k0";}
-  {name="kfourinline";value="1aav3b4snqj3ah2cwyl02mmvdnk3hsw2wcxbabijkbd2anaijbvg";}
-  {name="kgamma";value="1ccbjbfjljcndz39f1qhjcisbihk8v407hcl3nnwf25sgcvqygiz";}
-  {name="kgeography";value="00dsl70d7w7kfwam39pjwd624zs9fwbwbb8kn7gas3m9kc435drs";}
-  {name="kgoldrunner";value="1r2lrv63ks2c39nzfgc4bj9prlqcd1jqrywahxla6l8fpp299r05";}
-  {name="kgpg";value="1xg1axd8gvcn8w9haywjfi0lk044vi7z3klp2y93rwxdidxjjjji";}
-  {name="khangman";value="1a27n9m9js8j3rn112dg0aqj58qxjs8rb6mylzwi99a6w6jl44ka";}
-  {name="kig";value="1ns3d7lk96lr9l8kipdz92xq0q7q5lpbbqip6f55wcvazb4280r3";}
-  {name="kigo";value="1hbxx8ivwbw7mpkz3hsb5lwci2cxd48kiia4jd2859znjza5hz70";}
-  {name="killbots";value="1idczq2f1g7maxlf0fyc4dpm3f9lbsqgnsyf6j48hm0aicsazmcj";}
-  {name="kimono";value="1a0m6gk25qhx88z7y17154b8i9r9s3ry6zx21mxr7zz42d1ng5by";}
-  {name="kiriki";value="1307xbyxhxzqv294x99712h269p3k3cw34mpq8b5nv0102ig4pwl";}
-  {name="kiten";value="1n27cl8g4r7i60hrwfpc7nl7d118f2kyby0wgbwil6ip5q9ak71w";}
-  {name="kjumpingcube";value="0mw6bns7b9dwf7kbcpk0ilgvqbmak9765wffqhx52ykj7c993x1i";}
-  {name="klettres";value="0ymy4a0172fym2b0pvfgjb07waivb610z7cpnnrdw0qyzxks7131";}
-  {name="klickety";value="1mln3hb97isy2v71bxk0ijbqrlx31s1483ziajnlva7j7mc44pi2";}
-  {name="klines";value="0ylhz4nvwgc0ilgpv1fpf2vgcnypwgd0bslmg1sh2cc3gczxkdx8";}
-  {name="kmag";value="123a329sx3d3h3vk3w4400w5g9nsl6r2c7lv8i8xvcp7xcxixls7";}
-  {name="kmahjongg";value="1ahjdwwglp24a9g75cpq4c9bbqcwl50630ys94za94j5lj4sbrg4";}
-  {name="kmines";value="1pgpfhj5008vckpplmvwngm34wl1m3pz2ig9x12j20rcd0sy0k27";}
-  {name="kmix";value="0qkmnjlscsggmcfkj2xqfawrv2zn56byhzczn94piva28pcxcvps";}
-  {name="kmousetool";value="0khxn5qnzgdjba1d229kqfd3vf5bjdpj8i2zahwynxvgghmmg6cz";}
-  {name="kmouth";value="05wvwkj5xhjn3g5c1shviqfl284zfqf8qbgcc7a980f453sr8bbr";}
-  {name="kmplot";value="0pv41r9bygw895azcnf22r3lfddzf1xplnx1li88038gp9vzrybv";}
-  {name="knavalbattle";value="0hgralml3xhd487zi4gac60738arlb1xi3kzm1vlq7f5vp2dllaj";}
-  {name="knetwalk";value="0r6l3n3jzl3mabjn8v7mk41j5gcbh5xnajngk075vk0v7mp4xasj";}
-  {name="kolf";value="1wfvcz3hy8a9v07qs1427bqxniaai3iv8r63x1ia0sim5j33xlgq";}
-  {name="kollision";value="0g98icgnazlqjbbgcqa4i6gp5zm5wwzab7rd93cf5jvd81g5ymys";}
-  {name="kolourpaint";value="01qccaavpb3fp15ajfrmmimg0mwx8jbmq5gndmd0qrfymqvdwfm2";}
-  {name="konquest";value="0i5jbnm46mj3055d471zfs7j9c2sr6y39a311485mk24yf31pcif";}
-  {name="konsole";value="1kcg2lmnqbamhgik3bpynq8gf4jl78fhlq9ydh1m0vlqwj38vs36";}
-  {name="korundum";value="08bkgqj3r51jsvss517v74ikl7vdrzd15wn5fbcrkz625y8blcv6";}
-  {name="kpat";value="0l41dnjd2smrxjgkldsrscn5550kzaf5byv686f5iavb60nlr36x";}
-  {name="kremotecontrol";value="0p2z0q0l2wdlg5zij053cvimdkijwy949f1k1ma00z8gf881y3ix";}
-  {name="kreversi";value="0w0q11m5n39p80p38p6x3q3xlz19xnd2xnmkvx1zwq2sy8hwc06w";}
-  {name="kross-interpreters";value="1irw7wca7wlvv8ap9ypzn13zvjdijlyzf5mxkikdh23hhbhmmvn5";}
-  {name="kruler";value="0cqlidxwsg08am32nlgxdknzj0iwlg35z786ms6dqxax9rjzqs31";}
-  {name="ksaneplugin";value="0w08r33l5k3dn6vvm0ss49b84ffp04yc0aakx772ywp7shx1fkim";}
-  {name="kscd";value="13f7xb4kp24hq6wyvd7r55002r86fjh2c4sl2p5sh05glscw361f";}
-  {name="kshisen";value="0v6rplsxj8c60p2798w85llvfwdlhc4n6sck3m3kb70h725i3vnw";}
-  {name="ksirk";value="1bppikyznpwfy82bx22wacayrvsbzsqzrckrysmh6w8zadbalmmf";}
-  {name="ksnakeduel";value="09lyviv79ki1qld18854wpkrv6xb1g99jql8x7mfpafhsfqh3x9f";}
-  {name="ksnapshot";value="16qz4rmmx6901jmvc998izdr9q6p5jv5296ynwj3x6hlx4n4h21x";}
-  {name="kspaceduel";value="0nkwpny631fxvgg7h29pdgy8ikdfvynfa7bbn6vpaf56d4n5rj4s";}
-  {name="ksquares";value="0pxcm9i7j0g5cxrij3ir2bbqv5yla5n3m1fxig2qxa084a45d6nb";}
-  {name="kstars";value="01pv6aryk4wknjfh270ynrr3v5j308l3m55ca16f68njfndh7wi1";}
-  {name="ksudoku";value="1cb3ahkvjm2mps11spw1vbrxh2fal16mix5d2kjlayj0pmm6yhvc";}
-  {name="ktimer";value="0lnbzjqj0xbhhaw53z2a0sdfd1i1kzckczbfjy3ab2bg6xwfyb4y";}
-  {name="ktouch";value="08am04nirzh05rdh0mh2xixrd5w04xnnc7r8rfzcxra6s84jlsns";}
-  {name="ktuberling";value="0b206b4whhivhbn41fg0hwidn9m0acs5jfdjnv269x58vh79w7dj";}
-  {name="kturtle";value="1i19ksrac0k65xqj8yhb5n53x4qxj93zanb546gqirrgvhlhh573";}
-  {name="kubrick";value="1s5p1f8b30iqpngkxzkv29qc078nxncqlwlvfyq18gn27zdwcy2g";}
-  {name="kwallet";value="0v6c356ysv9xf6gg3ivlshqsd06rxsmvfcvq4igp7z4l9cz4cdya";}
-  {name="kwordquiz";value="1v061nq5scwgamshpkajq2cgp5dqipa3qlq5xl393kvp89zfl2bp";}
-  {name="libkcddb";value="09s6s779k6lq2pnb4iy4qnny2h8mbiy4w12nvw791gid1670vng7";}
-  {name="libkcompactdisc";value="06mm2im3rllwvrv2ph9smgbjfh2lhm3r3j8gmzikdqhzpyqp2kpc";}
-  {name="libkdcraw";value="0v2ji0jdzqpy54z60gq4p1k7zdw3bdsa0xd711gzbyxh34k5i1dg";}
-  {name="libkdeedu";value="1f8wqc0lfvgych011pg1smxyqsh9vwjhr13wcnmkf35hfwh81vfm";}
-  {name="libkdegames";value="16lz2mj93myl5wr7xyird9kwqml0na9h9c5vnxhig18vqvxs64ca";}
-  {name="libkexiv2";value="1sjpndx5d5w9dllh1f5cjg4z2gl0v827qjnnwnbm1lvps2s1kmm3";}
-  {name="libkipi";value="02ymmx97nbpwbhq786kcxi2cfr8f6vwyicskywv01f0qv4qh5llg";}
-  {name="libkmahjongg";value="0z9ahgfbf6ymbhzg6xcgcrl4qqadc986hi9xx38rcr1v3hm21pld";}
-  {name="libksane";value="17ahz4zm0lh52295nzdjvhafnlfixyi8p1xl9dyan6zwr2hbq9i2";}
-  {name="lskat";value="0qgsfy67pvvg058i1ik4h45d8n4x7npbvbhwcv9p29ar57vg1xd9";}
-  {name="marble";value="0fclzqvda5jjqy0mqbbq1wsb6s3xjbcx6nwzmc72f2ni2qas3yyx";}
-  {name="mplayerthumbs";value="04a8rccs0amgkmvgzqfz01ng13s287gyllppsqhxfr8ndpqdxp06";}
-  {name="nepomuk-core";value="1hj2z2sxghk71cqaz62v7b1lab0c3hh8cb6bb6fm6abg3gcb4z7g";}
-  {name="nepomuk-widgets";value="1w11va7m2665xlm1lgg7jx7qqxkpicr9mblf53vlvssljq96qak0";}
-  {name="okular";value="0lgri7y5zf2hx7zyi8i02i1amqcsn6k7nwbq77cgs2xlmj9kr7dn";}
-  {name="oxygen-icons";value="1wsac10jdxc7ywwm46mdvsxnil7bnzpdrcn3yjjdrkjjsn4kgj1i";}
-  {name="pairs";value="0gfq7cgxs3k2449fa5rdklwamrs5brj23zi19jns6x6mgasnl5ww";}
-  {name="palapeli";value="1grj7bm0im94crjzav3vlgqn9w014n55v6mms51r0issa2lpcblx";}
-  {name="parley";value="0wfcmrgzygz7pwgpsi5wzswk3wnimrxkdhby5jcdpaphwcn7pml2";}
-  {name="perlkde";value="0l3bz1l2s5p7kq785a9yvgnr28xlq2sddd7kzdbwahb0jrbhbyra";}
-  {name="perlqt";value="0j1a38qm3iqgdxx28flaam8v49r7l4lwg89by3vqsymc9bd787r8";}
-  {name="picmi";value="0p18667nybyr41b3n55s0862vvnhy1fw3gm7n0xa6r57dlkcsxjs";}
-  {name="print-manager";value="18scysv26jrzm36wrhjcad7qrf98hy2yq3b14j5ra1vdnr1n8nkk";}
-  {name="pykde4";value="1zq4xivx4xiwkdpz54llahjvfvx89bpf09jr275mj1rxayl2plma";}
-  {name="qtruby";value="0rbkqdvn36bgac6zv552jpgh8np6mf90hckf8g07npbf4sirgawa";}
-  {name="qyoto";value="0zbf7mpabazqwqh8g1dkg41bp06mvk9pcfh5m2br95wixcd6hv4g";}
-  {name="rocs";value="1ia1qfnhdic9py12nycp8v5lpyr6py4x5vvmj51b5w7h1m841dnd";}
-  {name="smokegen";value="1ybpxhh9fldzxha9307x8dq45zizqlj3cjwap3b4j4darvmsm0ky";}
-  {name="smokekde";value="1r0vq064afr6ih0is90wlidl0pxllk00hrzsqy5hgvr5c2yhaynk";}
-  {name="smokeqt";value="0df2js5k9vwzakcix06k1sprsrm1jl6fgnpsxs9r05a3mkkdl37q";}
-  {name="step";value="1dgqfycsf0d2fzrlkpw9d2s6aw11ik4cv9m37xdaciw1qkfjc6w2";}
-  {name="superkaramba";value="0mrk1vipxh65r9gwys89y1iacb7423mqx031abpry78jsa4prc4d";}
-  {name="svgpart";value="0bkbp7qd6xq3fdsn68r74a92r7pw97v494h78w4vrc06xx4v912w";}
-  {name="sweeper";value="1azvnv32r2fg8ha0ly3bkp2xc3s4kdvyyj9vl0p8az1q86x0z3jj";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-#had to add fake pkgs to kdesdk to get it to be treated like a split module
-{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
--- a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
+++ b/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
@ -0,0 +1,399 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="1ikja551kp2i4x6mw64i12yf84vx0g5rfmqcq93lj2z4gii17nlq";}
+  {name="ark";value="06ymghs1rflhij7skw3hnk2w8kjmmaigh31raq690vbnpa9w8isb";}
+  {name="audiocd-kio";value="1pxza8v5gb34hzbky5jwm2fw3b4bynpzcrggw6vvhnb0gqrfm7x6";}
+  {name="blinken";value="12rl2jl91mkvls7lh38hxxc8qfrw9lq56syb2k5v81x0gxzgz7gx";}
+  {name="bomber";value="13qi8q3jyk9dn2pnljrgh00qp5k4dimdfj5z8r6gb05cvzn1g5zw";}
+  {name="bovo";value="1j180rm5wr1yy2wn76g3s6v7hl54rhahna32lll8dv9srrpqry12";}
+  {name="cantor";value="1406bkky7pglck0vad9id02w5gyfcva9slmy5gb06iwi9rcvl13y";}
+  {name="dragon";value="1zc14x60rcmgiim5wlss0pva1mc89r00xasic55zkb9w1xl2ymrd";}
+  {name="ffmpegthumbs";value="03hyypzdaf1v7hczbmhnkw3fc1va1mfmhl3kdzm40cak2wf3fd89";}
+  {name="filelight";value="0snjk95jmw3f5v21jwld8ywxpa65zayq9n9bsryipg5i7swa9ylk";}
+  {name="granatier";value="0qsxgs11caccz695a7lcrhrm3awdm390fa1hmxs6ijrfj9wx3qkf";}
+  {name="gwenview";value="0b00cvgh1f6abj9ijg32yk1l8mfb0ph5iwqnbwj86z95v0i9kwhl";}
+  {name="jovie";value="0g07d9zdfjpscc8y4nhfsy869iy2h4vin7inlfk59jih4zbh2yss";}
+  {name="juk";value="01nxn50nxdkg87fljiz7y6s02wxbbbifv84p8hp1rswi5mx929a4";}
+  {name="kaccessible";value="0biygax3c5hcqhfgmggn3gbg4skhr75bix8swdj1mp8ypbk7cwn5";}
+  {name="kactivities";value="07f38qxbd1ads5v912759da6b6hxq9jhiphjlq7ja04130h5425l";}
+  {name="kajongg";value="0mp329yqxjvi4rzfam0dxjx0gacpgvzcnd5dbbw43f0bdi28r6xg";}
+  {name="kalgebra";value="139n44rvxdhph1bpvj8x83d4qslhjqwxpw09pj76qskdda0bw1ga";}
+  {name="kalzium";value="0j5dhaffvi825jbgr4vbi3k4ykk7ha8gv2sas1garqfrqbc30p7n";}
+  {name="kamera";value="06ny4af8071bd22kgvfx0vw37arvzmv0vimci17glp1v37qfafl5";}
+  {name="kanagram";value="1nzchi9sjphkh1rsg42jfn2xia9fcjcwihkgan01wd82hrim34bd";}
+  {name="kapman";value="1hgifdlzhrxabn4ywpxmwqikfms8ihnjz0dwbrfwdji84aij9kxf";}
+  {name="kate";value="0m9j7a42vzkdzhcd7hhvswyi7rwvicnb9wjs5ff01lg7zdnbyqxx";}
+  {name="katomic";value="1fj06n77krwyxvjmqwbhfsmi6vii36smifrpzd0yd1f0g3yihiaf";}
+  {name="kblackbox";value="1irnlwagxsik35n6zkdg6vqvydvhka3yq6p3najdav1hbs7liav6";}
+  {name="kblocks";value="0b5n3sil6llnryfns5cff07ckids65pz99swkkcgpalpqvhg5xva";}
+  {name="kbounce";value="0mqaxkgnylirrcip70b330q56c4j31pb2f7c5j65gvzxlk7n1kh9";}
+  {name="kbreakout";value="1c4ycncf21br0ywdbx91gia62k5kkrgnaj38qclfljhzqx83pr3q";}
+  {name="kbruch";value="143wfqjpnwcd51zr14mgn2ak38szbr24k1phv5lmlc3whgz7q15v";}
+  {name="kcalc";value="18jcr6mzasrbs4zbilxhqdsb03965bzm30f74clh5czsyv8s5129";}
+  {name="kcharselect";value="0hj9ax570qpgkj666qab6bdnz0irzlzynsq28dw64sdmjcxs28k4";}
+  {name="kcolorchooser";value="00pr0sgq8s008lc0a22nmavsqap8dk00y6wd56a8zv2fpnrys5gn";}
+  {name="kdeadmin";value="1m5svs6wq393i2ja2z8vivbiw05z41r8nq07j0qypcgzm8a801ks";}
+  {name="kdeartwork";value="1ax5m70zb8jfil2llia5ph8ykz3xm1xnz0irp5ivp69hixnrrp09";}
+  {name="kde-baseapps";value="067a2s8kw26yjsm8lmn9xg3nw80yyfbkz2x96pj4qx1qxv4qviil";}
+  {name="kde-base-artwork";value="0rjxk5qbr15vi4vrd2x9ypqpbam3jbgiylzgk3bx5v367ldrrsbs";}
+  {name="kdegraphics-mobipocket";value="0fky12546bywjng8vab4nr7ih3zrmskp6kz49hqqbhpcxrnlihpf";}
+  {name="kdegraphics-strigi-analyzer";value="0g2zf9fmn6720j29pxsq9hw424p1p1pgz4smz1gb8casfrpc2mqa";}
+  {name="kdegraphics-thumbnailers";value="19nplbwhv0mdg6iawwm8vbmincccyabq9k8ywd8icr8vgj4ikvd4";}
+  {name="kdelibs";value="08249hp7q8ck1sgihia1idxllp7qb85xw9xv21snhccgdv3p1rd1";}
+  {name="kdenetwork";value="1fm9f7nln3735frlcrqvwpg10b31dgr4gf6xiyq068sixh4cv0g6";}
+  {name="kdepim";value="0v9mp548nbqvd03krq6z1djsvr5a6p21bz5dspqy6kp6xymblwzz";}
+  {name="kdepimlibs";value="09p60h7m41495664ijab33dc5n64spynnjqay1allx0mcldqnapq";}
+  {name="kdepim-runtime";value="1d47byk057jdgyvzjyhv7px39dl6qcg26i5r12p3q8y2lslnz5wr";}
+  {name="kdeplasma-addons";value="001yfb324wb7fpi57dz6rnnbjrip9n14bxa7yv20fpq8i6ngv8hl";}
+  {name="kde-runtime";value="065jhs3ajg3c6k25g5cwbxpp6wxmrd6qg0aza3lxfm87fb1v255n";}
+  {name="kdesdk";value="1bvmfaddvpgh5kx4nv4c3z33bka6m7wlsw1nzyip9gw1ghac6a2s";}
+  {name="kdetoys";value="1frkz6k7q99y2nn0j2xw00zsq4dbsmwyvq7jbh7y4wyzanbyxh0f";}
+  {name="kde-wallpapers";value="0gspx1xld9da4ppcgr20rvkbhy3jh4yqjzfvhsfi1qhh61jgfcks";}
+  {name="kdewebdev";value="178sq7r584qlkphzwdqhkjaq2h87vjjghq3ialmahzsas3qihkbs";}
+  {name="kde-workspace";value="1l927wa1qlj0vcahqb0h8vx23fyg9nwv07lmacb7igpv56ccgfam";}
+  {name="kdf";value="18b623q0p3sh5y69i6likknh90h85imgr2glddsjz4p38f575kis";}
+  {name="kdiamond";value="0smq3333k5qiny3663yj9h8j0smgybjxr0qpf2m139amr45qcyn4";}
+  {name="kfloppy";value="0xv1nsnv105b9dr2vdlns1vwq25963fgl130lhg31dafkiyn3ivr";}
+  {name="kfourinline";value="0d721glmhjp9dr6y60gv299jnjf96n8rkws759kizlq2x3ggn1gx";}
+  {name="kgamma";value="1hmw7pbsxclws57saha7s253172b61lvqxcqp2vpgvdgjdrraik5";}
+  {name="kgeography";value="1vnrm7rva467z582qppqryz0671b1bcmgxcxlc2f223kp9g0k8d5";}
+  {name="kgoldrunner";value="1d2sl02c2ys6vnxxy1rh9lsz3aj5rlzjmpx39dbvap5qqjsan58b";}
+  {name="kgpg";value="0k1ni2xb4p5p5r8vmnpxm77jqa4176apy7047dxc3w3v0qgqvj9n";}
+  {name="khangman";value="0bq0bdrx761fyaxfv43sfq68hfcwzhvagxm66jzk4wzd6pb1m6ky";}
+  {name="kig";value="0jmax8a357iqa3nggpmpbzk9vdnisdmilyqxgkrd1n43cs4cbc9h";}
+  {name="kigo";value="029xn39sxp2dpj8isq1gmis1858iya0bc758jy8d1rq4c046zmxj";}
+  {name="killbots";value="0arvfbzsax61nn3hz8nk82l3in802866fqsxhz2zrwh03dbrl30i";}
+  {name="kimono";value="1ic2xbgd8xwadrvc7qfq1ihkpnh4dx2pjrm5zbjgycyfvsmvl6sh";}
+  {name="kiriki";value="1dp1dp8s4r4501ldn0v5phkk3fj2kfrncz6h4pfylx27lhpbjbn0";}
+  {name="kiten";value="0jd17nvk6vqniqs8rzmzsnc5hr05i3fwmmvf44g35gpqmr88kb5b";}
+  {name="kjumpingcube";value="0z6a8iaprdaqpif054a6glbgcgwaxm2w4i1r9077k91nnsnwrmp3";}
+  {name="klettres";value="10jc56ll0cgaqkb2xf1gh0k75l90al046syj2q2dqsnaa7lazxp7";}
+  {name="klickety";value="0afb8llrx30zajsy2k0i22xf8ll9lrlmwzrqn4qq7s9wxzwy291v";}
+  {name="klines";value="0mkwb4d60zxalv0asw4qnvml6jf153ghzqcxgbac40nhzl2abdyz";}
+  {name="kmag";value="0pjq6nax82x3ldknld25xrx4adc2i7jcy0x4l343m83f5c79xyn6";}
+  {name="kmahjongg";value="1sx8yplpc70z1vdp9j1shmhc8cqbwmshdhl23hxpl1jydd36q1wj";}
+  {name="kmines";value="0qpcnp0hfhwybqfxgqvbwhin8lb50gca2kwvms10cayqmjafj9j8";}
+  {name="kmix";value="1k67gygq1j13p8nxk50n9q01yfkrv0safvxrbq5f70yvka1jdyj7";}
+  {name="kmousetool";value="17sylfp5zicq36c812jy9h6s4qprwwad05zbbj9701ax40iwrvlr";}
+  {name="kmouth";value="1bpqq919rzcaaqxp3md4w1lrhf5mxfjp07z5v7ii8mgji8wrq1g5";}
+  {name="kmplot";value="0dhdpx79klqc5xb9h4dcgriqivppcrw2ib2piqbqs882mi3pdzx2";}
+  {name="knavalbattle";value="07x4vh2h0d62kwwai5j0d6a2zf615y4mp3iacp5rz8j9pdkhqn52";}
+  {name="knetwalk";value="151cj33kfyjf5xxgw0q00l5jbvx5kb893y2mv9ydc9xmwgcd4szz";}
+  {name="kolf";value="1ibrf01vzpr5dyy2hjb6jq6i9hk7w4kw1iffkyh6w5z40nphs2dx";}
+  {name="kollision";value="1fgs793v36j27z76ik50wz466r3wrga5pq8ibqy3cinvh7blk7cb";}
+  {name="kolourpaint";value="1wxja4xd3jhxib2vpa5289f80hfcd2idpvzz4ap71ca0bzkvknq3";}
+  {name="konquest";value="0aga5yzv5jqbgzp6dp11mgjvfjzrs4csaa5pppwbld81573vldmp";}
+  {name="konsole";value="0kvv4ccc76swxzsw3z7dis8lbmnf6mbzj4b0n9l4zcmmw2iphvd4";}
+  {name="korundum";value="03djf01c6rm76dzswnlccwr81p5qyzccv2zxmbycclp8lp6w4vgg";}
+  {name="kpat";value="1vlyya0yiizrd9c1d4pl1dn6nw7g14rzvwhny12qls7ssrj40zzc";}
+  {name="kremotecontrol";value="0i6jz6m2a2ff97hkqpjy2qhdagx82jwcsnafl2cv0kddszxdabni";}
+  {name="kreversi";value="0ci6aampxq6l6sc8m8gxqrzhws56fbhp2xil0qzgab93xn7mmp1c";}
+  {name="kross-interpreters";value="1iypzm9rwszw1walylq6fa16s4hw84zqpyvmd7aik2dz59fmmvlx";}
+  {name="kruler";value="0841j4001v7497xa6nzdlprnhx8whp0rq24z2yblqnjf1wi5d07y";}
+  {name="ksaneplugin";value="10x1shs2cfa4331qymwafpm3hm45n3aqrhiriyl7vsnk1cc2agin";}
+  {name="kscd";value="0ih7zwyvrgsfd4sqj1g5m5hv71sqdzfhmfn6p3crdnnssbvnfhzd";}
+  {name="kshisen";value="1pxqz390mr066kni1gxa0jay00mgm1r0dmxydrg6mbfyw4qqw554";}
+  {name="ksirk";value="0rf5hj19bfc8mgm810rwvj1173nk93npgbsd17vsj1rqskdi57zy";}
+  {name="ksnakeduel";value="0q02nbcl71h6kqs3mdgq51g4y66p5p62mm70j55cfwjq70i8abbw";}
+  {name="ksnapshot";value="1rlq34j5ay3vyp1vpxxfpzyap26dcwg4ii10ql5bl28z2m1xv8ba";}
+  {name="kspaceduel";value="1nhxcmrn42gfkifxfikldha9045ffq5xzbb95wwvwp478jcqi4xk";}
+  {name="ksquares";value="06kxr8v70ygk2bwcvnfp4l4kjj3yhm5f5wgmzfww8h7kxg87lhg7";}
+  {name="kstars";value="0hhi2vfvv5dzr82gg2p34nsclis0hswkgvh9q21zg2nj2g4byblh";}
+  {name="ksudoku";value="1jglf83shv3p3kn71i0lbga9mil54cs2m4xr0dd113961c2fnylf";}
+  {name="ktimer";value="0kqavcxrxly15az0h0yn8cn6mksvka12yc8fywr029drnr70hs0i";}
+  {name="ktouch";value="1b8612a6pcsaamdq9hpkxr71vvmd0mxrnb0hl8iy05q61cv71i0b";}
+  {name="ktuberling";value="1zqzs86ricqwvj6ragxj4rxhddr92a34z8jwdp7qqqjdafzq57c8";}
+  {name="kturtle";value="0nslszpkacbdwsq8l2phzls5qbfm76r32yiynnd35qjfh94dpilf";}
+  {name="kubrick";value="1qlysx8kvz6r80rm0szq7pk007d57ddv77qy7d3gmpijwa9giybj";}
+  {name="kwallet";value="1pw7wgfjfa553kdc8z91amg18zhr5c51nhklr7kpqgp1yj0hwp6a";}
+  {name="kwordquiz";value="016l2yv461w6liqnkszprlr22nyyy7wi9f3fqblqq5xbps8wr6b4";}
+  {name="libkcddb";value="0qjdxxwj0hw6ykya6npfq2kp21sspwxf79pklz3w7q3gnl98rlbb";}
+  {name="libkcompactdisc";value="1jql8hqsb5jl73c22ssv0ddmhipjpgqxhwnyw362djdxifvrybhi";}
+  {name="libkdcraw";value="0w9h9a69wz7m0hg486jcw7vxkzrr3nfjkgqgr40i3cmxpnnjjvp9";}
+  {name="libkdeedu";value="0ai6vr33wcphimgbznmi8arh9fa9xpcpkjq8hq07svdgmbxjd44m";}
+  {name="libkdegames";value="0ifpxwpfh79gh5qs8wl0i951kab3ppmri0h99hi0idj96xhkznpf";}
+  {name="libkexiv2";value="1w9k4c38ziyfnh9byjszg6aw1mbjii06ladgiwx1q397layd7qhx";}
+  {name="libkipi";value="1a4kqhsvpcly6mlr9w8g8gb2wyyrfbi89pwb3i1ky3w9wxk87pi4";}
+  {name="libkmahjongg";value="1rr5z04af5kswcn6pjpd9ryp1zwp3znhwb97xgvppni88cwawyff";}
+  {name="libksane";value="1sv0ba5p0m8d621vykhayblk6lsys4c80474b7d7vgh9xbcxhhgc";}
+  {name="lskat";value="0bimy8wng95mpkssssmfm2779qyjsw5f1i9wh695k0jq6j25dscy";}
+  {name="marble";value="1z90p25fgvwg35pxap1yd3k2i2qrsv9d2057lixv03ymbj0l93aq";}
+  {name="mplayerthumbs";value="1m83pglqgi6dwbbnm4djybki11f2s6q2lhbqa6v1kq12133fhkc4";}
+  {name="nepomuk-core";value="14sfvizfwnarcidmj74v1rsix85sn9hvs6wm4xnyv7d4xw7mgqv3";}
+  {name="nepomuk-widgets";value="02wm1ghsf8mxv24y1d1b5j4nq8jwi6dwlbzlqdl2hhjqxfc60sxw";}
+  {name="okular";value="15aydihdfd5hzkgchxi2xpfy96bm90jcn07lmmp5xcdng3jj520h";}
+  {name="oxygen-icons";value="0rwdp44nkigs0v449l90mjw7ngs21a0jx17biascjhq1kxrh0vmp";}
+  {name="pairs";value="009qpwhy64xfad4ch4l4dh5dn5cj9g9jg0b3384k6wjvx6k61fqq";}
+  {name="palapeli";value="0g03r8f1z2jxyh2hl6l21s292240d2dbcqi0lndjyfsz322i55wc";}
+  {name="parley";value="1xn5na30xabzp8lhbmq5ajv08rl1s7zsn08ffwd2vq8ac1nwi0k6";}
+  {name="perlkde";value="0088hbqdjqdfyf1pqksppbq1xzpgc49rqsnpgjikgdh9nqssnipd";}
+  {name="perlqt";value="1jgiicjknkfiavnq9jw2mdmsqbqb4ch5caxfhx1v6azj4s95ldpj";}
+  {name="picmi";value="0ckfcmbivkbkl9akb20ih2k4sz221ygqi51wmir3p5ryvk2dlq2a";}
+  {name="print-manager";value="0wszjqf42c3mb8c9iq5ngjz21424zjl9j0g3pwgdfj0i8iv1lcd2";}
+  {name="pykde4";value="18j9fh1w3n9yrrzgsq3pqj2pi53wp58kbwkfwb3hn3a2ksw569qb";}
+  {name="qtruby";value="0zc0if1c8c0ddfm2f6w4zp6dizxqd3z6dnr1iwydw7mdac205j38";}
+  {name="qyoto";value="1cgkpr68wh5rq3kbkv0zjylmyfg1ld4qh8r5azrq25y4qiisxmax";}
+  {name="rocs";value="1ak19mjsniwqzybjawigqg8a04kpv6jhx53mkvlm3wjdnsxi1jis";}
+  {name="smokegen";value="09liqidf5a862l6a4cz4wghhmfsjay647q2q3h17s8iwwid7k373";}
+  {name="smokekde";value="1xl56ygpc0ca7smxiagm7ch45w6m415i9nbzin08i4p017vvx0df";}
+  {name="smokeqt";value="0rk31vd45xraihhb3nmx0mkynlq3wwvdsn0460jfi30m72zpmkyc";}
+  {name="step";value="00vxnybi6q7lw6w22gmd5jmai8ysgyh9sy1cnn6jj4difn1x8zcr";}
+  {name="superkaramba";value="1rkbrifkvhl2zajr96kk63lc3r5s43acfih6m499hgwxg8g9z0cf";}
+  {name="svgpart";value="0892krp78wq731wdr5ipsgx10w45xsrr8jx00qyjsci7qsmpfz4w";}
+  {name="sweeper";value="1i151jzqabfs72c8rl5hh401nmwp9abpa6nfq3m8qyh4d8gn0fig";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+#had to add fake pkgs to kdesdk to get it to be treated like a split module
+{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
--- a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.3.nix
+++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.3.nix
@ -1,282 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0m9zzggcq9ril1wklq1w94hgqdzg78m9v932j1hv1h1nvsjf2gkl";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1c6y2b249sh8k76q1ahw1z4lfn9riqhngxhmrjc6qsi3lpfd851n";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0q7jcw0085cm8wnr5fykim6yvvvps4hn9z9anb8dmgxrzyvvr2p4";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1mzcmxqlabgfhdq4bkwcc5gv2dpx0yxkwln5whyjzy7jz5wz5hhl";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1laz6av9xssdmkd3xcz68bbjdp1b61py0xpqhj90ma1bhza9rk5v";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "12smzrr5chavlg0xis993f60hwqrh1hrbkh0n6n5m3mdsfi5dwix";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0a0hm328lvw9ahw4xmbwsyngidpawjcc3fi9kinqsss4srm257jc";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1wz9ly4yqs20s3c6lb92p8v1hylidkp57j8v02qys7883j5rii8w";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0954c5jar0lmjnivnnbbs2b04xd58l7s0s3adbnrg392cvq92ca7";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "15y0s4y9rqqc8g0qm9v4l9w2km6589xckyd9c21bqhx0nsk2dm5k";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0d7blp0xc808gfhyjww60zdr9wbp5lx1m4i8cca8l683rbxqcbvb";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "07l9w9mk4xylk5s00xs1i8vpa0fhy2fxngqayqyr3n0ljj0ls9my";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1g8yap82jz9nvj25bihrw4xrbjq6669l3qlikjsb89x9jxdslncj";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "0492aps0xvw8krcq5h0rx7farm96k0s3apc3lhxxx9g1flxpjffa";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0pnmjikbn077h6p2inkpisgyrkmfy0wphbmif3spli07nakd1kaw";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1hs53c35fpxkrgfpdfp3qxyy6sh6wv2zcb078rrpc1yc8vjxs31q";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1d6ch6hkc7vncpwkqg5prm1ngkgckr8ynk32w6vi5lkhcc1lmi2g";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "16jrf6zb4glsighllq7n1hg73la6g3gzbzs4c56yhgyyi8x02i7h";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0gjhnypd2lrrx2v0kn2h2iqclhy8fh38z5fzry2m0dgzxqpj7nmw";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "0pplwd10jancgfilywl12fifsnng1dw1j87ph1khgx786q0fncwj";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1a33p1pic8g9cfjx1inry1dxf2lsz91cw7v3niwv5a3xsyd1p5sw";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "08q62d900hyfzf2lnysjk4bg7gg5lgna80x537fkpz5klbmhipar";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "010gjkpky3arbfhhhwb51px2qwcn35ppfg1rhm16vvpmi4whz768";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1pdla5xvx0jqs0bzz8ncgjllg39wa4a67lzz9mr2j4w51c4y2s5p";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1i2cvvyknjmznag1raf1i3d6s91m084whk2vk5kywlbncmncx3bm";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "18b5j98ysg9ps232wj5b3rkxqhj002rr2yzkffsysmqm6232azw6";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "14n8y8wy8pbvxix4zgs2lvffcppya491y79pgr4zfgjbckz8hbw9";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "0qy7xzn8asv8nxq899fisbjdflz2dmg1kx8zmw78xxjyl6kdiqrc";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0l9h9q8c6z8g4hc2vk6vla85gjk9ghkwpwd7mpqsa8q60qbqa1r3";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0xq83xnx533075ml5xg4mnhi8a5k41v16riqd9rfgbwj82w098xz";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1x1afwssvxzkk605j9895c3h363gnra9zjyw5fyvgh02hrfysv7f";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "1akl0l8dmsshwsvy0m9hlprkxlx345v1r5wh2zbyad3nzz1sa2ig";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1div9bf6hhisrvcrlmdiwkzk4wnff2gdzwjp81nqldfhaw098hip";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1ll2m6jxkwqg6z7bp816j04gf7a0x98yk3qxlp7an4khacqy60pl";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "0dchxgsr8m1awwahwqyrbrq55035rpkv6387z9qwmz8098yx1vgf";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1liv2q1yblq55lk20sg4qma4kfa05c1wsp1y8zqv456h10ksmh67";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "031idmcpkcnr3qmbg94zwpzf8vw5wia8mndggis6shrf9gnnkhs2";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "1k5ng4gxn7gnhhh674fzwhhzwmawnxx5bn94dhizsqx3ix533vlw";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0v4nv8d1v8fvsgb6mhxkymcbndjdc9qgx8kd5b2hpyqnppgib4vm";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1i7siqyh0ds1g6w7vzsys6zdvgphs14hd4xxh66qn5s5zmrr0l83";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "02vf365r6mr0bghkj58f6d6ivkd4fcp6mxy9jz7ap8km8jjbiyky";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0rjm6c6aw1kim61rgp8fkqgi9915d6kh1jk4kas064gkwwxl3q2p";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "12z8bvd1a0hzr9x05pv09lznnfh9mngxw86rhfyhx382zrbz1vha";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "16xbin5c8slxxdag7zl8xigmmklm6fl3icy4qdhaglvim07xf995";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "09flw3yr3slhqgjl3aq2p25rl46a90q7gd3p7812lmw3lwpcaxh6";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1p4xlshvz6avnr9dc7yggn53lfh1i5hz14dr8i1ndwj8bhgrzy6m";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "10ma8f1csc2akg0vfwh1wmhj9bwwq0yfn1s5x5ighn67z4jxbp0s";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "065x638nr5wsxs9y0hldbdkp0wgyfnrjlsmyvhg96abrlbs4kgid";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "1qk9khh63qqj5pz92w6l1c1ailcm02mhka215b7qw3waackab3iq";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "1n7w8pmn4r4d3hqm88ya2j3phxsvgy8d57skym3lv30y4116yzkj";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "068s6ilx62l33iandrdisqd2405hhp5gpxpl7x95avrsy016ni1c";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1jvs7bmppzzw1wahcmdy4cq7sblsl6vhrfz91ryc4jcr4klxy7k4";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "0knnc1f7pwfm10xiykajax1xp41psvak1n479n6dji3na0larf5s";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0fw8d3ia3pxpkn6q03188z636z3gk2xciq3igkyjdyfmf14nbwv6";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0s16ns3zjcabq3s27ak9isyqikd6gw5gyvxji5fly9mgcs1dkgmr";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0fy6cib6c7xnacjybyizb3chynqd1fv70447glvjwls9v8avgcpl";
-}
-]
--- a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.4.nix
+++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.4.nix
@ -0,0 +1,282 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1pkca1z620pwd8nk53wpbg6490nzd21i71691dmp233mgb8pzwfz";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1zsml7q434m5242my2y14b5b708ccrmyrvkbl231mjxdqmy137g8";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "0qbhix7xxabcgwyjrqhvhqfm2gs72swj2wdbh99csb8y3ms4bhwm";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1hfj9ram95fsv4qbjv6mwc01sl15vw8cj0q7vy3jjvamcjlczn4q";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "19vjxcpvbrip18j26sbs4h16wisvpryfdf4v7z6kg716k6pgj0gb";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "1nvyazb2dv03k68shqj7crx01yiwzh1zs5al84ym3j18drq8b66r";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1pclmjkb7c2c6k62pilgi6r7bxw2clpb5vj46n0rdhhr97vfschn";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "15qkm1004mq8g3y7jdhsziabf5c1c57p5h57086ngk9x61r2gfmx";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1il49v54qfc1gy9scqal9fjpkjxk3wpzylcz6n5372n01mgs8ydz";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1c25p3byhlv41b82hlpq6agpnfd5vzfm7a9fb8h7jh8va5ifqwac";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1wa15glj0a11phcm69yaz532j4412vqx1h4cwhddyr2l3d7g135i";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1hsq8213mzxzasydgrmcgid85r9d1p1fgkabb5wd66xz5kgjc5v7";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1xw7hnlqq05bfsgb74qhis8dcnr7nllm3vm2mc4n8g5n7h8c0hq4";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "0z0v9m7z557jmqdngw4km4icaxhzlc5np7rzsnzgsqm2xnapc1cm";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0jvy10459fc58d21azbk3jjnq1pb3n4a8v5ynw0f2pcizgivrlm3";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "15wnqcqz1xrdw33xiff0xfnyd56x3hj9nk4i1sxkkymfay2jkdgk";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1n7vzhyph2rr22isnzr7r4yrchkzrgwa1xw00ncpmj4k81gl7yl3";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0hqlhl19y9bc262kk0s5grgvg3xy0gvcvkrcwy2casmrsx3p5f1y";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "0yh6l1ypy3h1bgs1kbnjj7fbhap4a416zlsbsd7d4g71dq7hsm1p";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "03j1dvylczy360dndpny9qfijfnacv185qwlji7zj4x83y69zfdc";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1257lwczcyh6nbp3s8078l2h6yj04wqxa4iak7k3q79l8x2jhch6";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1mvqfmmajgf5iyscalmrsipa9vy5b6ap7bdarl0d1i4nwh1g8mxq";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0cq6c2ky8gydzk5rz5yjgb3lp7n2d9h760q7m8skq9f8hks7vlic";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "1149l8i96iq195cjzbrrdzxck1zd34w6y8hxs8p6jz49bzf5g5c5";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0n4b7x0xxvmlr55b602pi7bxmrcpsqcc4qk4x58x2kpb9awh896i";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1dfy3kzqx0xm52jp7gzph0xm6zrwb9y3mssyw4shmnvhlf13xkki";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1gd6vnh2vwn4lj8c0qmq7avaz79zv2ldqyb07d2wmvpljpifz5fk";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "0q619ddjj928v376j1ljn2k6br7zlazfkk9q4hndi6kql1712139";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1jmfxpz3pf2zglysjnry0ahygvkapk6v844q1nhsmfci6mmpmlqh";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "01f6krx8ll9jhih5205fxsb0dz3ynwpz43byq7qyi68f1lkaxsd0";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0xnl28havz92ar5gid3p2r8wap3yrsg143fghqcdiymbzwy3sb0k";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "1arc5ksxgwvk2i669nhm2y78qf4zd1z3z8fjpixf6ax9g3bqdghd";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1fk0g008pdw4gpbzbycl6xck0m7mf56f27rfa10riy9drmi7bcbj";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1g2gwslqk0zfayhd91mbgl3gwznj8npq9637c3wkk3kdnz6hcsw0";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1j6dw63jph3dbi0v4rlq3mp98fijynd4n0a6z4dwmzdjzb5ccqrg";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "0m5i7i6rscqwwx4l0fw0bmg1247hbs3bxbnxmqbz6fv5pp29yh4v";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "0bn3bf6pkjvr0la5n4s3lb1ij0q2rh4qx8ig6sbkq0j822c84n11";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "09gw92a41ws5lxapw0160pqrqfhfnk42yshlzmdk3aav88rq1f0q";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "1lyh8szfwbd3jm3gsndgigz1xhzldh246c2d6f4lsry9w9557gpl";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "12vgf8qx8244brvfy7mi8ak1nxh9fclj9n2yic5ldf2wfkb7hzjd";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "0q995rw2bbv8vjnf9h0ywdvq8v24rkmxck1w7bf0wblcp7w4pcpq";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "014zcdk5kxif17mqb6ivsc44021f4hxr0d2pn2d0jlrhx4dbyvsp";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "0y80d8d18di9n0jj8ifxmdc5vgmq6bkc86id5azqrlif4rhs55jj";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1q87ixrqqkhzbyb7mlk0xfnxcih057x9w596spr5br8arxr34912";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "1ykbh8j2x14vq7iszll4lgmg8gbnv6jql686x01896ba504144y4";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "03f0jjsn4bwysjs8x8iy61z0rnzm8gn3w9k85wfa0br8cjr36cji";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1bf3795ddlxk9cz686jlifb18wjxfgjqfv3s45gs9q09i6sq0iv4";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "11w9ibw8bbkllrf4628rc5zpwwwp5plcapndwp9sb19rsdx0bnvf";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0rv5l7zplhfr7l8a4wh4ngvh0assq97dlvh5d6x9a464k5fgwg7w";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "15f1rsbzljk120dq2v2wkgn4ym50yzrd9xyzgw9g22hlmy5inmm8";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "1f924vl3vm20p5hfyzzv6hx6cvb7ym4bf9lbch808k99jwvh6j99";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1fv78nvvrd6z62fy3iqqbf77vixadl8s2hg6lkg094f1dc8l3w4n";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "1k2i818821bls1vqb614jq8pi6cj43rf2x2bcbcibwdmhs1xljx8";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0bk9mjir5az1rnxclyijc42mfnpgbw1fzzfvw765wdcs1mkjqrdh";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0m3z05zsg2afzfm2ws090rx9214l9zjshfxy7sww3a2nb39f798b";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "09921r007i23q1dyg9gx8zjaf3da0i2r6r673yhaq584srxivznq";
+}
+]
--- a/pkgs/desktops/kde-4.10/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.10/oxygen-icons.nix
@ -3,7 +3,7 @@
 kde {
  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = "13fyib1v03n3fpq27n2q1yg130qjnz80kwdqccq46za96xb6yrs9";
+  outputHash = "0nl3praln6kfdpr4diln850f29242496p5yrfcyq6xjkpsswq55w";

  nativeBuildInputs = [ cmake ];

--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@ -1,10 +1,11 @@
 { fetchurl, stdenv }:

 stdenv.mkDerivation rec {
-  name = "bigloo3.7a";
+  name = "bigloo-${version}";
+  version = "3.7a";

  src = fetchurl {
-    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz";
+    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz";
    sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1";
  };

--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@ -6,11 +6,11 @@ let
  s = # Generated upstream information
  rec {
    baseName="ecl";
-    version="12.12.1";
+    version="13.5.1";
    name="${baseName}-${version}";
-    hash="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl";
-    url="mirror://sourceforge/project/ecls/ecls/12.12/ecl-12.12.1.tgz";
-    sha256="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl";
+    hash="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r";
+    url="mirror://sourceforge/project/ecls/ecls/13.5/ecl-13.5.1.tgz";
+    sha256="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r";
  };
  buildInputs = [
    libffi
--- a/pkgs/development/compilers/hugs/default.nix
+++ b/pkgs/development/compilers/hugs/default.nix
@ -4,7 +4,7 @@ let edf = composableDerivation.edf;
    wwf = composableDerivation.wwf; in
    
 composableDerivation.composableDerivation {} {
-  name = "hugs98";
+  name = "hugs98-200609";

  src = fetchurl {
    url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz;
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@ -0,0 +1,23 @@
+{ cabal, binary, Cabal, filepath, gmp, happy, haskeline
+, languageJava, libffi, mtl, parsec, split, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "idris";
+  version = "0.9.8";
+  sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    binary Cabal filepath haskeline languageJava libffi mtl parsec
+    split text transformers
+  ];
+  buildTools = [ happy ];
+  extraLibraries = [ gmp ];
+  meta = {
+    homepage = "http://www.idris-lang.org/";
+    description = "Functional Programming Language with Dependent Types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/compilers/idris/wrapper.nix
+++ b/pkgs/development/compilers/idris/wrapper.nix
@ -0,0 +1,10 @@
+{ gmp, makeWrapper, gcc, runCommand, idris_plain}:
+
+runCommand "idris-wrapper" {} ''
+  source ${makeWrapper}/nix-support/setup-hook
+  mkdir -p $out/bin
+  ln -s ${idris_plain}/bin/idris $out/bin
+      wrapProgram $out/bin/idris \
+        --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib"' \
+        --suffix PATH : ${gcc}/bin
+''
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@ -4,11 +4,11 @@ let
  s= # Generated upstream information
  rec {
    baseName="sbcl";
-    version="1.1.7";
+    version="1.1.8";
    name="${baseName}-${version}";
-    hash="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8";
-    url="mirror://sourceforge/project/sbcl/sbcl/1.1.7/sbcl-1.1.7-source.tar.bz2";
-    sha256="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8";
+    hash="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip";
+    url="mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-source.tar.bz2";
+    sha256="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip";
  };
  buildInputs = with a; [
    clisp makeWrapper
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@ -144,6 +144,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
        configureFlags = ["--enable-zip"];
      };

+      ftp = {
+        configureFlags = ["--enable-ftp"];
+      };
+
      /*
         php is build within this derivation in order to add the xdebug lines to the php.ini.
         So both Apache and command line php both use xdebug without having to configure anything.
@ -181,13 +185,22 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
    mcryptSupport = config.php.mcrypt or false;
    bz2Support = config.php.bz2 or false;
    zipSupport = config.php.zip or true;
+    ftpSupport = config.php.ftp or true;
  };

  configurePhase = ''
+    # Don't record the configure flags since this causes unnecessary
+    # runtime dependencies.
+    for i in main/build-defs.h.in scripts/php-config.in; do
+      substituteInPlace $i \
+        --replace '@CONFIGURE_COMMAND@' '(omitted)' \
+        --replace '@CONFIGURE_OPTIONS@' "" \
+        --replace '@PHP_LDFLAGS@' ""
+    done
+
    iniFile=$out/etc/php-recommended.ini
    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
-    echo configurePhase end
  '';

  installPhase = ''
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python, pkgconfig, wrapPython
+, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
+}:
+
+stdenv.mkDerivation {
+  name = "renpy-6.15.5";
+
+  src = fetchurl {
+    url = "http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2";
+    sha256 = "1k57dak1yk5iyxripqn2syhwwkh70y00pnnb9i1qf19lmiirxa60";
+  };
+
+  buildInputs = [
+    python pkgconfig wrapPython
+    SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame
+  ];
+
+  pythonPath = [ pygame ];
+
+  RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
+    SDL libpng ffmpeg freetype glew mesa fribidi zlib
+  ]);
+
+  buildPhase = ''
+    python module/setup.py build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/renpy
+    cp -r renpy renpy.py $out/share/renpy
+    python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
+
+    wrapPythonPrograms
+    makeWrapper ${python}/bin/python $out/bin/renpy \
+      --set PYTHONPATH $program_PYTHONPATH \
+      --set RENPY_BASE $out/share/renpy \
+      --set RENPY_LESS_UPDATES 1 \
+      --add-flags "-O $out/share/renpy/renpy.py"
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
+
+  meta = {
+    description = "Ren'Py Visual Novel Engine";
+    homepage = "http://renpy.org/";
+    licence = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/development/interpreters/ruby/ruby-18.nix
+++ b/pkgs/development/interpreters/ruby/ruby-18.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  
  src = fetchurl {
    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
-    sha256 = "0b4n9d1idmsl47cq3mw6zhi94yp048ljlfgg9qdblbkvnd7arp1g";
+    sha256 = "0g2dsn8lmiqwqsp13ryzi97qxr7742v5l7v506x6wq9aiwpk42p6";
  };

  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
  passthru = rec {
    majorVersion = "1.8";
    minorVersion = "7";
-    patchLevel = "357";
+    patchLevel = "371";
    libPath = "lib/ruby/${majorVersion}";
    gemPath = "lib/ruby/gems/${majorVersion}";
  };
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@ -14,12 +14,12 @@ in

 stdenv.mkDerivation rec {
  version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
-
+  
  name = "ruby-${version}";
-
+  
  src = fetchurl {
    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
-    sha256 = "14c3lp9w7hq3jcmbakw2ngrzd7c81fgqm6skpxwni5k2vzgk8wss";
+    sha256 = "0w1avj8qfskvkgvrjxxc1cxjm14bf1v60ipvcl5q3zpn9k14k2cx";
  };

  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
    ++ (op yamlSupport libyaml);

  enableParallelBuilding = true;
+  patches = [ ./ruby19-parallel-install.patch ];

  configureFlags = ["--enable-shared" "--enable-pthread"];

@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
  passthru = rec {
    majorVersion = "1.9";
    minorVersion = "3";
-    patchLevel = "392";
+    patchLevel = "429";
    libPath = "lib/ruby/${majorVersion}";
    gemPath = "lib/ruby/gems/${majorVersion}";
  };
--- a/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch
+++ b/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch
@ -0,0 +1,15 @@
+Index: ruby-1.9.3-p392/lib/mkmf.rb
+===================================================================
+--- ruby-1.9.3-p392.orig/lib/mkmf.rb
+++ ruby-1.9.3-p392/lib/mkmf.rb
+@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta
+       end
+       for f in files
+         dest = "#{dir}/#{File.basename(f)}"
+-        mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
+-        mfile.print("#{dest}: #{f}\n")
+        mfile.print("install-rb#{sfx}: #{dest}\n")
+        mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n")
+         mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
+         if defined?($installed_list) and !$extout
+           mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@ -29,7 +29,7 @@ let
 in {

  de = buildDict {
-    shortName = "de-20030222-1";
+    shortName = "de-20030222_1";
    fullName = "German";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
@ -38,7 +38,7 @@ in {
  };
    
  en = buildDict {
-    shortName = "en-6.0-0";
+    shortName = "en-6.0_0";
    fullName = "English";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2;
@ -47,7 +47,7 @@ in {
  };
    
  es = buildDict {
-    shortName = "es-0.50-2";
+    shortName = "es-0.50_2";
    fullName = "Spanish";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/es/aspell-es-0.50-2.tar.bz2;
@ -56,7 +56,7 @@ in {
  };
    
  eo = buildDict {
-    shortName = "eo-0.50-2";
+    shortName = "eo-0.50_2";
    fullName = "Esperanto";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/eo/aspell-eo-0.50-2.tar.bz2;
@ -65,7 +65,7 @@ in {
  };

  fr = buildDict {
-    shortName = "fr-0.50-3";
+    shortName = "fr-0.50_3";
    fullName = "French";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2;
@ -74,7 +74,7 @@ in {
  };
    
  it = buildDict {
-    shortName = "it-0.53-0";
+    shortName = "it-0.53_0";
    fullName = "Italian";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/it/aspell-it-0.53-0.tar.bz2;
@ -83,7 +83,7 @@ in {
  };
    
  la = buildDict {
-    shortName = "la-20020503-0";
+    shortName = "la-20020503_0";
    fullName = "Latin";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2;
@ -92,7 +92,7 @@ in {
  };
    
  nl = buildDict {
-    shortName = "nl-0.50-2";
+    shortName = "nl-0.50_2";
    fullName = "Dutch";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2;
@ -105,7 +105,7 @@ in {
  };
    
  pl = buildDict {
-    shortName = "pl-6.0_20061121";
+    shortName = "pl-6.0_20061121_0";
    fullName = "Polish";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2;
@ -114,7 +114,7 @@ in {
  };
     
  ru = buildDict {
-    shortName = "ru-0.99f7-1";
+    shortName = "ru-0.99f7_1";
    fullName = "Russian";
    src = fetchurl {
      url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2;
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
  # I add what 'enableParallelBuilding' would add to the make call,
  # if we were using the generic build phase.
  buildPhase = ''
-    make PREFIX="$out" all -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
+    make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
  '';

  # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run
--- a/pkgs/development/libraries/despotify/default.nix
+++ b/pkgs/development/libraries/despotify/default.nix
@ -5,7 +5,7 @@

 stdenv.mkDerivation rec {

-  name = "despotify";
+  name = "despotify-svn521";

  src = fetchsvn {
    url = "https://despotify.svn.sourceforge.net/svnroot/despotify";
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@ -10,6 +10,10 @@ stdenv.mkDerivation rec {

  buildInputs = [ mesa x11 libXmu libXi ];

+  patchPhase = ''
+    sed -i 's|lib64|lib|' config/Makefile.linux
+  '';
+
  installPhase = ''
    GLEW_DEST=$out make install
    mkdir -pv $out/share/doc/glew
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@ -1,15 +1,15 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
+{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp }:

 assert guileBindings -> guile != null;

 stdenv.mkDerivation (rec {

-  name = "gnutls-3.1.10";
+  name = "gnutls-3.1.12";

  src = fetchurl {
-    url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz";
-    sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
+    sha256 = "1h8j3xi2jad2dclybgqffb5264hdqrxpsx99irs03yy9np6iw5l8";
  };

  # Note: GMP is a dependency of Nettle, whose public headers include
@ -31,10 +31,10 @@ stdenv.mkDerivation (rec {
  # for the actual fix.
  enableParallelBuilding = false;

-  buildInputs = [ zlib lzo ]
+  buildInputs = [ zlib lzo lzip ]
    ++ stdenv.lib.optional guileBindings guile;

-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl pkgconfig ];

  propagatedBuildInputs = [ nettle libtasn1 ];

@ -42,7 +42,7 @@ stdenv.mkDerivation (rec {
  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);

-  meta = {
+  meta = with stdenv.lib; {
    description = "The GNU Transport Layer Security Library";

    longDescription = ''
@ -61,8 +61,7 @@ stdenv.mkDerivation (rec {

    homepage = http://www.gnu.org/software/gnutls/;
    license = "LGPLv2.1+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ maintainers.ludo ];
  };
 }

--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@ -1,6 +1,6 @@
 { cabal, alex, binary, deepseq, filepath, geniplate, happy
 , hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel
-, QuickCheck, text, unorderedContainers, xhtml, zlib
+, QuickCheck, text, time, unorderedContainers, xhtml, zlib
 }:

 cabal.mkDerivation (self: {
@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
  isExecutable = true;
  buildDepends = [
    binary deepseq filepath geniplate hashable hashtables haskeline
-    haskellSrcExts mtl parallel QuickCheck text unorderedContainers
-    xhtml zlib
+    haskellSrcExts mtl parallel QuickCheck text time
+    unorderedContainers xhtml zlib
  ];
  buildTools = [ alex happy ];
  jailbreak = true;
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "accelerate-cuda";
-  version = "0.13.0.1";
-  sha256 = "0nswa73ajvmh1s6n2nks4zm3ybfm8v46wd789cs09f5s90ingpsj";
+  version = "0.13.0.2";
+  sha256 = "1i8p6smj82k9nw0kz17247nzby8k8x0il8d2d3rbps5j03795dfk";
  buildDepends = [
    accelerate binary cryptohash cuda fclabels filepath hashable
    hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@ -2,10 +2,9 @@

 cabal.mkDerivation (self: {
  pname = "accelerate";
-  version = "0.13.0.1";
-  sha256 = "01vkvvvzlj023cwxz90clrcgz4xyz0nb8idm1zad21gzrij14915";
+  version = "0.13.0.4";
+  sha256 = "1rhbvzgafw3cx2wi4zfil4nxcziqpbh20q3nafck30q2xvrwkmwm";
  buildDepends = [ fclabels hashable hashtables ];
-  noHaddock = true;
  meta = {
    homepage = "https://github.com/AccelerateHS/accelerate/";
    description = "An embedded language for accelerated array processing";
--- a/pkgs/development/libraries/haskell/bmp/1.2.5.2.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.5.2.nix
@ -2,9 +2,10 @@

 cabal.mkDerivation (self: {
  pname = "bmp";
-  version = "1.2.4.1";
-  sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap";
+  version = "1.2.5.2";
+  sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
  buildDepends = [ binary ];
+  jailbreak = true;
  meta = {
    homepage = "http://code.ouroborus.net/bmp";
    description = "Read and write uncompressed BMP image files";
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "classy-prelude";
-  version = "0.5.7";
-  sha256 = "1wq8la7nq3dh21yqwcjhwgy5s5mpqlvmrfma48v8ch6w4wwb0sqz";
+  version = "0.5.8";
+  sha256 = "1yq2x3mfkasprmsx1gracjhih9l9x0dsq6pdf90khlcl11qh57ir";
  buildDepends = [
    basicPrelude hashable liftedBase monadControl systemFilepath text
    transformers unorderedContainers vector
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@ -2,12 +2,12 @@

 cabal.mkDerivation (self: {
  pname = "contravariant";
-  version = "0.4";
-  sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3";
+  version = "0.4.1";
+  sha256 = "0alzl47lqzw9fqjqxdfy40f1aynd8mc00b2h7fj2ch0zq82hm85q";
  buildDepends = [ tagged transformers transformersCompat ];
  meta = {
    homepage = "http://github.com/ekmett/contravariant/";
-    description = "Haskell 98 contravariant functors";
+    description = "Contravariant functors";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
  };
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "entropy";
-  version = "0.2.2";
-  sha256 = "1zri5qs19cbz9ydbh076q6834pspf2gqn06ssz4hsq6j65cnd9x2";
+  version = "0.2.2.1";
+  sha256 = "1yl1gmkmbalm27pjlpm9nhsbxpvxl8w7p8psq5apyrbdqnv9yhbg";
  meta = {
    homepage = "https://github.com/TomMD/entropy";
    description = "A platform independent entropy source";
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "file-embed";
-  version = "0.0.4.7";
-  sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi";
+  version = "0.0.4.8";
+  sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h";
  buildDepends = [ filepath ];
  testDepends = [ filepath HUnit ];
  meta = {
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ b/pkgs/development/libraries/haskell/fingertree/default.nix
@ -1,9 +1,15 @@
-{ cabal }:
+{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:

 cabal.mkDerivation (self: {
  pname = "fingertree";
-  version = "0.0.1.1";
-  sha256 = "00llr24b2r539250fangl0jj39gf26gjwvhjpy5qg8l920hrjn78";
+  version = "0.1.0.0";
+  sha256 = "0c35sryzsijwavvw9x1pk5p99rhmp4g8pjh2ds419mlfgxc039ms";
+  testDepends = [
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
  meta = {
    description = "Generic finger-tree structure, with example instances";
    license = self.stdenv.lib.licenses.bsd3;
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "ghc-vis";
-  version = "0.7.0.1";
-  sha256 = "0k6pm1lqmcmgdqzcdbygdyg6bgx4k0gi77k1mxwprgr9vv3ly26w";
+  version = "0.7.1";
+  sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa";
  buildDepends = [
    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
    transformers xdot
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@ -1,15 +1,21 @@
 { cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
-, regexCompat, regexpr, safe, split, time, transformers, utf8String
+, regexCompat, regexpr, safe, split, testFramework
+, testFrameworkHunit, time, transformers, utf8String
 }:

 cabal.mkDerivation (self: {
  pname = "hledger-lib";
-  version = "0.20.0.1";
-  sha256 = "1skm2jii7d8b6a6i98xwxckxwhikgj44823wqzdk8f3bq9zlwhcg";
+  version = "0.21.2";
+  sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9";
  buildDepends = [
    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
    regexpr safe split time transformers utf8String
  ];
+  testDepends = [
+    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
+    regexpr safe split testFramework testFrameworkHunit time
+    transformers
+  ];
  meta = {
    homepage = "http://hledger.org";
    description = "Core data types, parsers and utilities for the hledger accounting tool";
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@ -1,26 +1,25 @@
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
-, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib
-, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr
-, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time
-, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest
+, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
+, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
+, shakespeareText, text, time, transformers, wai, waiExtra
+, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform
+, yesodStatic, yesodTest
 }:

 cabal.mkDerivation (self: {
  pname = "hledger-web";
-  version = "0.20.0.1";
-  sha256 = "0fq3wfsy2ykyplr66ac91yd2vwzfw3ji8mq9q4jn58nnh6bgxfa1";
+  version = "0.21.2";
+  sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
    blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
-    hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl
-    networkConduit parsec regexpr safe shakespeareCss shakespeareJs
-    shakespeareText text time transformers wai waiExtra
-    waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm
-    yesodStatic
+    hamlet hjsmin hledger hledgerLib httpConduit HUnit json
+    networkConduit parsec regexpr safe shakespeareText text time
+    transformers wai waiExtra waiHandlerLaunch warp yaml yesod
+    yesodCore yesodPlatform yesodStatic
  ];
-  testDepends = [ yesodCore yesodDefault yesodTest ];
+  testDepends = [ hspec yesod yesodTest ];
  doCheck = false;
  meta = {
    homepage = "http://hledger.org";
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@ -1,18 +1,24 @@
-{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, regexpr, safe, shakespeareText, split, text, time
-, utf8String
+{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
+, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText
+, split, testFramework, testFrameworkHunit, text, time
+, transformers, utf8String
 }:

 cabal.mkDerivation (self: {
  pname = "hledger";
-  version = "0.20.0.1";
-  sha256 = "0sdsxdydpmnarxz94py8rlbcffpan7l299ff7j9gn4f42z3sarw7";
+  version = "0.21.2";
+  sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
    cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
    shakespeareText split text time utf8String
  ];
+  testDepends = [
+    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
+    prettyShow regexCompat regexpr safe shakespeareText split
+    testFramework testFrameworkHunit text time transformers
+  ];
  meta = {
    homepage = "http://hledger.org";
    description = "The main command-line interface for the hledger accounting tool";
--- a/pkgs/development/libraries/haskell/hsshellscript/default.nix
+++ b/pkgs/development/libraries/haskell/hsshellscript/default.nix
@ -0,0 +1,15 @@
+{ cabal, c2hs, parsec, random }:
+
+cabal.mkDerivation (self: {
+  pname = "hsshellscript";
+  version = "3.3.1";
+  sha256 = "0z3afp3r1j1in03fv2yb5sfbzgcrhdig6gay683bzgh85glwxhlp";
+  buildDepends = [ parsec random ];
+  buildTools = [ c2hs ];
+  meta = {
+    homepage = "http://www.volker-wysk.de/hsshellscript/";
+    description = "Haskell for Unix shell scripting tasks";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@ -0,0 +1,22 @@
+{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "language-java";
+  version = "0.2.4";
+  sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f";
+  buildDepends = [ cpphs parsec syb ];
+  testDepends = [
+    filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  buildTools = [ alex ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/vincenthz/language-java";
+    description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/libffi/default.nix
+++ b/pkgs/development/libraries/haskell/libffi/default.nix
@ -0,0 +1,13 @@
+{ cabal, libffi }:
+
+cabal.mkDerivation (self: {
+  pname = "libffi";
+  version = "0.1";
+  sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
+  pkgconfigDepends = [ libffi ];
+  meta = {
+    description = "A binding to libffi";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "lifted-base";
-  version = "0.2.0.5";
-  sha256 = "1an7wlz31szccbypbrh59i3py210mh7jbfi0zaizd32q0im1573r";
+  version = "0.2.1.0";
+  sha256 = "0c4vzyfyjvqv5q8mprgxf9ckibpp5k1zh9k5slmdsd9m1l3pwwqy";
  buildDepends = [
    baseUnicodeSymbols monadControl transformersBase
  ];
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "monadcryptorandom";
-  version = "0.5.1";
-  sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6";
+  version = "0.5.2";
+  sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn";
  buildDepends = [ cryptoApi mtl tagged transformers ];
  meta = {
    homepage = "https://github.com/TomMD/monadcryptorandom";
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "mongoDB";
-  version = "1.3.2";
-  sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y";
+  version = "1.4.0";
+  sha256 = "1cj73k6lfpxmfaigqwwglnncfl1ikz6yjgs0d9f6k42kwysbddwz";
  buildDepends = [
    binary bson cryptohash liftedBase monadControl mtl network parsec
    random randomShuffle text transformersBase
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@ -0,0 +1,13 @@
+{ cabal, pipes, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-concurrency";
+  version = "1.2.0";
+  sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq";
+  buildDepends = [ pipes stm ];
+  meta = {
+    description = "Concurrency for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix
@ -0,0 +1,13 @@
+{ cabal, pipes }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-parse";
+  version = "1.0.0";
+  sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w";
+  buildDepends = [ pipes ];
+  meta = {
+    description = "Parsing infrastructure for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/pipes-safe/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix
@ -0,0 +1,13 @@
+{ cabal, pipes, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-safe";
+  version = "1.2.0";
+  sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj";
+  buildDepends = [ pipes transformers ];
+  meta = {
+    description = "Safety for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@ -0,0 +1,13 @@
+{ cabal, mmorph, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes";
+  version = "3.3.0";
+  sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb";
+  buildDepends = [ mmorph transformers ];
+  meta = {
+    description = "Compositional pipelines";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "postgresql-simple";
-  version = "0.3.3.0";
-  sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l";
+  version = "0.3.3.1";
+  sha256 = "0fqndncfy6yg27ndfaqyqd2q9wrbabkdq388s4q9m7maj222xlb9";
  buildDepends = [
    attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
    transformers vector
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "repa-examples";
-  version = "3.2.3.1";
-  sha256 = "1lflgpnig2ks2mwp7bywyjqr2v426gbk1675mkkvjncgr5ahf11g";
+  version = "3.2.3.2";
+  sha256 = "1l8bvaaap5gl62j9zinjgj8vlqq4b52p46hnj8kq9n09lxq6xq96";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "repa";
-  version = "3.2.3.2";
-  sha256 = "0xwaqkir4gjlhnvd1r69ycswg4p65ig38d2np69hv195zr47pmvh";
+  version = "3.2.3.3";
+  sha256 = "0rdny7yjcmz9iy07sqnjmwyr58f0kyzzdycwi55j963rb4vqkacn";
  buildDepends = [ QuickCheck vector ];
  meta = {
    homepage = "http://repa.ouroborus.net";
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@ -1,10 +1,11 @@
-{ cabal, parsec, shakespeare, text }:
+{ cabal, hspec, parsec, shakespeare, text }:

 cabal.mkDerivation (self: {
  pname = "shakespeare-i18n";
-  version = "1.0.0.2";
-  sha256 = "11ydkl6v31v79q8a8fqf4p99p7dv9dlimr3rhi9cs5lrxz9gmf5z";
+  version = "1.0.0.3";
+  sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r";
  buildDepends = [ parsec shakespeare text ];
+  testDepends = [ hspec text ];
  meta = {
    homepage = "http://www.yesodweb.com/book/shakespearean-templates";
    description = "A type-based approach to internationalization";
--- a/pkgs/development/libraries/haskell/stm-chans/default.nix
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "stm-chans";
-  version = "2.0.0";
-  sha256 = "041dmjmr70was4vxf1ihizzarms7a8x53m80i65ggxxmq5xqmsa3";
+  version = "3.0.0";
+  sha256 = "1nnl5h88dshcmk0ydhkf84kkf6989igxry9r0z7lwlxfgf7q9nim";
  buildDepends = [ stm ];
  meta = {
    homepage = "http://code.haskell.org/~wren/";
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "stm-conduit";
-  version = "2.0.0";
-  sha256 = "015gz4fqijgcs6dls5l8ry47q4a33a6ik0hsj5mw48iw44af39jr";
+  version = "2.1.0";
+  sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
  buildDepends = [ conduit resourcet stm stmChans transformers ];
  testDepends = [
    conduit HUnit QuickCheck stm stmChans testFramework
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "tls-extra";
-  version = "0.6.3";
-  sha256 = "1ng8h3v5px63fpb4y3sd47djzpksyzzavilsdnp1kd453abpmx9l";
+  version = "0.6.4";
+  sha256 = "058ia1cabs7ribz287iqkkjvqpp2n7c219f3xc92fhm0qq00mh5n";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@ -10,8 +10,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-core";
-  version = "1.2.1";
-  sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk";
+  version = "1.2.2";
+  sha256 = "1fapqx1lrhhqjc9k9yc964sxnawj7ga62w83csbkkhwq3g5425yp";
  buildDepends = [
    aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
    caseInsensitive cereal clientsession conduit cookie dataDefault
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-persistent";
-  version = "1.2.0";
-  sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k";
+  version = "1.2.1";
+  sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc";
  buildDepends = [
    blazeBuilder conduit liftedBase persistent persistentTemplate
    poolConduit resourcet transformers yesodCore
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@ -0,0 +1,65 @@
+{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
+, attoparsecConduit, authenticate, base64Bytestring
+, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
+, blazeMarkup, byteorder, caseInsensitive, cereal, certificate
+, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes
+, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey
+, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault
+, dataDefaultClass, dataDefaultInstancesBase
+, dataDefaultInstancesContainers, dataDefaultInstancesDlist
+, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
+, entropy, failure, fastLogger, fileEmbed, filesystemConduit
+, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit
+, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
+, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
+, networkConduit, pathPieces, pem, persistent, persistentTemplate
+, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast
+, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv
+, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
+, shakespeareText, silently, simpleSendfile, skein, socks
+, stringsearch, systemFileio, systemFilepath, tagged, tagsoup
+, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
+, unorderedContainers, utf8Light, utf8String, vault, vector, void
+, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
+, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth
+, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic
+, yesodTest, zlibBindings, zlibConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-platform";
+  version = "1.2.1";
+  sha256 = "1wa1g37ipigscv8xwb5zyfawjw0fxqmwr2l6wdf507r0kvclk2ap";
+  buildDepends = [
+    aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
+    authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
+    blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive
+    cereal certificate cipherAes cipherRc4 clientsession conduit cookie
+    cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers
+    cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault
+    dataDefaultClass dataDefaultInstancesBase
+    dataDefaultInstancesContainers dataDefaultInstancesDlist
+    dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
+    failure fastLogger fileEmbed filesystemConduit hamlet hashable
+    hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate
+    httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
+    monadControl monadLogger networkConduit pathPieces pem persistent
+    persistentTemplate poolConduit primitive publicsuffixlist pureMD5
+    pwstoreFast quickcheckIo resourcePool resourcet safe semigroups
+    setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs
+    shakespeareText silently simpleSendfile skein socks stringsearch
+    systemFileio systemFilepath tagged tagsoup tagstreamConduit tls
+    tlsExtra transformersBase unixCompat unorderedContainers utf8Light
+    utf8String vault vector void wai waiAppStatic waiExtra waiLogger
+    waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod
+    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
+    yesodStatic yesodTest zlibBindings zlibConduit
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Meta package for Yesod";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-routes";
-  version = "1.2.0";
-  sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2";
+  version = "1.2.0.1";
+  sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z";
  buildDepends = [ pathPieces text vector ];
  testDepends = [ hspec HUnit pathPieces text ];
  meta = {
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@ -6,8 +6,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod";
-  version = "1.2.0.1";
-  sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3";
+  version = "1.2.1";
+  sha256 = "19gwhav6sr6gd2kh92ga8a09hq9grllmnacdqkgasxwjsfxqa6zg";
  buildDepends = [
    aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
    networkConduit safe shakespeareCss shakespeareJs text transformers
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@ -1,18 +1,16 @@
 { stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :

 stdenv.mkDerivation rec {
-  name = "heimdal-1.3.3";
+  name = "heimdal-1.5.2";

  src = fetchurl {
    urls = [
      "http://www.h5l.org/dist/src/${name}.tar.gz"
      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
    ];
-    sha256 = "0c465by1g7niy3nkfs5mwrm6j6w2cvrf4988h3lpmj194lkjp3cc";
+    sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
  };

-  patches = [ ./no-md2.patch ];
-  
  ## ugly, X should be made an option
  configureFlags = [
    "--with-openldap=${openldap}"
@ -21,7 +19,7 @@ stdenv.mkDerivation rec {
  ];
  # dont succeed with --libexec=$out/sbin, so
  postInstall = ''
-    mv $out/libexec/* $out/sbin/
+    mv "$out/libexec/"* $out/sbin/
    rmdir $out/libexec
  '';

--- a/pkgs/development/libraries/kerberos/no-md2.patch
+++ b/pkgs/development/libraries/kerberos/no-md2.patch
@ -1,46 +0,0 @@
-http://old.nabble.com/-patch--fix-build-with-openssl-1.0-td28388913.html
-
-diff -Naur -x '*~' heimdal-1.3.2/include/crypto-headers.h heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h
--- heimdal-1.3.2/include/crypto-headers.h 2010-03-22 05:11:24.000000000 +0100
-+++ heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h 2010-04-28 14:54:53.000000000 +0200
-@@ -13,7 +13,9 @@
- #include <openssl/des.h>
- #include <openssl/rc4.h>
- #include <openssl/rc2.h>
-+#ifdef HAVE_OPENSSL_MD2_H
- #include <openssl/md2.h>
-+#endif
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-diff -Naur -x '*~' heimdal-1.3.2/lib/hx509/crypto.c heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c
--- heimdal-1.3.2/lib/hx509/crypto.c 2010-03-22 05:11:24.000000000 +0100
-+++ heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c 2010-04-28 15:12:20.000000000 +0200
-@@ -1354,6 +1354,7 @@
-     NULL
- };
- 
-+#ifdef HAVE_OPENSSL_MD2_H
- static const struct signature_alg md2_alg = {
-     "rsa-md2",
-     &asn1_oid_id_rsa_digest_md2,
-@@ -1366,6 +1367,7 @@
-     evp_md_verify_signature,
-     NULL
- };
-+#endif
- 
- /*
-  * Order matter in this structure, "best" first for each "key
-@@ -1387,7 +1389,9 @@
-     &sha256_alg,
-     &sha1_alg,
-     &md5_alg,
-+#ifdef HAVE_OPENSSL_MD2_H
-     &md2_alg,
-+#endif
-     NULL
- };
- 
-
-
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:

 stdenv.mkDerivation rec {
-  name = "libf2c";
+  name = "libf2c-20100903";
  
  src = fetchurl {
    url = http://www.netlib.org/f2c/libf2c.zip;
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:

 stdenv.mkDerivation rec {
-  name = "libgphoto2-2.4.14";
+  name = "libgphoto2-2.5.2";

  src = fetchurl {
    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
+    sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3";
  };
  
  nativeBuildInputs = [ pkgconfig gettext ];
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ b/pkgs/development/libraries/libixp_for_wmii/default.nix
@ -1,6 +1,6 @@
 args: with args;
 stdenv.mkDerivation {
-  name = "libixp_for_wmii";
+  name = "libixp_for_wmii-0.4";
  phases = "unpackPhase installPhase";
  installPhase = "
     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
--- a/pkgs/development/libraries/libotr/3.2.nix
+++ b/pkgs/development/libraries/libotr/3.2.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl, libgcrypt}:

 stdenv.mkDerivation {
-  name = "libotr-3.2.0";
+  name = "libotr-3.2.1";
  src = fetchurl {
    url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
    sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";
--- a/Show More
+++ b/Show More