Updating from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=24038

111 files changed, 2108 insertions, 902 deletions

diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
index d91f83052e3d9..d830b3ab26c21 100755
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@@ -560,8 +560,9 @@ exec ${GUILE-guile} -L "$PWD" -l "$0"    \
     '(("commoncpp2"   "ftp.gnu.org"   "/gnu/commoncpp" #f)
       ("libgcrypt"    "ftp.gnupg.org" "/gcrypt" #t)
       ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
+      ("freefont-ttf" "ftp.gnu.org"   "/gnu/freefont" #f)
       ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
-      ("gnu-ghostscript" "ftp.gnu.org"  "/ghostscript" #f)
+      ("gnu-ghostscript" "ftp.gnu.org"  "/gnu/ghostscript" #f)
       ("grub"         "alpha.gnu.org" "/gnu" #t)
       ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
       ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
@@ -594,6 +595,7 @@ exec ${GUILE-guile} -L "$PWD" -l "$0"    \
 
 (define (releases project)
   ;; TODO: Handle project release trees like that of IceCat and MyServer.
+  ;; TODO: Parse something like fencepost.gnu.org:/gd/gnuorg/packages-ftp.
   (define release-rx
     (make-regexp (string-append "^" project "-[0-9].*\\.tar\\.")))
 
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
new file mode 100644
index 0000000000000..e47a06e27621c
--- /dev/null
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
+, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
+, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  pname = "amarok";
+  version = "2.3.2";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
+    sha256 = "0dw2928vkd42h3d8nsb8i4xhp8qfj1zsfc1m9wrzrsxl0vd6j9c4";
+  };
+
+  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
+  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
+    libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
+    soprano qca2 libmtp liblastfm libgpod pkgconfig ];
+
+  postInstall = ''
+    mkdir -p $out/nix-support
+    echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
+  '';
+  meta = {
+    description = "Popular music player for KDE";
+    license = "GPL";
+    homepage = http://amarok.kde.org;
+    inherit (kdelibs.meta) platforms maintainers;
+  };
+}
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 597799c0268c1..7e03fd6b7b302 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -4,11 +4,11 @@ args: with args;
 let inherit (args.composableDerivation) composableDerivation edf; in
 composableDerivation {} {
 
-    name = "vim_configurable-7.2";
+    name = "vim_configurable-7.3";
 
     src = args.fetchurl {
-      url = ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2;
-      sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
+      url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2;
+      sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
     };
 
     configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 0502d2d019587..4920dd76bd111 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "vim-7.2";
+  name = "vim-7.3";
  
   src = fetchurl {
     url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
-    sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
+    sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
   };
  
   buildInputs = [ ncurses gettext pkgconfig ];
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
new file mode 100644
index 0000000000000..0f3b3f2bb5fdb
--- /dev/null
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -0,0 +1,76 @@
+{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
+, glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
+, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
+, pango, paramiko, pcre, pexpect, pkgconfig, python, sqlite
+}:
+
+stdenv.mkDerivation rec {
+  name = "mysql-workbench";
+  version = "5.2.27";
+
+  src = fetchurl {
+    url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}.tar.gz";
+    sha256 = "01l15f9nvcpcsb56r7qb39jjlknh0dkj5iwfg1pj5bm12pbligng";
+  };
+
+  buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
+    libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
+    mysql paramiko pcre pexpect pkgconfig python sqlite ];
+
+  preConfigure = ''
+    substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
+
+    ./autogen.sh --prefix=$out
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/mysql-workbench-bin" \
+      --prefix LD_LIBRARY_PATH : "${python}/lib" \
+      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64" \
+      --prefix PATH : "${gnome_keyring}/bin" \
+      --set PYTHONPATH $PYTHONPATH \
+      --run '
+# The gnome-keyring-daemon must be running.  To allow for environments like
+# kde, xfce where this is not so, we start it first.
+# It is cleaned up using a supervisor subshell which detects that
+# the parent has finished via the closed pipe as terminate signal idiom,
+# used because we cannot clean up after ourselves due to the exec call.
+
+# Start gnome-keyring-daemon, export the environment variables it asks us to set.
+for expr in $( gnome-keyring-daemon --components=ssh,pkcs11 --start ) ; do eval "export "$expr ; done
+
+# Prepare fifo pipe.
+FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo"
+[ -p $FIFOCTL ] && rm $FIFOCTL
+mkfifo $FIFOCTL
+
+# Supervisor subshell waits reading from pipe, will receive EOF when parent
+# closes pipe on termination.  Negate read with ! operator to avoid subshell
+# quitting when read EOF returns 1 due to -e option being set.
+(
+    exec 19< $FIFOCTL
+    ! read -u 19
+
+    kill $GNOME_KEYRING_PID
+    rm $FIFOCTL
+) &
+
+exec 19> $FIFOCTL
+            ' 
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A MySQL visual database modeling, administration and querying tool.";
+    longDescription = ''
+      MySQL Workbench is a modeling tool that allows you to design
+      and generate MySQL databases graphically. It also has administration
+      and query development modules where you can manage MySQL server instances
+      and execute SQL queries.
+    '';
+
+    homepage = http://wb.mysql.com/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.kkallio ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
new file mode 100644
index 0000000000000..1e22e263c86a3
--- /dev/null
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "arora-${version}";
+  version = "0.10.2";
+
+  src = fetchurl {
+    url = "http://arora.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1np9xiy7vkpz4dar6ka90wxw4nkwapjafyjzqrv7ghnc3nqdnnvv";
+  };
+
+  buildInputs = [ qt4 ];
+
+  configurePhase = "qmake PREFIX=$out";
+
+  meta = with stdenv.lib; {
+    platforms = qt4.meta.platforms;
+    maintainers = [ maintainers.phreedom ];
+    description = "A cross-platform Qt4 Webkit browser";
+    homepage = http://arora.googlecode.com;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 0f89522325bd8..4e8747a5fec40 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -15,6 +15,7 @@
 , gtk 
 , glib
 , pango
+, cairo
 , atk
 , debug ? false
 
@@ -40,9 +41,9 @@ let
         throw "no x86_64 debugging version available"
       else {
         # -> http://labs.adobe.com/downloads/flashplayer10_64bit.html
-        version = "10.0.45.2";
-        url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz;
-        sha256 = "1mkl02cplcl9dygmgzzwic0r7kkdgfkmpfzvk76l665pgf5bbazf";
+        version = "10.1_p1-r091510";
+        url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p1_64bit_linux_091510.tar.gz;
+        sha256 = "0dzhvnxcwfyiqvk2jn2hmdy29qclq95zd57w7bca82m8bsj1sn4b";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -53,7 +54,7 @@ let
       } else {
         version = "10.1.82.76";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "c6f8831ce648e7fa8e037f1fa8362d2d998cae0e06490e792bcd5871f3eb936a";
+        sha256 = "7f0e57febd1ca96af626ca1b7f4f95b42eee4ef687ead6853fd49c5517089087";
       }
     else throw "flashplayer is not supported on this platform";
 
@@ -74,7 +75,7 @@ stdenv.mkDerivation {
 
   rpath = stdenv.lib.makeLibraryPath
     [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
-      libXext libXrender libXt gtk glib pango atk
+      libXext libXrender libXt gtk glib pango atk cairo
     ];
 
   buildPhase = ":";
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
new file mode 100644
index 0000000000000..a9b5e0d7a864c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }:
+
+stdenv.mkDerivation {
+
+  name = "kadu-0.6.5.4";
+
+  src = fetchurl {
+    url = http://www.kadu.net/download/stable/kadu-0.6.5.4.tar.bz2;
+    sha256 = "09bdcyx75lca1pl6x3vfpawmdjn5pfxvwivb9xdhk4bdvswxgv4x";
+  };
+  
+  buildInputs = [
+    cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib
+  ];
+
+  cmakeFlags = "-Wno-dev";
+
+  NIX_LDFLAGS="-lX11";
+
+  patches = [ ./more-icons.patch ];
+
+  patchPhase = ''
+    unset patchPhase; patchPhase
+    sed 's=/bin/bash=/${stdenv.shell}=g' -i \
+      `find -type f -name '*.sh' -or -name 'autodownload'`
+  '';
+
+  meta = { 
+    description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)";
+    homepage = http://www.kadu.net/w/English:Main_Page;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch b/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch
new file mode 100644
index 0000000000000..60234d361f7ce
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/more-icons.patch
@@ -0,0 +1,12 @@
+--- kadu/.config	2010-01-18 17:13:31.000000000 +0100
++++ kadu/.config	2010-09-28 21:21:48.000000000 +0200
+@@ -559,10 +559,10 @@ icons_glass16=y
+ icons_glass22=y
+ 
+ # Desctiption: Tango 16x16 icons made by BlotoPosniegowe
+-icons_tango16=n
++icons_tango16=y
+ 
+ # Description: Oxygen 16x16 icons maintained by Piotr Pelzowski
+-icons_oxygen16=n
++icons_oxygen16=y
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
new file mode 100644
index 0000000000000..5d5aed592fd5b
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -0,0 +1,54 @@
+x@{builderDefsPackage
+  , qt4, openssl
+  , xproto, libX11
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    version="1.0.2";
+    baseName="vacuum";
+    name="${baseName}-${version}";
+    url="http://vacuum-im.googlecode.com/files/${name}-source.tar.gz";
+    hash="01ndwxpgr8911f2nfyb6i7avmmlwfikn031q1s60js4lgbqdq3b7";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doQMake" "doMakeInstall"];
+
+  goSrcDir = ''cd vacuum-*/'';
+
+  doQMake = a.fullDepEntry (''
+    qmake INSTALL_PREFIX=$out -recursive vacuum.pro
+  '') ["doUnpack" "addInputs"];
+      
+  meta = {
+    description = "An XMPP client fully composed of plugins";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://code.google.com/p/vacuum-im/downloads/list?can=2&q=&colspec=Filename";
+    };
+  };
+}) x
+
diff --git a/pkgs/applications/office/koffice/default.nix b/pkgs/applications/office/koffice/default.nix
new file mode 100644
index 0000000000000..4679c231e1624
--- /dev/null
+++ b/pkgs/applications/office/koffice/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
+, shared_mime_info, popplerQt4, gsl, gmm, wv2, libwpd, libwpg,  giflib, libgsf
+, fftw, pkgconfig, openjpeg , kdelibs, kdepimlibs, automoc4, phonon
+, qimageblitz, qca2, eigen, soprano , kdegraphics}:
+
+stdenv.mkDerivation rec {
+  name = "koffice-2.2.2";
+  src = fetchurl {
+    url = "mirror://kde/stable/${name}/${name}.tar.bz2";
+    sha256 = "1jzdq7av4vbfkx987yz54431q3bwrsd7wzyinl9wsznx83v61c75";
+  }; 
+
+  patchFlags = "-p0";
+  patches =
+    let
+      urlBase = "http://kexi-project.org/download/patches/2.2.2/";
+    in
+    [
+      (fetchurl {
+        url = "${urlBase}support-large-memo-values-for-msaccess-2.2.2.patch";
+        sha256 = "1jn6na8c0vdf87p0yv9bcff0kd1jmcxndxmm3s0878l5pak9m8rd";
+      })
+      (fetchurl {
+        url = "${urlBase}fix-crash-on-closing-sqlite-connection-2.2.2.patch";
+        sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj";
+      })
+      ./wpd.patch
+    ];
+
+  buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew
+    shared_mime_info popplerQt4 gsl gmm wv2 libwpd libwpg giflib libgsf
+    stdenv.gcc.libc fftw pkgconfig kdelibs kdepimlibs automoc4 phonon
+    qimageblitz qca2 eigen openjpeg soprano kdegraphics ];
+
+  meta = {
+    description = "KDE integrated Office Suite";
+    license = "GPL";
+    homepage = http://www.koffice.org;
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch b/pkgs/applications/office/koffice/wpd.patch
index 2b0af918bae3c..56a5b65e50b3a 100644
--- a/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
+++ b/pkgs/applications/office/koffice/wpd.patch
@@ -1,7 +1,7 @@
-diff --git a/cmake/modules/FindWPD.cmake b/cmake/modules/FindWPD.cmake
+diff cmake/modules/FindWPD.cmake cmake/modules/FindWPD.cmake
 index 9bd788c..927785a 100644
---- a/cmake/modules/FindWPD.cmake
-+++ b/cmake/modules/FindWPD.cmake
+--- cmake/modules/FindWPD.cmake
++++ cmake/modules/FindWPD.cmake
 @@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
  else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
  if(NOT WIN32)
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 9e2d434b29425..3cd2711581dd1 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:
 
 let
-  version = "20100823222416";
+  version = "20100918155143";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "16wxg27pyzrv7p5qmaf0gkxpydjxplck5s933aqcwp6xkpx0ys8v";
+    sha256 = "1xkk5girwvhayl54fmya48k4akzpsdcg2qllgp1c6ckv169kggb9";
   };
 
   buildInputs = [ zlib openssl ];
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index c9bc06ec2e6cc..40fec58b6549f 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -9,7 +9,7 @@ in
 rec {
 
   git = lib.makeOverridable (import ./git) {
-    inherit fetchurl stdenv curl openssl zlib expat perl python gettext
+    inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
       asciidoc texinfo xmlto docbook2x
       docbook_xsl docbook_xml_dtd_45 libxslt
       cpio tcl tk makeWrapper subversion;
@@ -60,12 +60,12 @@ rec {
   };
 
   topGit = stdenv.mkDerivation rec {
-    name = "topgit-0.8";
+    name = "topgit-0.8-19-g9404aa1";
 
     src = fetchgit {
       url = "http://repo.or.cz/r/topgit.git";
       rev = name;
-      sha256 = "14g233hk70xs51h4jqyivjfqnwmjjpc95fjb7wdny64i9ddz03aj";
+      sha256 = "47e92d31303c30a22b96ce4a005f3c51f0e12c163e54f6ca589ac4e50ec74bd0";
     };
 
     configurePhase = "export prefix=$out";
@@ -82,10 +82,10 @@ rec {
 
     meta = {
       description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
-      maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo ];
-      homepage = http://repo.or.cz/w/topgit.git; # maybe there is also another one, I haven't checked
+      maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ];
+      homepage = http://repo.or.cz/w/topgit.git;
       license = "GPLv2";
-      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+      platforms = stdenv.lib.platforms.unix;
     };
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 116b6ff52314f..b79d1d1ca0fcc 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
+{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper
 , svnSupport, subversion, perlLibs, smtpPerlLibs
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "git-1.7.2.3";
+  name = "git-1.7.3.1";
 
   src = fetchurl {
     url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1";
+    sha256 = "1sfs8hxbqa39cy2sp43mknlm2pywz7ni02kkac4azi9ypyqjdb6h";
   };
 
   patches = [ ./docbook2texi.patch ];
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
       echo "installing Emacs mode..."
       ensureDir $out/share/emacs/site-lisp
       cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
+
+      # grep is a runtime dependence, need to patch so that it's found
+      substituteInPlace $out/libexec/git-core/git-sh-setup \
+          --replace ' grep' ' ${gnugrep}/bin/grep' \
+          --replace ' egrep' ' ${gnugrep}/bin/egrep'
     '' # */
 
    + (if svnSupport then
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index fcf12cac94e76..7a3e72c940f0d 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.3.1.10286";
-   name="veracity-0.3.1.10286";
-   hash="0cihzf2m4bxwf8z1va550q8yqpjwc2rs013rx0q8azl0idx0akah";
+   version="0.3.1.10298";
+   name="veracity-0.3.1.10298";
+   hash="1mqlmh01qv6y1sd9zc89caig4j8b8h7lbrqsm4d171fq4qzgq5s5";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10286.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10298.tar.gz";
   
   
 }
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix
new file mode 100644
index 0000000000000..5a2c6287c6f58
--- /dev/null
+++ b/pkgs/applications/video/lxdvdrip/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, libdvdread }:
+
+stdenv.mkDerivation {
+  name = "lxdvdrip-1.76";
+
+  src = fetchurl {
+    url = http://download.berlios.de/lxdvdrip/lxdvdrip-1.76.tgz;
+    sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6";
+  };
+
+  prePatch = ''
+    sed -i -e s,/usr/local,$out, -e s,/etc,$out/etc,g Makefile
+    sed -i -e s,/usr/local,$out, buffer/Makefile
+    makeFlags="$makeFlags PREFIX=$out"
+  '';
+
+  preInstall = ''
+    ensureDir $out/man/man1 $out/bin $out/share $out/etc
+  '';
+
+  buildInputs = [ libdvdread ];
+
+  meta = { 
+    description = "Command line tool to make a copy from a video DVD for private use";
+    homepage = http://lxdvdrip.berlios.de/;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index ba142f4fb9e17..52cfe1e9798d3 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self : {
   propagatedBuildInputs = [X11 mtl];
   meta = {
     description = "xmonad is a tiling window manager for X";
+    homepage = http://xmonad.org/;
   };
 
   preConfigure = '' 
diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix
index d0e6e7e7492f0..769b9c1af761f 100644
--- a/pkgs/build-support/builder-defs/template-auto-callable.nix
+++ b/pkgs/build-support/builder-defs/template-auto-callable.nix
@@ -9,7 +9,7 @@ let
 
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = {
+  sourceInfo = rec {
   };
 in
 rec {
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index c3bd59f224b8c..e1427a79f0d52 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "freefont-ttf-20090104";
+  name = "freefont-ttf-20100919";
 
   src = fetchurl {
     url = "mirror://gnu/freefont/${name}.tar.gz";
-    sha256 = "13k3gm31wqa5ch14rmd3zpapckaif9bv4x82x72xaqn3n1j733ib";
+    sha256 = "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4";
   };
 
   installPhase = ''
@@ -24,5 +24,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/freefont/;
     license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 68e3e9a32e8f0..b121d30824e93 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,24 +1,25 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.2.1";
+  name = "poppler-data-0.4.3";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "0q56l5v89pnpkm1kqmwb1sx2zcx89q6bxz2hq2cpkq5f8kgvl3c9";
+    sha256 = "19jq5miinzzrzlv6696j82hr60ga2r4msk6a34s9537vid410q22";
   };
 
-  installFlags = "prefix=\${out}";
-  config_tool_name = "poppler-data-dir";
-  config_tool = ./poppler-data-dir;
-  postInstall = "
-  ensureDir \${out}/bin
-  substituteAll ${config_tool} \${out}/bin/${config_tool_name}
-  chmod +x \${out}/bin/${config_tool_name}
-  ";
+  buildInputs = [ cmake ];
+
+  postInstall = ''
+    ensureDir ''${out}/etc/profile.d
+    echo "export POPPLER_DATADIR=''${out}/share/poppler" > \
+      ''${out}/etc/profile.d/60-poppler.sh
+  '';
 
   meta = {
     homepage = http://poppler.freedesktop.org/;
     description = "Encoding files for Poppler, a PDF rendering library";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/data/misc/poppler-data/poppler-data-dir b/pkgs/data/misc/poppler-data/poppler-data-dir
deleted file mode 100644
index 0d86f54262040..0000000000000
--- a/pkgs/data/misc/poppler-data/poppler-data-dir
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo -n export POPPLER_DATADIR=@out@/share/poppler
diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix
index 5615ba74bd75f..577ed62812fa0 100644
--- a/pkgs/desktops/kde-4.4/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix
@@ -3,6 +3,7 @@
 , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
 , lm_sensors, libxklavier, libusb, libpthreadstubs, boost
 , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
+, bluez
 }:
 
 stdenv.mkDerivation {
@@ -14,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
     kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
     libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
-    phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ];
+    phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs bluez ];
   patchPhase=''
     sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
       plasma/generic/scriptengines/python/CMakeLists.txt
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 43ce2fff73173..bbd654f5da29f 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -11,7 +11,8 @@ pkgs.recurseIntoAttrs (rec {
 
   phonon = import ./support/phonon {
     inherit (pkgs) stdenv fetchurl cmake pkgconfig;
-    inherit (pkgs) qt4 xineLib pulseaudio;
+    inherit (pkgs) qt4 xineLib;
+    pulseaudio = if pkgs.getConfig ["phonon" "pulseaudioSupport"] true then pkgs.pulseaudio else null;
     inherit (pkgs.gst_all) gstreamer gstPluginsBase;
     inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
     inherit automoc4;
@@ -74,6 +75,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
     inherit kdelibs kdepimlibs kdebindings;
     inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
+    inherit (pkgs) bluez;
   };
   
   kdebase = import ./base {
@@ -156,7 +158,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost gpgme libassuan libgpgerror libxslt;
     inherit (pkgs) shared_mime_info;
     inherit (pkgs.xlibs) libXScrnSaver;
-    inherit kdelibs kdepimlibs;
+    inherit kdelibs kdepimlibs kdepim_runtime;
     inherit automoc4 phonon akonadi strigi soprano qca2;
   };
   
@@ -214,13 +216,6 @@ pkgs.recurseIntoAttrs (rec {
 
 #### EXTRA GEAR
 
-  amarok = import ./extragear/amarok {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext;
-    inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth;
-    inherit kdelibs;
-    inherit automoc4 phonon strigi soprano qca2;
-  };
-
   digikam = import ./extragear/digikam {
     inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext
       liblqr1 lensfun;
@@ -282,15 +277,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
   
-  koffice = import ./extragear/koffice {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew;
-    inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw;
-    inherit kdelibs kdepimlibs;
-    inherit automoc4 phonon qimageblitz qca2 eigen soprano;
-    poppler = pkgs.popplerQt4;
-  };
-  
-  inherit (pkgs) konversation yakuake ktorrent;
+  inherit (pkgs) konversation yakuake ktorrent koffice amarok;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
@@ -308,6 +295,10 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
 
+  konqPlugins = import ./extragear/konq-plugins {
+    inherit (pkgs) stdenv fetchurl cmake qt4 gettext;
+    inherit kdelibs automoc4 phonon kdebase;
+  };
 ### LOCALIZATION
 
   l10n = pkgs.recurseIntoAttrs (import ./l10n {
diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/builder.sh b/pkgs/desktops/kde-4.4/extragear/amarok/builder.sh
deleted file mode 100644
index c19ba33ffcfc5..0000000000000
--- a/pkgs/desktops/kde-4.4/extragear/amarok/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake
-    sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake
-}
-patchPhase=myPatchPhase
-genericBuild
diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix
deleted file mode 100644
index 87bb9a1908c71..0000000000000
--- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth
-, kdelibs, automoc4, phonon, strigi, soprano, qca2}:
-
-stdenv.mkDerivation {
-  name = "amarok-2.3.1";
-  src = fetchurl {
-    url = mirror://kde/stable/amarok/2.3.1/src/amarok-2.3.1.tar.bz2;
-    sha256 = "0wjaic35bpv6dnnv2wwrbbsqbpng5cn7xfd3ykx25yjg9d6kzvrz";
-  };
-  inherit mysql loudmouth;
-  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-  builder = ./builder.sh;
-  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth
-                  kdelibs automoc4 phonon strigi soprano qca2];
-  meta = {
-    description = "Popular music player for KDE";
-    license = "GPL";
-    homepage = http://amarok.kde.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
deleted file mode 100644
index 2bc5ea5fab8bb..0000000000000
--- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
-, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf, fftw
-, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
-
-stdenv.mkDerivation {
-  name = "koffice-2.2.0";
-  src = fetchurl {
-    url = mirror://kde/stable/koffice-2.2.0/koffice-2.2.0.tar.bz2;
-    sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba";
-  }; 
-  buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
-                  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc fftw
-                  kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
-  patches = [ ./wpd.patch ];
-  meta = {
-    description = "KDE integrated Office Suite";
-    license = "GPL";
-    homepage = http://www.koffice.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix b/pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix
new file mode 100644
index 0000000000000..7b2a585e46536
--- /dev/null
+++ b/pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase, gettext  }:
+
+stdenv.mkDerivation rec {
+  name = "konq-plugins-${version}";
+  version = "4.4.0";
+
+  src = fetchurl { 
+    url = http://ftp.riken.go.jp/pub/FreeBSD/distfiles/KDE/extragear/konq-plugins-4.4.0.tar.bz2;
+    sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi";
+  };
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ];
+
+  meta = with stdenv.lib; {
+    description = "Various plugins for Konqueror";
+    license = "GPL";
+    homepage = http://kde.org/;
+    maintainers = [ maintainers.phreedom ];
+    platforms =  kdelibs.meta.platforms;
+  };
+}
diff --git a/pkgs/desktops/kde-4.4/pim/default.nix b/pkgs/desktops/kde-4.4/pim/default.nix
index 6d8588146dac7..29151117d1380 100644
--- a/pkgs/desktops/kde-4.4/pim/default.nix
+++ b/pkgs/desktops/kde-4.4/pim/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt
 , shared_mime_info, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
+, kdelibs, kdepimlibs, kdepim_runtime, automoc4, phonon, akonadi, strigi, soprano, qca2}:
 
 stdenv.mkDerivation {
   name = "kdepim-4.4.5";
@@ -8,11 +8,18 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.4.5/src/kdepim-4.4.5.tar.bz2;
     sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp";
   };
-  builder = ./builder.sh;  
+
   cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
                   shared_mime_info libXScrnSaver
                   kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
+  patchPhase = ''
+      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
+  '';
+  postInstall = ''
+      mkdir -p $out/nix-support/
+      echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
+  '';
   meta = {
     description = "KDE PIM tools";
     longDescription = ''
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index fc15d1f54bb6f..79d9036e2adb0 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -135,10 +135,15 @@
     kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
   };
 
-  #kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
-  kdepim_runtime = callPackage ./pim-runtime { };
-  kdepim = callPackage ./pim { };
+  kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
+  kdepim = callPackage ../kde-4.4/pim { };
+
+  # Experimental 4.5 versions
+  kdepim_runtime45 = callPackage ./pim-runtime { };
+  kdepim45 = callPackage ./pim { };
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
+
+  l10n = callPackage ./l10n { };
 }
diff --git a/pkgs/desktops/kde-4.5/l10n/default.nix b/pkgs/desktops/kde-4.5/l10n/default.nix
new file mode 100644
index 0000000000000..b29df0f59378a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/l10n/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4 }:
+
+let
+  overrides = { };
+
+  defaultVersion = "4.5.1";
+
+  getOverride = name: stdenv.lib.attrByPath [name] {} overrides;
+
+  kdeL10nDerivation = {lang, sha256, version} :
+    let
+      name = "kde-l10n-${lang}-${version}";
+    in
+    stdenv.mkDerivation ({
+      inherit name;
+      src = fetchurl {
+        url = "mirror://kde/stable/${version}/src/kde-l10n/${name}.tar.bz2";
+        inherit sha256;
+      };
+
+      buildInputs = [ cmake perl gettext kdelibs automoc4 ];
+
+      meta = {
+        description = "KDE translation for ${lang}";
+        license = "GPL";
+        inherit (kdelibs.meta) maintainers platforms homepage;
+      };
+    }
+    // (getOverride lang) // (getOverride name)
+  );
+in
+{
+  inherit kdeL10nDerivation;
+  recurseForDerivations = true;
+}
+// (builtins.listToAttrs (
+  map (a@{lang, version, sha256} :
+      {
+        name = stdenv.lib.replaceChars ["." "@"] ["_" "_"] "${lang}_${version}";
+        value = kdeL10nDerivation a;
+      }
+    ) (import ./manifest.nix)
+))
+// (builtins.listToAttrs (
+  map (a@{lang, version, sha256} :
+      {
+        name = stdenv.lib.replaceChars ["." "@"] ["_" "_"] "${lang}";
+        value = kdeL10nDerivation a;
+      }
+    ) (stdenv.lib.filter (x : x.version == defaultVersion) (import ./manifest.nix))
+))
diff --git a/pkgs/desktops/kde-4.5/l10n/manifest.nix b/pkgs/desktops/kde-4.5/l10n/manifest.nix
new file mode 100644
index 0000000000000..8e890f54e3d9c
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/l10n/manifest.nix
@@ -0,0 +1,277 @@
+[
+{
+  lang = "ar";
+  version = "4.5.1";
+  sha256 = "0xgmrwlza3p2fvj66y4vc4r81r5y2n2igjaj2xmgvb2pvh4zx0ws";
+}
+{
+  lang = "bg";
+  version = "4.5.1";
+  sha256 = "1npa9y8i7j68c8sa9cd96gy4n65bkl474agibax8rdk2mniyqrn9";
+}
+{
+  lang = "ca";
+  version = "4.5.1";
+  sha256 = "0097sk50cf1cq6wnah3kiab8vkh68snzahcng2blk63gw908yfvx";
+}
+{
+  lang = "ca@valencia";
+  version = "4.5.1";
+  sha256 = "1nfj4pgh4k7ld42arlw8vkh646mar615x7r0av02gskdgmixzqm8";
+}
+{
+  lang = "cs";
+  version = "4.5.1";
+  sha256 = "077424cbqn68rf9wb026ip1n0rq5lz1iwp4k7ih15j87ymbrd03f";
+}
+{
+  lang = "da";
+  version = "4.5.1";
+  sha256 = "0p80a2pn9hgih2y5s27z8ir8jkyz68i87sdw439c8z3pjww5dy2h";
+}
+{
+  lang = "de";
+  version = "4.5.1";
+  sha256 = "007r6wf0in22y2jc1nr1msazv6bd48136kc4q0633gn1igdhb03h";
+}
+{
+  lang = "el";
+  version = "4.5.1";
+  sha256 = "1ffgqjxgdfsjx0nwhj5yl2pn2kmc92s01wfxzdvb6kss9r53v95k";
+}
+{
+  lang = "en_GB";
+  version = "4.5.1";
+  sha256 = "1bmg1aygaarnpka9dfvxgnzwqphqaly8rfps63g03ncls7ml8ilb";
+}
+{
+  lang = "eo";
+  version = "4.5.1";
+  sha256 = "0bqrarah2pc6kjcfla117rwc0k1m23ndp4nm4ac2sygmanz1j6bk";
+}
+{
+  lang = "es";
+  version = "4.5.1";
+  sha256 = "0hr3halsjjdzlmx2rfxycacm26pxs1f3m8awahmr1dp5ngid42wn";
+}
+{
+  lang = "et";
+  version = "4.5.1";
+  sha256 = "1pj1wjnjjj052csn0ajql2i3ynpd4fc9l53zj4j3vsd177gypdjw";
+}
+{
+  lang = "eu";
+  version = "4.5.1";
+  sha256 = "0zhrqy8b7wn8vdq75dlafc91mhvqpn3cw7hn90jj99c1aazdhjpd";
+}
+{
+  lang = "fi";
+  version = "4.5.1";
+  sha256 = "0x0dhy1c7wn5wxqx2v7jyv10rc6gi6klmw0q80vp3xpfma9l16yg";
+}
+{
+  lang = "fr";
+  version = "4.5.1";
+  sha256 = "1yvzpvxdzznrj61hdbi9jgpxdb9l0i8g24q1xkswpnp87jrncpaq";
+}
+{
+  lang = "fy";
+  version = "4.5.1";
+  sha256 = "14c740yfw5v043rmqmwnb3ic0s7l2kcjy57qdqhfpmr75m4rjrvl";
+}
+{
+  lang = "ga";
+  version = "4.5.1";
+  sha256 = "0w5cj0bgyy2pna8hqcpx82n3pwzr9vzshzknz86azb8c0pwkcjdw";
+}
+{
+  lang = "gl";
+  version = "4.5.1";
+  sha256 = "00kwqzypkw0bi8nhz75a367h2filwkmc1kiiv66l2s3d4vrkdgjz";
+}
+{
+  lang = "gu";
+  version = "4.5.1";
+  sha256 = "0as072rz4k4h8b0ix8jipn6bfck8van024sz1gd6xj1bhs83wk0m";
+}
+{
+  lang = "he";
+  version = "4.5.1";
+  sha256 = "1f5j1qgkmzjagmyjxa00xmfxk5zgfms77gidg88hycrvgrxm6g59";
+}
+{
+  lang = "hi";
+  version = "4.5.1";
+  sha256 = "0sy6cis0hkddmq4jw43a7rpxjadmzrgbgyhnnhyp9m6n225rh54g";
+}
+{
+  lang = "hr";
+  version = "4.5.1";
+  sha256 = "016h7iqfkarl6p20gqcajknw3bsbqvby824fsdyrrhan82vsqd0k";
+}
+{
+  lang = "hu";
+  version = "4.5.1";
+  sha256 = "1ck6vrrvvwlcxlgmmjq4hk5dh38clqvf3fwc7ndgr4wrxlr4c94m";
+}
+{
+  lang = "ia";
+  version = "4.5.1";
+  sha256 = "13mnd7ndkfdq591da3cwj64wchq86qk265i6r7xir87gxn5m86xr";
+}
+{
+  lang = "id";
+  version = "4.5.1";
+  sha256 = "0a1rw0mx1fdmps5vfx7m8mrmsqvqkpdbpbwys9sxbxy1zcbinasr";
+}
+{
+  lang = "is";
+  version = "4.5.1";
+  sha256 = "0hinhxsq4nm4g97gcdfyx8fzx6d0syg9llww9spwpqp26myad69r";
+}
+{
+  lang = "it";
+  version = "4.5.1";
+  sha256 = "0z4kdlmyliqa6qgdxbimifp535p6nvvydpa504i9klxcywc382y5";
+}
+{
+  lang = "ja";
+  version = "4.5.1";
+  sha256 = "1vsyjgwh69wwadn27ncxmr85d1qn91xvrbfxxl8x9gqa44dzrs7k";
+}
+{
+  lang = "kk";
+  version = "4.5.1";
+  sha256 = "1nzx2djxav6hga6ha473xkqiqgv8ikh3iq3b7i20zqcsjp3lhynq";
+}
+{
+  lang = "km";
+  version = "4.5.1";
+  sha256 = "0rd36apjlgq3qvhbdq0a289hbn1hff1qbnphaisy1p1dsh3bbnw9";
+}
+{
+  lang = "kn";
+  version = "4.5.1";
+  sha256 = "0al7whnmcpiq50b56xhzxpd6zmwv79s5j62m6z537kl3ldq9is5l";
+}
+{
+  lang = "ko";
+  version = "4.5.1";
+  sha256 = "0s5y6h8nx4xp5vd39qpby303zsvi67yrbdzsgvig98gbw61szkd7";
+}
+{
+  lang = "lt";
+  version = "4.5.1";
+  sha256 = "0wmwfn7w6z1lvjgn283rcpxv8j6lh8yzkvgjmhdg2r4ys948gzz0";
+}
+{
+  lang = "lv";
+  version = "4.5.1";
+  sha256 = "1w4k7rr06m0ynl52gdikqw45754pj7z9n65pxyv88gxj5sjkzlw8";
+}
+{
+  lang = "ml";
+  version = "4.5.1";
+  sha256 = "1qgs6xwyx1sc496ybq1m1mm0wyl9fz6317p4m5jvwiicldrcx3hq";
+}
+{
+  lang = "nb";
+  version = "4.5.1";
+  sha256 = "0frnnxang8k491cnmn9lc2kbqkqr5m40c53d75l07j97jndv98y1";
+}
+{
+  lang = "nds";
+  version = "4.5.1";
+  sha256 = "1p3h86qzrrhxrvl4qryizm3j6lnq3lm1vpnnapkk04y7msz0fdpr";
+}
+{
+  lang = "nl";
+  version = "4.5.1";
+  sha256 = "0lphl2j0faalaj3mkkqv5806bg2fd6s1478cprrrkw788hvvlmzl";
+}
+{
+  lang = "nn";
+  version = "4.5.1";
+  sha256 = "06pj24zfsgbkk1jxjjs5by8czv0llfz90iq6rq4lxnc0s195isjg";
+}
+{
+  lang = "pa";
+  version = "4.5.1";
+  sha256 = "1sqqanvxzw63bdlkgvi6jlngvrshqrfl8d0jac103wvy4y4f6l5r";
+}
+{
+  lang = "pl";
+  version = "4.5.1";
+  sha256 = "13n278n3p32bphch54x7qgba268m95kmql3qgxsx8ziy8riir9mm";
+}
+{
+  lang = "pt";
+  version = "4.5.1";
+  sha256 = "12mkprpk9imda0iyi65mg4rs3w2qnyq8iszg0k7yqf7537zpv4x1";
+}
+{
+  lang = "pt_BR";
+  version = "4.5.1";
+  sha256 = "1ipn6kvc3nq84fvpb9xrpwkqjaj2sya3y1cr2ai51909yfjk5r35";
+}
+{
+  lang = "ro";
+  version = "4.5.1";
+  sha256 = "1kfyjlpkjnmv7fryr1w2a9d1dijkmhs3mqpqg0hi7316qy2z10jy";
+}
+{
+  lang = "ru";
+  version = "4.5.1";
+  sha256 = "0m62rszff2k4rffmy3h9hxhs8bf523cfinlyay663zq3bh35i6h9";
+}
+{
+  lang = "sk";
+  version = "4.5.1";
+  sha256 = "07pzslmln8yh0s8ik0bj86rhyy4w21w13pvf9z6ifapqigklw33c";
+}
+{
+  lang = "sl";
+  version = "4.5.1";
+  sha256 = "1vrdzbl5ii6paaick88dkr5fabjpi36gjwwz67kqy6d9nm44jjp1";
+}
+{
+  lang = "sr";
+  version = "4.5.1";
+  sha256 = "186ncq0hr0lrn1l6xhqwjwqrmd9xw9qa0kf9cqvj0x3j6qk4mjqf";
+}
+{
+  lang = "sv";
+  version = "4.5.1";
+  sha256 = "0r62fs75a1kfr2dsfg1zrzh0c2wgbv6jq4c1w05wcbmqvpq16ks6";
+}
+{
+  lang = "th";
+  version = "4.5.1";
+  sha256 = "1apvlcmbwhnjc3dlfjzah1ckwwhjn2rcrvgmv1rwvn9py7yfzhf5";
+}
+{
+  lang = "tr";
+  version = "4.5.1";
+  sha256 = "0zci2fqcnlj9y23sy7v8yb1nc37dfqbpj1xrfs7sfvhj12048sb0";
+}
+{
+  lang = "uk";
+  version = "4.5.1";
+  sha256 = "0p9jdz8w8xiiqhbsj90gkshcpijh2l8hfbvvqy12d1nx5wb1glp3";
+}
+{
+  lang = "wa";
+  version = "4.5.1";
+  sha256 = "06hybn2l2jlibxr6lg91p0p7nnc6lyisx0w64zar52h958mqa9p8";
+}
+{
+  lang = "zh_CN";
+  version = "4.5.1";
+  sha256 = "1f786n41yqfi02gd0n9lf30xn9djgbm26c8kqx8p7fm2b5vw28jh";
+}
+{
+  lang = "zh_TW";
+  version = "4.5.1";
+  sha256 = "065d2ggahphsffk7p8xb9p5xzm12azz84s9jll447sawwks0jgsg";
+}
+]
diff --git a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
index 2b371036358df..5ab82dd4293da 100644
--- a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
+++ b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
@@ -8,7 +8,7 @@ kde.package {
   meta = {
     description = "A KDE 4 project template generator";
     kde = {
-      name = "cervisia";
+      name = "kapptemplate";
       module = "kdesdk";
       version = "0.1";
       release = "4.5.1";
diff --git a/pkgs/desktops/kde-4.5/support/soprano/default.nix b/pkgs/desktops/kde-4.5/support/soprano/default.nix
index 923c719b43208..62832861a3635 100644
--- a/pkgs/desktops/kde-4.5/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.5/support/soprano/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.5.0";
+  name = "soprano-2.5.2";
 
   src = fetchurl {
-    url = "mirror://sf/soprano/${name}.tar.bz2";
-    sha256 = "01g0shwxksr6mg2g1pj1pbwz6nir5rw16ysmmly85891p62j8nxn";
+    url = "mirror://sourceforge/soprano/${name}.tar.bz2";
+    sha256 = "17k17hrcwij2plms4hb0j6994ar9kcxykf699iyiggfpj1zg7nym";
   };
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
index 5884c5ea6924a..24d0c43a39ccd 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -11,4 +11,9 @@ stdenv.mkDerivation {
 
   inherit jre;
   buildInputs = [jre];
+
+  meta = {
+    homepage = http://www.eclipse.org/aspectj/;
+    description = "A seamless aspect-oriented extension to the Java programming language";
+  };
 }
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
new file mode 100644
index 0000000000000..99c59df3b7108
--- /dev/null
+++ b/pkgs/development/compilers/epic/default.nix
@@ -0,0 +1,14 @@
+{cabal, mtl, happy, gmp, boehmgc}:
+
+cabal.mkDerivation (self : {
+  pname = "epic";
+  version = "0.1.5";
+  sha256 = "5a3d94e88cb85beb3c13f3b9f3c00c6768e1b067ff88d40ea63d9961a92347ff";
+  propagatedBuildInputs = [mtl];
+  extraBuildInputs = [happy gmp boehmgc];
+  meta = {
+    description = "An experimental language with full dependent types";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
new file mode 100644
index 0000000000000..ba779c07254df
--- /dev/null
+++ b/pkgs/development/compilers/eql/default.nix
@@ -0,0 +1,87 @@
+x@{builderDefsPackage
+  , fetchgit, qt4, ecl
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    ["fetchgit"];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    method = "fetchgit";
+    rev = "7bd32f49c9965d8f7dc262a0f265b153b0a81ced";
+    url = "git://gitorious.org/eql/eql";
+    hash = "f5f34b1a76f65b707446cd9bee4d7cef3b6f9b5b5d8d16fcccb70dbf855c2adf";
+    version = rev;
+    name = "eql-git-${version}";
+  };
+in
+rec {
+  srcDrv = a.fetchgit {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+    rev = sourceInfo.rev;
+  };
+  src = srcDrv + "/";
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["setVars" "fixPaths" "buildEQLLib" "doQMake" "doMake" "buildLibEQL" "doDeploy"];
+
+  setVars = a.fullDepEntry (''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+  '') [];
+
+  fixPaths = a.fullDepEntry (''
+    sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp
+  '') ["minInit" "doUnpack"];
+
+  buildEQLLib = a.fullDepEntry (''
+    cd src
+    ecl -shell make-eql-lib.lisp
+  '') ["doUnpack" "addInputs"];
+
+  doQMake = a.fullDepEntry (''
+    qmake
+  '') ["addInputs"];
+
+  buildLibEQL = a.fullDepEntry (''
+    sed -i eql.pro -e 's@#CONFIG += eql_dll@CONFIG += eql_dll@'
+    qmake
+    make
+  '') ["doUnpack" "addInputs"];
+
+  doDeploy = a.fullDepEntry (''
+    cd ..
+    ensureDir $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
+    cp -r . $out/lib/eql/build-dir
+    ln -s $out/lib/eql/build-dir/eql $out/bin
+    ln -s $out/lib/eql/build-dir/src/*.h $out/include
+    ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen
+    mv $out/lib/eql/build-dir/my_app/libeql*.so* $out/lib
+  '') ["minInit" "defEnsureDir"];
+
+  meta = {
+    description = "Embedded Qt Lisp (ECL+Qt)";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://password-taxi.at/EQL";
+      method = "fetchgit";
+      rev = "370b7968fd73d5babc81e35913a37111a788487f";
+      url = "git://gitorious.org/eql/eql";
+      hash = "2370e111d86330d178f3ec95e8fed13607e51fed8859c6e95840df2a35381636";
+    };
+    inherit srcDrv;
+  };
+}) x
+
diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix
new file mode 100644
index 0000000000000..e4840eb2d20a9
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.0.1.nix
@@ -0,0 +1,84 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "7.0.1-rc1";
+  
+  name = "ghc-${version}";
+  
+  # TODO: Does this have to be here, or can it go to meta?
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20100924-src.tar.bz2";
+    sha256 = "14b3cg4i805798v0rasr16nja70k68vp34qar0pv2vbwcl39apv5";
+  };
+
+  buildInputs = [ghc perl gmp ncurses];
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+    ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  # TODO: requires a comment as to what it does and why it is needed.
+  passthru = {
+    corePackages = [
+       [ "Cabal" "1.8.0.2" ]
+       [ "array" "0.3.0.0" ]
+       [ "base" "3.0.3.2" ]
+       [ "base" "4.2.0.0" ]
+       [ "bin-package-db" "0.0.0.0" ]
+       [ "bytestring" "0.9.1.5" ]
+       [ "containers" "0.3.0.0" ]
+       [ "directory" "1.0.1.0" ]
+       [ "dph-base" "0.4.0" ]
+       [ "dph-par" "0.4.0" ]
+       [ "dph-prim-interface" "0.4.0" ]
+       [ "dph-prim-par" "0.4.0" ]
+       [ "dph-prim-seq" "0.4.0" ]
+       [ "dph-seq" "0.4.0" ]
+       [ "extensible-exceptions" "0.1.1.1" ]
+       [ "ffi" "1.0" ]
+       [ "filepath" "1.1.0.3" ]
+       [ "ghc" "6.12.1" ]
+       [ "ghc-binary" "0.5.0.2" ]
+       [ "ghc-prim" "0.2.0.0" ]
+       [ "haskell98" "1.0.1.1" ]
+       [ "hpc" "0.5.0.4" ]
+       [ "integer-gmp" "0.2.0.0" ]
+       [ "old-locale" "1.0.0.2" ]
+       [ "old-time" "1.0.0.3" ]
+       [ "pretty" "1.0.1.1" ]
+       [ "process" "1.0.1.2" ]
+       [ "random" "1.0.0.2" ]
+       [ "rts" "1.0" ]
+       [ "syb" "0.1.0.2" ]
+       [ "template-haskell" "2.4.0.0" ]
+       [ "time" "1.1.4" ]
+       [ "unix" "2.4.0.0" ]
+       [ "utf8-string" "0.3.4" ]
+    ];
+  };
+}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
new file mode 100644
index 0000000000000..e24e1aaebcb10
--- /dev/null
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -0,0 +1,84 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "6.13.20100917";
+  
+  name = "ghc-${version}";
+  
+  # TODO: Does this have to be here, or can it go to meta?
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
+    sha256 = "0b5pg6688yfzd5zfaffjp21y933vp94h94ds85gwi156f4g3bkij";
+  };
+
+  buildInputs = [ghc perl gmp ncurses];
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+    ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  # TODO: requires a comment as to what it does and why it is needed.
+  passthru = {
+    corePackages = [
+       [ "Cabal" "1.8.0.2" ]
+       [ "array" "0.3.0.0" ]
+       [ "base" "3.0.3.2" ]
+       [ "base" "4.2.0.0" ]
+       [ "bin-package-db" "0.0.0.0" ]
+       [ "bytestring" "0.9.1.5" ]
+       [ "containers" "0.3.0.0" ]
+       [ "directory" "1.0.1.0" ]
+       [ "dph-base" "0.4.0" ]
+       [ "dph-par" "0.4.0" ]
+       [ "dph-prim-interface" "0.4.0" ]
+       [ "dph-prim-par" "0.4.0" ]
+       [ "dph-prim-seq" "0.4.0" ]
+       [ "dph-seq" "0.4.0" ]
+       [ "extensible-exceptions" "0.1.1.1" ]
+       [ "ffi" "1.0" ]
+       [ "filepath" "1.1.0.3" ]
+       [ "ghc" "6.12.1" ]
+       [ "ghc-binary" "0.5.0.2" ]
+       [ "ghc-prim" "0.2.0.0" ]
+       [ "haskell98" "1.0.1.1" ]
+       [ "hpc" "0.5.0.4" ]
+       [ "integer-gmp" "0.2.0.0" ]
+       [ "old-locale" "1.0.0.2" ]
+       [ "old-time" "1.0.0.3" ]
+       [ "pretty" "1.0.1.1" ]
+       [ "process" "1.0.1.2" ]
+       [ "random" "1.0.0.2" ]
+       [ "rts" "1.0" ]
+       [ "syb" "0.1.0.2" ]
+       [ "template-haskell" "2.4.0.0" ]
+       [ "time" "1.1.4" ]
+       [ "unix" "2.4.0.0" ]
+       [ "utf8-string" "0.3.4" ]
+    ];
+  };
+}
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index e8afd86463db0..7840c56010ede 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,24 +1,15 @@
-{fetchdarcs, cabal, mtl, parsec, readline, ivor, happy}:
+{cabal, mtl, parsec, readline, ivor, epic, happy}:
 
 cabal.mkDerivation (self : {
   pname = "idris";
   name = self.fname;
-  version = "0.1.2";
-  src = fetchdarcs {
-    url = http://www-fp.dcs.st-and.ac.uk/~eb/darcs/Idris;
-    sha256 = "de50ed4bedacee36d9942bf4db90deca3915cf6c106aa834d11e83972b2b639a";
-    context = ./idris.context;
-  };
-  propagatedBuildInputs = [mtl parsec readline ivor];
+  version = "0.1.5";
+  sha256 = "8acdfc22ba2e68b6c1832c2d5fcf11405df9416ba2c193f564b6f98710e9813e";
+  propagatedBuildInputs = [mtl parsec readline ivor epic];
   extraBuildInputs = [happy];
-  preConfigure = ''
-    echo "module Idris.Prefix where prefix = \"$out\"" > Idris/Prefix.hs
-  '';
-  postInstall = ''
-    ensureDir $out/lib/idris
-    install lib/*.idr lib/*.e $out/lib/idris
-  '';
   meta = {
     description = "An experimental language with full dependent types";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })
diff --git a/pkgs/development/compilers/idris/idris.context b/pkgs/development/compilers/idris/idris.context
deleted file mode 100644
index fad6749988358..0000000000000
--- a/pkgs/development/compilers/idris/idris.context
+++ /dev/null
@@ -1,586 +0,0 @@
-
-Context:
-
-[Missed SCTrans source!
-eb@cs.st-andrews.ac.uk**20090511120315] 
-
-[Put RunIO in a more sensible place
-eb@cs.st-andrews.ac.uk**20090426144418] 
-
-[Update cabal details
-eb@cs.st-andrews.ac.uk**20090426144101] 
-
-[Convert things which look like Nats to Nats for optimisation
-eb@cs.st-andrews.ac.uk**20090423220551] 
-
-[Basic Nat optimisation
-eb@cs.st-andrews.ac.uk**20090423185609] 
-
-[need to check if arguments are still needed to discriminate on collapsing
-eb@cs.st-andrews.ac.uk**20090309174234] 
-
-[Using knowledge of collapsing to help forcing
-eb@cs.st-andrews.ac.uk**20090309153744] 
-
-[Make transforms part of state, and display of optimised terms
-eb@cs.st-andrews.ac.uk**20090309145419] 
-
-[Prettier time formatting
-eb@cs.st-andrews.ac.uk**20090309131334] 
-
-[Don't just crash if the command is invalid...
-eb@cs.st-andrews.ac.uk**20090309125424] 
-
-[Added global options
-eb@cs.st-andrews.ac.uk**20090309124541
- :o sets, :o f- or :o f+ to turn forcing/collapsing off/on
- :o r- or :o r+ to turn display of compile/run times off/on
-] 
-
-[Added collapsing optimisation
-eb@cs.st-andrews.ac.uk**20090309112238] 
-
-[Added unused argument elimination
-eb@cs.st-andrews.ac.uk**20090309004741
- Can fit within the optimisation framework, but you need to remember
- the transforms so far at each definition for maximum effect.
-] 
-
-[(Failed) effort at argument erasure
-eb@cs.st-andrews.ac.uk**20090308222948
- Trying to get it into the same framework as constructor transformations,
- but it isn't going to happen that easily.
-] 
-
-[Added forcing optimisation
-eb@cs.st-andrews.ac.uk**20090308164110] 
-
-[Decide tactic works out its arguments
-eb@cs.st-andrews.ac.uk**20090305165743] 
-
-[Allow redefining of do notation
-eb@cs.st-andrews.ac.uk**20090228164646] 
-
-[lookupIdx fix
-eb@cs.st-andrews.ac.uk**20090227231257] 
-
-[Added 'using' syntax
-eb@cs.st-andrews.ac.uk**20090226003439
- For blocks where lots of things use the same implicit arguments, saving
- lots of typing and clutter.
- (also allowed forward declaration of datatypes)
-] 
-
-[Fix conflict
-eb@cs.st-andrews.ac.uk**20090107121727] 
-
-[Laziness annotations
-eb@cs.st-andrews.ac.uk**20090107121328] 
-
-[Added decide tactic
-eb@cs.st-andrews.ac.uk**20081220221809] 
-
-[Add 'collapsible' flag
-eb@cs.st-andrews.ac.uk**20081219180742] 
-
-[Add TODO
-eb@cs.st-andrews.ac.uk**20081219180726] 
-
-[Some compiler fiddling
-eb@cs.st-andrews.ac.uk**20081219155920] 
-
-[Keep track of names which are still to be proved
-eb@cs.st-andrews.ac.uk**20081219143302] 
-
-[File operations
-eb@cs.st-andrews.ac.uk**20081218233527] 
-
-[Can allow the system to make up names for metavariables
-eb@cs.st-andrews.ac.uk**20081218233428] 
-
-[Deal with c includes and external libraries
-eb@cs.st-andrews.ac.uk**20081126150921] 
-
-[Fix foreign functions for IO
-eb@cs.st-andrews.ac.uk**20081102153832] 
-
-[Added Ptr primitive
-eb@cs.st-andrews.ac.uk**20081102134232] 
-
-[Add unsafePerformIO
-eb@cs.st-andrews.ac.uk**20081019171546
- Mostly meant for pure foreign functions, but of course you're free to abuse
- it as you like...
-] 
-
-[Add flags on functions to denote special behaviour
-eb@cs.st-andrews.ac.uk**20081019160020
- Specifically, so far:
- * %nocg  Never generate code when compling
- * %eval  Evaluate completely before compiling
- 
- This allows some 'meta-programs' to be written, which are fully evaluated
- before compiling. We use this for defining foreign functions easily.
-] 
-
-[Record paper changes!
-eb@cs.st-andrews.ac.uk**20080916170851] 
-
-[Added 'use' tactic
-eb@cs.st-andrews.ac.uk**20080916170742
- Like 'believe' but instead of just believing the value, adds subgoals for
- each required equality proof.
-] 
-
-[More of paper
-eb@cs.st-andrews.ac.uk**20080901161738] 
-
-[Added paper macros
-eb@cs.st-andrews.ac.uk**20080901094433] 
-
-[Starting on paper
-eb@cs.st-andrews.ac.uk**20080829091345] 
-
-[Compiling 'Foreign' constructor (but only when inline)
-eb@cs.st-andrews.ac.uk**20080826123458] 
-
-[Generate Idris functions from foreign function descriptions
-eb@cs.st-andrews.ac.uk**20080825164523] 
-
-[Some work towards constructor optimisations
-eb@cs.st-andrews.ac.uk**20080825094709] 
-
-[Basic foreign function framework
-eb@cs.st-andrews.ac.uk**20080825094631] 
-
-[Added test transformation on Vects
-eb@cs.st-andrews.ac.uk**20080731155217] 
-
-[Transformation application
-eb@cs.st-andrews.ac.uk**20080730125618] 
-
-['noElim' flag to allow big data types not to need elimination rules
-eb@cs.st-andrews.ac.uk**20080729125140] 
-
-[Added __toInt and __toString
-eb@cs.st-andrews.ac.uk**20080710151313
- Hacky for now, until we work out a nice way of doing coercions between
- primitives. But it makes some programs, like those which ask for an int
- as input, possible.
-] 
-
-[If an operator returns a boolean, the compiler had better make code to build a boolean!
-eb@cs.st-andrews.ac.uk**20080710145313] 
-
-[Deal with weird names that Ivor generates in the compiler
-eb@cs.st-andrews.ac.uk**20080709112032] 
-
-[Some Nat theorems
-eb@cs.st-andrews.ac.uk**20080709014158] 
-
-[Generalise tactic
-eb@cs.st-andrews.ac.uk**20080709014121] 
-
-[Need to give all the definitions to addIvor
-eb@cs.st-andrews.ac.uk**20080708203624] 
-
-[Don't crash when there's an error in input!
-eb@cs.st-andrews.ac.uk**20080708182610] 
-
-[Only allow 'believe' to rewrite values
-eb@cs.st-andrews.ac.uk**20080708165140
- This way at least the types have to be right before '?=' defined
- programs will run.
-] 
-
-[Added 'believe' tactic
-eb@cs.st-andrews.ac.uk**20080708160736
- For allowing the testing of programs before a complete proof term
- exists. Obviously programs built this way are not trustworthy! They make
- use of a "Suspend_Disbelief" function which just invents a rewrite rule
- that works, but which doesn't have a proof.
-] 
-
-[Added '?=' syntax
-eb@cs.st-andrews.ac.uk**20080708140505
- If you have a pattern clause, and don't know the definite type of the
- right hand side, use;
- foo patterns ?= def; [theoremName]
- 
- This will add a theorem called theoremName which fixes up the type,
- and you can prove it later, via :p or with the 'proof' syntax. Useful
- if you want to hide details of the proof of a necessary rewriting.
-] 
-
-[Catch errors in proofs, and allow abandoning
-eb@cs.st-andrews.ac.uk**20080708123202] 
-
-[Identify parameters of data types to make elimination rule properly
-eb@cs.st-andrews.ac.uk**20080708105930] 
-
-[Reading of proof scripts
-eb@cs.st-andrews.ac.uk**20080707010718] 
-
-[Add Undo, require % before tactics, and output script when done
-eb@cs.st-andrews.ac.uk**20080707004642] 
-
-[Rudimentary theorem prover now working
-eb@cs.st-andrews.ac.uk**20080706235523] 
-
-[Parsing tactics and proofs
-eb@cs.st-andrews.ac.uk**20080706222536] 
-
-[Adding some tactics
-eb@cs.st-andrews.ac.uk**20080706211202] 
-
-[Added :e command and call to epic
-eb@cs.st-andrews.ac.uk**20080702115125] 
-
-[forking needs the argument to be lazily evaluated
-eb@cs.st-andrews.ac.uk**20080630141845] 
-
-[Added threading to compiler
-eb@cs.st-andrews.ac.uk**20080630130045] 
-
-[Compiling IORefs
-eb@cs.st-andrews.ac.uk**20080630123521] 
-
-[Add Prelude.e, and prepend it to epic output
-eb@cs.st-andrews.ac.uk**20080630113450] 
-
-[Added Prover.lhs (not that it does much yet)
-eb@cs.st-andrews.ac.uk**20080623231341] 
-
-[Fix constructor expansion
-eb@cs.st-andrews.ac.uk**20080623111226] 
-
-[Got the basic compilation working
-eb@cs.st-andrews.ac.uk**20080622233141] 
-
-[Added proof token to Lexer
-eb@cs.st-andrews.ac.uk**20080516140747
- (not doing anything yet, it needs a separate parser)
- Also fix minor lexing error, and added ':i' command to drop into Ivor
- for debugging purposes.
-] 
-
-[Added 'normalise' command
-eb@cs.st-andrews.ac.uk**20080523140332
- Useful if you want to normalise an IO computation without running it.
-] 
-
-[Small implicit argument change
-eb@cs.st-andrews.ac.uk**20080513231721
- {a,b,c} now allowed (i.e no need for type label as in {a,b,c:_}
- Also, implicit arguments can now, syntactically, only appear at the
- left of types of top level declarations (since that is the only place they
- make sense with our simple way of handling such arguments).
-] 
-
-['!' to stop implicit arguments being added to a name
-eb@cs.st-andrews.ac.uk**20080513215523] 
-
-[Outputting Epic code
-eb@cs.st-andrews.ac.uk**20080511173955
- Still some things to sort out before this runs though
-] 
-
-[Removing IO boiler plate for compilation
-eb@cs.st-andrews.ac.uk**20080510170038] 
-
-[Lambda lifter
-eb@cs.st-andrews.ac.uk**20080509161049] 
-
-[Oops, broke the build *again*
-eb@cs.st-andrews.ac.uk**20080508220834] 
-
-[Data type for result of lambda lifting
-eb@cs.st-andrews.ac.uk**20080508214635] 
-
-[Compiler part 1 (pattern matching)
-eb@cs.st-andrews.ac.uk**20080508200113] 
-
-[partition
-eb@cs.st-andrews.ac.uk**20080508132348] 
-
-[Let's try not to apply patches which break the build...
-eb@cs.st-andrews.ac.uk**20080508111341] 
-
-[Patterns representation
-eb@cs.st-andrews.ac.uk**20080508110025] 
-
-[Added append to library
-eb@cs.st-andrews.ac.uk**20080429111614] 
-
-[Begin planning compiler
-eb@cs.st-andrews.ac.uk**20080414123534] 
-
-[brief note
-eb@cs.st-andrews.ac.uk**20080414103207] 
-
-[Minor LaTeX improvement
-eb@cs.st-andrews.ac.uk**20080330151806
- Output placeholders correctly. Can you tell I'm writing a paper ;).
-] 
-
-[Even more LaTeX fixes
-eb@cs.st-andrews.ac.uk**20080327115445] 
-
-[Fix some LaTeXing
-eb@cs.st-andrews.ac.uk**20080327113804] 
-
-[Some latex tidying
-eb@cs.st-andrews.ac.uk**20080325114709] 
-
-[Latex of do notating
-eb@cs.st-andrews.ac.uk**20080325110051] 
-
-[Add %latex directive to parser
-eb@cs.st-andrews.ac.uk**20080325105552] 
-
-[Allow giving latex commands for particular names in :l
-eb@cs.st-andrews.ac.uk**20080325103351] 
-
-[Basic LaTeX generation working
-eb@cs.st-andrews.ac.uk**20080324185632] 
-
-[Started LaTeX generation
-eb@cs.st-andrews.ac.uk**20080324170817] 
-
-[Implement :t in REPL
-eb@cs.st-andrews.ac.uk**20080324143135] 
-
-[Use readline for REPL, add :commands
-eb@cs.st-andrews.ac.uk**20080324141759] 
-
-[Oops, didn't mean to record the trace
-eb@cs.st-andrews.ac.uk**20080322115632] 
-
-[Allow types on bindings in do notation
-eb@cs.st-andrews.ac.uk**20080322114909] 
-
-[Fix bug: add placeholders inside infix ops
-eb@cs.st-andrews.ac.uk**20080320150127] 
-
-[Pretty print refl
-eb@cs.st-andrews.ac.uk**20080320134148] 
-
-[Bind multiple names in one go in type declarations
-eb@cs.st-andrews.ac.uk**20080320132941] 
-
-[Locks are semaphores
-eb@cs.st-andrews.ac.uk**20080319161532
- So allow them to be initialised with the number of processes allowed to
- hold onto then,
-] 
-
-[Missed a case in constant show
-eb@cs.st-andrews.ac.uk**20080318175442] 
-
-[Add Maybe and Either to prelude
-eb@cs.st-andrews.ac.uk**20080318224740] 
-
-[Use 'fastCheck' since we already know our IO programs work
-eb@cs.st-andrews.ac.uk**20080318161100] 
-
-[Pretty printing and parsing tweaks
-eb@cs.st-andrews.ac.uk**20080318161027] 
-
-[No point in generating elimination rules since we don't use them
-eb@cs.st-andrews.ac.uk**20080317162738
- Perhaps later, if linking to a theorem prover, it will be useful, but
- it can be done on demand.
-] 
-
-[Dump environment for metavars in the right order
-eb@cs.st-andrews.ac.uk**20080315230225] 
-
-[Nicer display of metavariables
-eb@cs.st-andrews.ac.uk**20080314174637] 
-
-[Added a pretty ugly pretty-printer for terms
-eb@cs.st-andrews.ac.uk**20080314154034] 
-
-[Added metavariable syntax
-eb@cs.st-andrews.ac.uk**20080314132802] 
-
-[Back in sync with Ivor (addPatternDef type changed)
-eb@cs.st-andrews.ac.uk**20080314011920] 
-
-[Add modules to .cabal for executable
-eb@cs.st-andrews.ac.uk**20080313134204] 
-
-[imports in RunIO
-eb@cs.st-andrews.ac.uk**20080312174755] 
-
-[minor cabal format
-gwern0@gmail.com**20080312041116] 
-
-[improve cabal metadata for hackage, split into lib/main
-gwern0@gmail.com**20080312041034] 
-
-[fix sdist
-gwern0@gmail.com**20080312040218] 
-
-[+Extensions
-gwern0@gmail.com**20080312035953] 
-
-[Context.lhs -> Context.hs
-gwern0@gmail.com**20080312035926
- Literate files are just wasteful if they aren't literate
-] 
-
-[dehaskell98
-gwern0@gmail.com**20080312035905] 
-
-[Update ioref example
-eb@cs.st-andrews.ac.uk**20080312125024] 
-
-[Added IORefs
-eb@cs.st-andrews.ac.uk**20080312123834] 
-
-[Added some concurrency primitives
-eb@cs.st-andrews.ac.uk**20080311205546
- fork, newLock, lock, unlock
-] 
-
-[Add simple stateful DSL
-eb@cs.st-andrews.ac.uk**20080311151020] 
-
-[Add placeholders in do expressions too!
-eb@cs.st-andrews.ac.uk**20080311150824] 
-
-[Be more implicit!
-eb@cs.st-andrews.ac.uk**20080310135937] 
-
-[Better if testVect has ints
-eb@cs.st-andrews.ac.uk**20080310133325] 
-
-[syntax tinker in partition.idr
-eb@cs.st-andrews.ac.uk**20080310132921] 
-
-[Syntax for let bindings
-eb@cs.st-andrews.ac.uk**20080310025357] 
-
-[if...then...else syntax
-eb@cs.st-andrews.ac.uk**20080310024516] 
-
-[Member predicate
-eb@cs.st-andrews.ac.uk**20080310013200] 
-
-[Syntax for _ patterns
-eb@cs.st-andrews.ac.uk**20080310012608] 
-
-[Rename List
-eb@cs.st-andrews.ac.uk**20080310002023] 
-
-[builtins needs bool
-eb@cs.st-andrews.ac.uk**20080310001809] 
-
-[Removed samples which should be in lib
-eb@cs.st-andrews.ac.uk**20080309224149] 
-
-[Added io example
-eb@cs.st-andrews.ac.uk**20080309223957] 
-
-[More keeping in sync with Ivor
-eb@cs.st-andrews.ac.uk**20080309222931] 
-
-[Take advantage of better ivor inference
-eb@cs.st-andrews.ac.uk**20080309213603] 
-
-[Added vect lib
-eb@cs.st-andrews.ac.uk**20080308185405] 
-
-[Added List to library
-eb@cs.st-andrews.ac.uk**20080308185119] 
-
-[Lambdas can take multiple arguments
-eb@cs.st-andrews.ac.uk**20080308185050] 
-
-[Added integer comparison operators
-eb@cs.st-andrews.ac.uk**20080308134245] 
-
-[Add polymorphic boolean equality
-eb@cs.st-andrews.ac.uk**20080308133304] 
-
-[Added library paths and a simple prelude
-eb@cs.st-andrews.ac.uk**20080308132011] 
-
-[Some primitive operators, and '=' for JM equality
-eb@cs.st-andrews.ac.uk**20080307234257] 
-
-[Use WHNF for evaluation now Ivor has it
-eb@cs.st-andrews.ac.uk**20080307195902] 
-
-[Added builtins
-eb@cs.st-andrews.ac.uk**20080307173517] 
-
-[add RunIO.hs
-eb@cs.st-andrews.ac.uk**20080306114827] 
-
-[Added more samples (IO not quite working yet due to Ivor bug though)
-eb@cs.st-andrews.ac.uk**20080305170333] 
-
-[Add do notation
-eb@cs.st-andrews.ac.uk**20080305170312] 
-
-['include' files
-eb@cs.st-andrews.ac.uk**20080305112534] 
-
-[Latest Ivor allows more implicitness
-eb@cs.st-andrews.ac.uk**20080305104707] 
-
-[Enough annotations to make interp work
-eb@cs.st-andrews.ac.uk**20080305001951] 
-
-[Allow forward declarations for functions, add quicksort example
-eb@cs.st-andrews.ac.uk**20080305000656] 
-
-[Added 'partition' example
-eb@cs.st-andrews.ac.uk**20080304224512] 
-
-[Easier to put implicit arguments in pattern clauses
-eb@cs.st-andrews.ac.uk**20080304224425] 
-
-[John Major equality syntax
-eb@cs.st-andrews.ac.uk**20080304215146] 
-
-[Added interpreter example, fixed simple sample
-eb@cs.st-andrews.ac.uk**20080303164114] 
-
-[Changed some syntax
-eb@cs.st-andrews.ac.uk**20080303163946
- - Implicit arguments can now be named when applied, so that the parser
- knows which argument you mean
- - No need for {} around definitions
- - Type of types is #
- 
-] 
-
-[make sure constructur arguments get new names generated
-eb@cs.st-andrews.ac.uk**20080229003215] 
-
-[Added samples directory
-eb@cs.st-andrews.ac.uk**20080228232920] 
-
-[First version which runs code!
-eb@cs.st-andrews.ac.uk**20080228232820] 
-
-[Some simple examples
-eb@cs.st-andrews.ac.uk**20080228175453] 
-
-[Now building terms and datatypes for Ivor with implicit args added
-eb@cs.st-andrews.ac.uk**20080228161136] 
-
-[More work on parser; constants, lambdas, new syntax tree
-eb@cs.st-andrews.ac.uk**20080226111951] 
-
-[Parser for datatypes and basic function definitions
-eb@cs.st-andrews.ac.uk**20080108171829] 
-
-[Started parser
-eb@cs.st-andrews.ac.uk**20071214181416] 
-
-[First chunk of code
-eb@cs.st-andrews.ac.uk**20071212114523] 
diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index 870cd06938ea1..adfa92b428db9 100644
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.41";
-   name="sbcl-1.0.41";
-   hash="019h0lrbd4q1f0bfwg3974pq81qcriwk5kd3v7gp1dmi5rajgnrk";
-   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.41/sbcl-1.0.41-source.tar.bz2";
-   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.41/sbcl-1.0.41-source.tar.bz2";
+   version="1.0.42";
+   name="sbcl-1.0.42";
+   hash="0j699rb3nw7akcmpqjlzwsrc0yg6kj6nf9bzfhnw19q1m4kl4pm5";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2";
   
   
 }
diff --git a/pkgs/development/compilers/webdsl/default.nix b/pkgs/development/compilers/webdsl/default.nix
index 6c878717220e1..ba667e17c511c 100644
--- a/pkgs/development/compilers/webdsl/default.nix
+++ b/pkgs/development/compilers/webdsl/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, pkgconfig, strategoPackages}:
+{ stdenv, fetchurl, pkgconfig, strategoPackages }:
 
 stdenv.mkDerivation rec {
-  name = "webdsl-9.7pre3056";
+  name = "webdsl-9.7pre4168";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/71896/download/1/webdsl-9.7pre3056.tar.gz";
-    sha256 = "3446b7e9dac27a9fd35541a57e961be5b74f2f9e3fb02dc14c86f945b47df045";
+    url = "http://hydra.nixos.org/build/654196/download/1/${name}.tar.gz";
+    sha256 = "08bec3ba02254ec7474ce70206b7be4390fe07456cfc57d927d96a21dd6dcb33";
   };
 
-  buildInputs = [
-    pkgconfig strategoPackages.aterm strategoPackages.sdf
-    strategoPackages.strategoxt strategoPackages.javafront
-  ];
+  buildInputs =
+    [ pkgconfig strategoPackages.aterm strategoPackages.sdf
+      strategoPackages.strategoxt strategoPackages.javafront
+    ];
 
   meta = {
     homepage = http://webdsl.org/;
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
new file mode 100644
index 0000000000000..7f11ee7c3dfbd
--- /dev/null
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, fetchurl
+, cairo
+, coreutils
+, file
+, libjpeg
+, libpng
+, libtool
+, libXaw
+, libXext
+, libXft
+, libXrender
+, libXt
+, libXmu
+, mesa
+, pkgconfig
+, which } :
+
+stdenv.mkDerivation rec {
+  name = "racket";
+  version = "5.0.1";
+  pname = "${name}-${version}";
+
+  src = fetchurl {
+    url = "http://download.racket-lang.org/installers/${version}/${name}/${pname}-src-unix.tgz";
+    sha256 = "18bzzzbxvr888lnpwggismq5grysrwlyg2dp026hhv5n2mk5sfvn";
+  };
+
+  buildInputs = [ cairo
+                  coreutils
+                  file
+                  libjpeg
+                  libpng
+                  libtool
+                  libXaw
+                  libXext
+                  libXft
+                  libXrender
+                  libXt
+                  libXmu
+                  mesa
+                  pkgconfig
+                  which
+                ];
+
+  preConfigure = ''
+    cd src
+    sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
+    sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure 
+  '';
+
+  configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
+
+  meta = {
+    description = "Racket (formerly called PLT Scheme) is a programming language derived from Scheme.";
+    longDescription = ''
+      Racket (formerly called PLT Scheme) is a programming language derived
+      from Scheme. The Racket project has four primary components: the
+      implementation of Racket, a JIT compiler; DrRacket, the Racket program
+      development environment; the TeachScheme! outreach, an attempt to turn
+      Computing and Programming into "an indispensable part of the liberal
+      arts curriculum"; and PLaneT, Racket's web-based package
+      distribution system for user-contributed packages.
+    '';
+
+    homepage = http://racket-lang.org/;
+    license = "LGPL";
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix
index 9bd5bbaf09603..8cbc25c2a47bf 100644
--- a/pkgs/development/interpreters/ruby/libs.nix
+++ b/pkgs/development/interpreters/ruby/libs.nix
@@ -87,7 +87,7 @@ let libs =
               ensureDir "$out/nix-support"
               export HOME=$TMP/home; mkdir "$HOME"
 
-              gem install -V --ignore-dependencies -E -i "$out" "$src" $gemFlags -- $buildFlags
+              gem install -V --ignore-dependencies -i "$out" "$src" $gemFlags -- $buildFlags
               rm -fr $out/cache # don't keep the .gem file here
 
               THIS_RUBY_LIB=$(echo $out/gems/*/lib)
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index f7f9507373dc4..205a9020511dd 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,19 +1,19 @@
 { fetchurl, stdenv, pkgconfig, mesa, libXi, libXfixes, libXdamage
-, libXcomposite, cairo, glib, pango, gtk }:
+, libXcomposite, cairo, glib, pango, gtk, json_glib }:
 
 stdenv.mkDerivation rec {
-  name = "clutter-1.2.10";
+  name = "clutter-1.4.0";
 
   src = fetchurl {
-    url = "http://source.clutter-project.org/sources/clutter/1.2/${name}.tar.gz";
-    sha256 = "0bdnj026lqmwpgml73q4r0v90gsksjz0nv2fgjda9619bzx47igi";
+    url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2";
+    sha256 = "15icq2gf2fi098lq1wqr7sq2cnb00g1ids050a5z3f43l1ajrnxw";
   };
 
   buildInputs = [ pkgconfig ];
 
   # There are all listed in the `Requires' field of `clutter-x11-1.0.pc'.
   propagatedBuildInputs =
-    [ mesa cairo glib pango gtk
+    [ mesa cairo glib pango gtk json_glib
       libXi libXfixes libXdamage libXcomposite
     ];
 
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
       '';
 
     license = "LGPLv2+";
+    homepage = http://www.clutter-project.org/;
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
index d010707ac00ac..fd690e8b91b2e 100644
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ b/pkgs/development/libraries/haskell/ivor/default.nix
@@ -1,12 +1,14 @@
-{cabal, mtl, parsec}:
+{cabal, mtl, parsec, binary}:
 
 cabal.mkDerivation (self : {
   pname = "ivor";
-  version = "0.1.8";
-  sha256 = "e51ad07c78ea0cad6fce9253012258dbf7c740198792aa4a446e1f0269a9186d";
-  propagatedBuildInputs = [mtl parsec];
+  version = "0.1.12";
+  sha256 = "77f17df646afbe5199d4ab0291515013ad1bda471b2690512f752b752a2905f5";
+  propagatedBuildInputs = [mtl parsec binary];
   meta = {
     description = "Theorem proving library based on dependent type theory";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 8489988c3f3c6..6323d7d146a46 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -1,18 +1,19 @@
 {stdenv, fetchurl}:
 
+let
+  pname = "icu4c";
+  version = "4.4.1";
+in
+
 stdenv.mkDerivation {
-  name = "icu4c-4.5.1";
+  name = pname + "-" + version;
   
   src = fetchurl {
-    url = http://download.icu-project.org/files/icu4c/4.5.1/icu4c-4_5_1-src.tgz;
-    sha256 = "1cbjwz99rqy6r3rb3022qlcrfvncvgigpb7n9824jadz9m17lmfm";
+    url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
+      + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
+    sha256 = "0qrhf9gsj38saxfzpzvlwp1jwdsxr06npdds5dbsc86shg0lz69l";
   };
 
-  patchFlags = "-p0";
-
-  CFLAGS = "-O0";
-  CXXFLAGS = "-O0";
-
   postUnpack = "
     sourceRoot=\${sourceRoot}/source
     echo Source root reset to \${sourceRoot}
@@ -22,6 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Unicode and globalization support library";
+    homepage = http://site.icu-project.org/;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
new file mode 100644
index 0000000000000..045a35d3c3733
--- /dev/null
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, pkgconfig }:
+
+let
+  pname = "json-glib";
+  version = "0.10.4";
+in
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/0.10/${name}.tar.bz2";
+    sha256 = "1naydnjagxw5gsq77lhaasjzfv1kp19v6bkybg1krq7rsd0v7n7g";
+  };
+
+  propagatedBuildInputs = [ glib ];
+  buildInputs = [ pkgconfig ];
+
+  meta = {
+    homepage = http://live.gnome.org/JsonGlib;
+    description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
+  };
+}
diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index 0c2044d47ac24..75a7570201dd4 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -14,5 +14,7 @@ stdenv.mkDerivation rec {
     description = "Color management engine";
     homepage = http://www.littlecms.com/;
     license = "MIT";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
new file mode 100644
index 0000000000000..6e53fcb4fe387
--- /dev/null
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  meta = {
+    description = "A simple but powerful template language for C++";
+    longDescription = ''
+      CTemplate is a simple but powerful template language for C++. It
+      emphasizes separating logic from presentation: it is impossible to
+      embed application logic in this template language.  '';
+    homepage = http://code.google.com/p/google-ctemplate/;
+    license = "bsd";
+  };
+
+  pname = "ctemplate";
+  version = "0.97";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://google-ctemplate.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0p588zjf7gyi06rcggh9ljx2bj5250zi7s8y3vxmg3j9vddhkdyx";
+  };
+}
diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix
new file mode 100644
index 0000000000000..455380f55894e
--- /dev/null
+++ b/pkgs/development/libraries/libgadu/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+
+  name = "libgadu-1.9.0";
+
+  src = fetchurl {
+    url = http://toxygen.net/libgadu/files/libgadu-1.9.0.tar.gz;
+    sha256 = "1ygmda23hf7cysns9kglsiljzb4x8339n878k70yacgzm07dryhj";
+  };
+
+  meta = {
+    description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)";
+    homepage = http://toxygen.net/libgadu/;
+    platforms = stdenv.lib.platforms.linux;
+    license = "LGPLv2.1";
+  };
+
+}
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 54f8d6fcba7fc..e0614d3bd3933 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,13 +1,21 @@
-{stdenv, fetchurl, gettext, perl, perlXMLParser, pkgconfig, glib, libxml2 }:
+{stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
+  libxml2, sqlite, libplist, libusb1, zlib, sg3_utils, gtk, taglib,
+  libimobiledevice, python, pygobject, mutagen, swig }:
 
-stdenv.mkDerivation {
-  name = "libgpod-0.7.2";
+stdenv.mkDerivation rec {
+  name = "libgpod-0.7.94";
   src = fetchurl {
-    url = mirror://sourceforge/gtkpod/libgpod-0.7.2.tar.gz;
-    sha256 = "0xq7947rqf99n9zvbpxfwwkid5z8d2szv5s0024rq37d6zy333rf";
+    url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
+    sha256 = "0bs6p5np8kbyhvkj4vza2dmq7qfsf48chx00hirkf3mqccp41xk4";
   };
 
-  buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ];
+  patchPhase = ''sed -e "s,udevdir=,&$out," -i configure'';
+  configureFlags = "--without-hal --enable-udev";
+
+  propagatedBuildInputs = [ glib libxml2 sqlite libplist libusb1 zlib sg3_utils
+    gtk taglib libimobiledevice python pygobject mutagen ];
+
+  buildInputs = [ gettext perlXMLParser intltool pkgconfig perl swig ];
 
   meta = {
     homepage = http://gtkpod.sourceforge.net/;
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
new file mode 100644
index 0000000000000..8af6b2d611afc
--- /dev/null
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
+  libtasn1, libplist, readline }:
+
+stdenv.mkDerivation rec {
+  name = "libimobiledevice-1.0.2";
+
+  buildInputs = [ python swig pkgconfig readline ];
+  propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
+
+  configureFlags = "--enable-dev-tools";
+
+  src = fetchurl {
+    url = "${meta.homepage}/downloads/${name}.tar.bz2";
+    sha256 = "1wbx0hr0q1dhw1p7326qm3dvzacykhc4w005q5wp2gkxa68dnw5s";
+  };
+
+  meta = {
+    homepage = http://www.libimobiledevice.org;
+    description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux";
+    longDescription = ''
+      libimobiledevice is a software library that talks the protocols to support
+      iPhone®, iPod Touch® and iPad® devices on Linux. Unlike other projects, it
+      does not depend on using any existing proprietary libraries and does not
+      require jailbreaking. It allows other software to easily access the
+      device's filesystem, retrieve information about the device and it's
+      internals, backup/restore the device, manage SpringBoard® icons, manage
+      installed applications, retrieve addressbook/calendars/notes and bookmarks
+      and synchronize music and video to the device. The library is in
+      development since August 2007 with the goal to bring support for these
+      devices to the Linux Desktop.'';
+    inherit (usbmuxd.meta) platforms maintainers;
+  };
+}
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
new file mode 100644
index 0000000000000..acc5af0ca9e09
--- /dev/null
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
+
+stdenv.mkDerivation rec {
+  name = "liblastfm-0.3.0";
+
+  src = fetchurl {
+    url = "http://cdn.last.fm/src/${name}.tar.bz2";
+    sha256 = "0vgpkbqmynm975nlcw3caxpz30wvvz35c7a9kfr2wjqizvxrfwnx";
+  };
+
+  prefixKey = "--prefix ";
+  propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
+  buildInputs = [ ruby pkgconfig ];
+
+  patchPhase = "patchShebangs .";
+
+  meta = {
+    homepage = http://github.com/mxcl/liblastfm;
+    description = "Official LastFM library";
+    inherit (qt4.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
new file mode 100644
index 0000000000000..99f94bb822517
--- /dev/null
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, curl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "liblastfm-SF-0.3.2";
+
+  buildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ curl openssl ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/liblastfm/liblastfm-0.3.2.tar.gz";
+    sha256 = "1hk62giysi96h6cyjyph69nlv1v4vw45w3sx7i2m89i9aysd6qp7";
+  };
+
+  meta = {
+    homepage = http://liblastfm.sourceforge.net;
+    description = "Unofficial C lastfm library";
+  };
+}
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index c65c62eaca7cd..03ef34fac62e2 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = { 
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
-    homepage = http://sourceforge.net/projects/libmng;
+    homepage = http://www.libmng.com;
     license = "zlib/libpng";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
new file mode 100644
index 0000000000000..ced11c0ef4da7
--- /dev/null
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libusb }:
+
+stdenv.mkDerivation rec {
+  name = "libmtp-1.0.1";
+
+  propagatedBuildInputs = [ libusb ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libmtp/${name}.tar.gz";
+    sha256 = "19iha1yi07cdqzlba4ng1mn7h701binalwwkb71q0ld9b88mad6s";
+  };
+
+  meta = {
+    homepage = http://libmtp.sourceforge.net;
+    description = "An implementation of Microsoft's Media Transfer Protocol";
+    longDescription = ''
+      libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP)
+      in the form of a library suitable primarily for POSIX compliant operating
+      systems. We implement MTP Basic, the stuff proposed for standardization.
+      '';
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 2043381ffc6f1..acacd89f02be6 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     description = "Opensource implementation of the Open Financial eXchange specification";
     homepage = http://libofx.sourceforge.net/;
     license = "LGPL";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
 
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
new file mode 100644
index 0000000000000..4c4abe0557f33
--- /dev/null
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, libxml2, glib, swig, python }:
+
+stdenv.mkDerivation rec {
+  name = "libplist-1.3";
+
+  buildInputs = [ cmake swig ];
+
+  patches = [ ./swig.patch ];
+
+  propagatedBuildInputs = [ libxml2 glib python ];
+
+  src = fetchurl {
+    url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
+    sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";
+  };
+
+  meta = {
+    homepage = http://github.com/JonathanBeck/libplist;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/libplist/swig.patch b/pkgs/development/libraries/libplist/swig.patch
new file mode 100644
index 0000000000000..9686a7cbf5152
--- /dev/null
+++ b/pkgs/development/libraries/libplist/swig.patch
@@ -0,0 +1,37 @@
+commit ca6096bc29873d5a3c03d782b134253ac2e61beb
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Fri Sep 24 17:16:40 2010 +0400
+
+    Install python bindings to libplist prefix, not to system directory.
+    
+    This allows one to install libplist to $HOME/prefix and adjust
+    PYTHONPATH.
+
+diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
+index 379cb95..fcacde0 100644
+--- a/swig/CMakeLists.txt
++++ b/swig/CMakeLists.txt
+@@ -9,16 +9,18 @@ SWIG_ADD_MODULE( plist python plist.i )
+ SWIG_LINK_LIBRARIES( plist plist plist++ ${PYTHON_LIBRARIES} )
+ 
+ EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
+-    ARGS "-c 'try:\n import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)\nexcept: pass\n'"
+-    OUTPUT_VARIABLE DISTUTILS_PYTHON_ILIBRARY_PATH
++    ARGS "-c 'import sys; print sys.version[:3];'"
++    OUTPUT_VARIABLE PYTHON_SHORT_VERSION
+     )
+ 
++SET(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_SHORT_VERSION}/site-packages CACHE PATH "The directory where python modules will be installed to.")
++
+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_plist${CMAKE_SHARED_MODULE_SUFFIX}
+-   DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ )
++   DESTINATION ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/plist/ )
+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/plist.py
+-   DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ )
++   DESTINATION ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/plist/ )
+ INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
+-   DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/plist/ )
++   DESTINATION ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/plist/ )
+ INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plist.i
+    DESTINATION include/plist/swig COMPONENT dev)
+ 
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
new file mode 100644
index 0000000000000..dcdd9f46d7631
--- /dev/null
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libusb-1.0.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libusb/${name}.tar.bz2";
+    sha256 = "1afvpaqnl5plqg95nkvsl4sj9d6ckrmjq44mql8l4zqgf6jx7l11";
+  };
+
+  meta = {
+    homepage = http://www.libusb.org;
+    description = "User-space USB library";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
new file mode 100644
index 0000000000000..14c34eaf41995
--- /dev/null
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, libwpd }:
+
+stdenv.mkDerivation rec {
+  name = "libwpg-0.1.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libwpg/${name}.tar.bz2";
+    sha256 = "086mgy36mia76mpfa2qgn0q44b3aigvvng9snzrxh60v3v9wixa7";
+  };
+
+  buildInputs = [ pkgconfig libwpd ];
+
+  meta = {
+    homepage = http://libwpg.sourceforge.net;
+    description = "C++ library to parse WPG";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index e54f29003f4fe..f4c6d7367f62e 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
     homepage = http://www.openjpeg.org/;
     description = "Open-source JPEG 2000 codec written in C language";
     license = "BSD";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index 5de15d2f71c3a..3a16679ce9f16 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -8,7 +8,7 @@
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
 let
-  v = "4.7.0-rc1";
+  v = "4.7.0";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "1bfvd42sdabb86m823yzbzgcy1sibd4ypz2wqaazd77ji768dn2r";
+    sha256 = "0mbr7sjaswkd5gibyb36mlaas049fj8vf2risi66fzfac3amclp0";
   };
 
   preConfigure = ''
@@ -90,12 +90,10 @@ stdenv.mkDerivation rec {
     ${if buildExamples == true then "-make examples" else "-nomake examples"}
     ${if useDocs then "-make docs" else "-nomake docs"}'';
 
-  patches = [ ./phonon-4.4.0.patch ];
-
-  postPatch = ''
+  prePatch = ''
     substituteInPlace configure --replace /bin/pwd pwd
     substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-    sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
+    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
   '';
 
   postInstall = ''
diff --git a/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch b/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
deleted file mode 100644
index 50bdf5be1fa79..0000000000000
--- a/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h b/src/3rdparty/phonon/phonon/phononnamespace.h
-index ec42d51..eb899de 100644
---- a/src/3rdparty/phonon/phonon/phononnamespace.h
-+++ b/src/3rdparty/phonon/phonon/phononnamespace.h
-@@ -41,12 +41,12 @@
- /**
-  * PHONON_VERSION is (major << 16) + (minor << 8) + patch.
-  */
--#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1)
-+#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0)
- 
- /**
-  * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
-  */
--#define PHONON_VERSION_STR "4.3.1"
-+#define PHONON_VERSION_STR "4.4.0"
- 
- QT_BEGIN_HEADER
- QT_BEGIN_NAMESPACE
diff --git a/pkgs/development/libraries/taglib/1.7.nix b/pkgs/development/libraries/taglib/1.7.nix
new file mode 100644
index 0000000000000..1e8cfb564e997
--- /dev/null
+++ b/pkgs/development/libraries/taglib/1.7.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchsvn, zlib, cmake}:
+
+stdenv.mkDerivation {
+  name = "taglib-1.7a";
+  
+  src = fetchsvn {
+    url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib;
+    rev = 1145554;
+  };
+  
+  cmakeFlags = [ "-DWITH-ASF=ON" "-DWITH-MP4=ON" ];
+
+  buildInputs = [ zlib cmake ];
+
+  meta = {
+    homepage = http://developer.kde.org/~wheeler/taglib.html;
+    description = "A library for reading and editing the meta-data of several popular audio formats";
+  };
+}
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 78bb31055cbd2..31e96bd535a34 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -32,7 +32,7 @@ rec {
     # https://bugs.webkit.org/show_bug.cgi?id=42943
     # "--enable-wml"
     
-    # https://bugs.webkit.org/show_bug.cgi?id=43863
+    # https://bugs.webkit.org/show_bug.cgi?id=45110
     # "--enable-indexed-database"
 
     # "--enable-xhtmlmp"
@@ -44,7 +44,7 @@ rec {
     # "--enable-blob"
 
     # May be or not be triggering  https://bugs.webkit.org/show_bug.cgi?id=43878
-    "--enable-file-system"
+    # "--enable-file-system"
     "--enable-directory-upload"
     ];
 
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index dc9371cbe687e..8e7a37299d889 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r65398";
-   name="webkit-r65398";
-   hash="0y9pfhff1nyc818li8lqdkq906yi1r9n9zzmgymx8zpqxg8kcmk8";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
+   version="r67838";
+   name="webkit-r67838";
+   hash="0njncks7n9a1zmdpsbv9dm2iszdkgnd8an0dbg4fvy05ykmvfcms";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r67838.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r67838.tar.bz2";
   
   
 }
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
new file mode 100644
index 0000000000000..847ca6510e5aa
--- /dev/null
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "xbase-3.1.2";
+
+  src = fetchurl {
+    url = mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz;
+    sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r";
+  };
+
+  prePatch = "find . -type f -not -name configure -print0 | xargs -0 chmod -x";
+  patches = [ ./xbase-fixes.patch ];
+
+  meta = {
+    homepage = http://linux.techass.com/projects/xdb/;
+    description = "XBase compatible C++ class library formerly known as XDB";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/pkgs/development/libraries/xbase/xbase-fixes.patch
new file mode 100644
index 0000000000000..a23658049b983
--- /dev/null
+++ b/pkgs/development/libraries/xbase/xbase-fixes.patch
@@ -0,0 +1,34 @@
+diff --git a/xbase64/xbase64.cpp b/xbase64/xbase64.cpp
+index fc5613d..2449535 100644
+--- a/xbase64/xbase64.cpp
++++ b/xbase64/xbase64.cpp
+@@ -51,6 +51,7 @@
+ #include <xbase64/xbase64.h>
+ #include <ctype.h>
+ #include <string.h>
++#include <cerrno>
+ 
+ //#include <xbase64/xbexcept.h>
+ 
+diff --git a/xbase64/xblock.cpp b/xbase64/xblock.cpp
+index c44cbb9..3554fc1 100644
+--- a/xbase64/xblock.cpp
++++ b/xbase64/xblock.cpp
+@@ -53,6 +53,7 @@
+ #endif
+ 
+ #include <xbase64/xbase64.h>
++#include <cerrno>
+ 
+ #ifdef HAVE_IO_H     // windows locking
+ #include <io.h>
+diff --git a/xbase64/xbnode.cpp b/xbase64/xbnode.cpp
+index 5e688c1..3c652b3 100644
+--- a/xbase64/xbnode.cpp
++++ b/xbase64/xbnode.cpp
+@@ -1,4 +1,4 @@
+-#include "xbNode.h"

++#include "xbnode.h"

+ 

+ void xbNodeLink::AddNode(xbNodeLink* node)

+ {

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index cc5fce60e72f2..c491675f55c96 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,13 +1,19 @@
 {fetchurl, stdenv, replace, curl, expat, zlib
 , useNcurses ? false, ncurses, useQt4 ? false, qt4}:
 
+let
+  os = stdenv.lib.optionalString;
+  majorVersion = "2.8";
+  minorVersion = "1";
+  version = "${majorVersion}.${minorVersion}";
+in
 stdenv.mkDerivation rec {
-  name = "cmake-${majorVersion}.1";
+  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
 
-  majorVersion = "2.8";
+  inherit majorVersion;
 
   src = fetchurl {
-    url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz";
+    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
     sha256 = "0hi28blqxvir0dkhln90sgr0m3ri9n2i3hlmwdl4m5vkfsmp9bky";
   };
 
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index e14baf79153c5..31c92621ad7df 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
-, dejagnu, target ? null }:
+, dejagnu, python, target ? null }:
 
 let
     basename = "gdb-7.2";
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1w0h6hya0bl46xddd57mdzwmffplwglhnh9x9hv46ll4mf44ni5z";
   };
 
-  # TODO: Add optional support for Python scripting.
-  buildInputs = [ ncurses readline gmp mpfr expat texinfo ]
+  buildInputs = [ ncurses readline gmp mpfr expat texinfo python ]
     ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags =
diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix
index 44d869c107ee3..ddaa8e6849b4d 100644
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -37,5 +37,6 @@ rec {
   name = "xxdiff-3.2";
   meta = {
     description = "Interactive merge tool";
+    homepage = http://furius.ca/xxdiff/;
   };
 }
diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch b/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
new file mode 100644
index 0000000000000..fb2910d128ee7
--- /dev/null
+++ b/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
@@ -0,0 +1,10 @@
+--- crack-attack-1.1.14/src/Game.h
++++ crack-attack-1.1.14/src/Game.h
+@@ -34,6 +34,7 @@
+ #include <climits>
+ #include <cstdlib>
+ #include <cmath>
++#include <cstring>
+ 
+ #ifdef __MINGW32__
+ #  include <windows.h>
diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch b/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
new file mode 100644
index 0000000000000..4daea4c53a28c
--- /dev/null
+++ b/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
@@ -0,0 +1,10 @@
+--- crack-attack-1.1.14/src/Attack.cxx
++++ crack-attack-1.1.14/src/Attack.cxx
+@@ -83,6 +83,7 @@
+   int height = -1, width = -1;
+   
+   player_name[0] = '\0';
++  glutInit(&argc, argv);
+   parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width);
+   run_crack_attack(mode, port, host_name, player_name, height, width);
+ 
diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix
new file mode 100644
index 0000000000000..7e90d448a8bed
--- /dev/null
+++ b/pkgs/games/crack-attack/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gtk, freeglut, SDL, mesa, libXi, libXmu}:
+
+stdenv.mkDerivation {
+  name = "crack-attack-1.1.14";
+
+  src = fetchurl {
+    url = mirror://savannah/crack-attack/crack-attack-1.1.14.tar.gz;
+    sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm";
+  };
+
+  buildInputs =
+    [ 
+      pkgconfig gtk freeglut SDL mesa libXi libXmu
+    ];
+
+  meta = { 
+    description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!";
+    homepage = http://www.nongnu.org/crack-attack/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  patches = [ 
+    ./crack-attack-1.1.14-gcc43.patch
+    ./crack-attack-1.1.14-glut.patch
+  ];
+}
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
new file mode 100644
index 0000000000000..344daca2a0d3d
--- /dev/null
+++ b/pkgs/games/instead/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
+
+let
+  version = "1.2.2";
+
+  # I took two games at random from http://instead.syscall.ru/games/
+  games = [
+    (fetchurl {
+      url = http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip;
+      sha256 = "0d4m554hiqmgl4xl0jp0b3bqjl35879768hqznh9y57y04sygd2a";
+    })
+    (fetchurl {
+      url = http://instead-games.googlecode.com/files/instead-cat-1.3.zip;
+      sha256 = "0vmsn7jg2vy5kqqbzad289vk4j3piarj1xpwyz72wgyc3k7djg4v";
+    })
+    (fetchurl {
+      url = http://instead-games.googlecode.com/files/instead-cat_en-1.2.zip;
+      sha256 = "0jlm3ssqlka16dm0rg6qfjh6xdh3pv7lj2s4ib4mqwj2vfy0v6sg";
+    })
+    (fetchurl {
+      url = http://instead-games.googlecode.com/files/instead-vinny-0.1.zip;
+      sha256 = "15qdbg82zp3a8vz4qxminr0xbzbdpnsciliy2wm3raz4hnadawg1";
+    })
+  ];
+in
+
+stdenv.mkDerivation rec {
+  name = "instead-" + version;
+
+  src = fetchurl {
+    url = "http://instead.googlecode.com/files/instead_${version}.tar.gz";
+    sha256 = "178xxqvjl5v1bhjrlf8cqpkw85j25fldf0wn6bgyzicr6fspxb25";
+  };
+
+  NIX_LDFLAGS = "-llua -lgcc_s";
+
+  buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer pkgconfig lua zlib unzip ];
+
+  configurePhase = ''
+    sed -i -e "s,DATAPATH=.,DATAPATH=$out/share/${name}/," Rules.make
+  '';
+
+  inherit games;
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/${name}
+    cp sdl-instead $out/bin
+    cp -R games languages stead themes $out/share/${name}
+    pushd $out/share/${name}/games
+    for a in $games; do
+      unzip $a
+    done
+    popd
+  '';
+
+  meta = {
+    description = "Simple text adventure interpreter for Unix and Windows";
+    homepage = http://instead.syscall.ru/;
+    license = "GPLv2";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index b1fc7d80b36e7..423a08a31f214 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -10,6 +10,7 @@
   bjg = "Brian Gough <bjg@gnu.org>";
   eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index f5e9ad9d8904d..0cb90aa71d846 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -15,9 +15,11 @@ stdenv.mkDerivation {
   #'';
 
   prePatch = ''
-    sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in 
+    sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
   '';
 
+  # --disable-network-build Until we have snmp
+
   preConfigure = ''
     export configureFlags="$configureFlags
       --with-cupsfilterdir=$out/lib/cups/filter
@@ -25,7 +27,6 @@ stdenv.mkDerivation {
       --with-icondir=$out/share/applications
       --with-systraydir=$out/xdg/autostart
       --with-mimedir=$out/etc/cups
-      # Until we have snmp
       --disable-network-build"
 
     export makeFlags="
@@ -39,9 +40,10 @@ stdenv.mkDerivation {
   buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++
     stdenv.lib.optional qtSupport qt4;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";
     homepage = http://hplipopensource.com/;
     license = "free"; # MIT/BSD/GPL
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 7dd9c951c6002..640aa31742b11 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
 , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl
+, libxml2, libxslt, openssl, gnutls
 }:
 
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-let 
+let
   s = import ./src-for-default.nix;
 in
 
@@ -18,12 +18,17 @@ stdenv.mkDerivation rec {
     sha256 = s.hash;
   };
 
+  gecko = fetchurl {
+    url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab";
+    sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp";
+  };
+
   buildInputs = [
     xlibs.xlibs flex bison xlibs.libXi mesa
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
     xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
     alsaLib ncurses libpng libjpeg lcms fontforge
-    libxml2 libxslt openssl
+    libxml2 libxslt openssl gnutls
   ];
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
@@ -33,13 +38,15 @@ stdenv.mkDerivation rec {
     freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
     xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
     xlibs.libXcursor xlibs.libXcomposite
-    openssl
+    openssl gnutls
   ];
 
   # Don't shrink the ELF RPATHs in order to keep the extra RPATH
   # elements specified above.
   dontPatchELF = true;
 
+  postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
+
   meta = {
     homepage = "http://www.winehq.org/";
     license = "LGPL";
diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix
index b758282b35e03..c932cb22d4356 100644
--- a/pkgs/misc/emulators/wine/src-for-default.nix
+++ b/pkgs/misc/emulators/wine/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.3.0";
-   name="wine-1.3.0";
-   hash="042mmkq55zgdz7617z7ihqvi9riqv0qc6c7z2f8f6nr5iavfviml";
+   version="1.3.3";
+   name="wine-1.3.3";
+   hash="1kpwcm3zqwxzwm9npipq80yfp7la6429vpg6sf4lvxc1z316wns5";
    url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2";
+   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2";
   
   
 }
diff --git a/pkgs/misc/emulators/wine/wine-warcraft.nix b/pkgs/misc/emulators/wine/wine-warcraft.nix
new file mode 100644
index 0000000000000..e4ba8c7d72d42
--- /dev/null
+++ b/pkgs/misc/emulators/wine/wine-warcraft.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchgit, xlibs, flex, bison, mesa, alsaLib
+, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
+, libxml2, libxslt, openssl, gnutls
+}:
+
+assert stdenv.isLinux;
+assert stdenv.gcc.gcc != null;
+
+let 
+  s = import ./src-for-default.nix;
+in
+
+stdenv.mkDerivation rec {
+  name = "wine-warcraft-${s.version}";
+
+  src = fetchgit {
+    url = git://repo.or.cz/wine/warcraft3.git;
+    rev = "38faaffd99331b71284d8da5f76f38625107ed6d";
+  };
+
+  buildInputs = [
+    xlibs.xlibs flex bison xlibs.libXi mesa
+    xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
+    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
+    alsaLib ncurses libpng libjpeg lcms fontforge
+    libxml2 libxslt openssl gnutls
+  ];
+
+  # Wine locates a lot of libraries dynamically through dlopen().  Add
+  # them to the RPATH so that the user doesn't have to set them in
+  # LD_LIBRARY_PATH.
+  NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
+    freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
+    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
+    xlibs.libXcursor xlibs.libXcomposite
+    openssl gnutls
+  ];
+
+  # Don't shrink the ELF RPATHs in order to keep the extra RPATH
+  # elements specified above.
+  dontPatchELF = true;
+
+  meta = {
+    homepage = "http://www.winehq.org/";
+    license = "LGPL";
+    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = [ "i686-linux" ];
+  };
+}
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 599f25c1a7336..e1201fd08b851 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -7,13 +7,13 @@ assert x11Support -> x11 != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "ghostscript-8.64.0";
+  name = "ghostscript-8.71.1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
-    sha256 = "0b94vlf03saa8vm9drz1kishh527g0brw2cg3jcy9mgpp764x2v1";
+    sha256 = "0vab9905h6sl5s5miai4vhhwdacjlkxqmykfr42x32sr25wjqgvl";
   };
 
   fonts = [
@@ -32,19 +32,18 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional x11Support x11
     ++ stdenv.lib.optional cupsSupport cups;
 
-  configureFlags = ''
-    ${if x11Support then "--with-x" else "--without-x"}
-  '';
+  configureFlags =
+    if x11Support then [ "--with-x" ] else [ "--without-x" ];
 
-  NIX_CFLAGS_COMPILE = "-fpic";
+  CFLAGS = "-fPIC";
 
-  patches = [ ./purity.patch ./mkromfs-zlib.patch ./urw-font-files.patch ];
+  patches = [ ./purity.patch ./urw-font-files.patch ];
 
   doCheck = true;
 
   meta = {
     homepage = http://www.gnu.org/software/ghostscript/;
-    description = "GNU Ghostscript, an PostScript interpreter";
+    description = "GNU Ghostscript, a PostScript interpreter";
 
     longDescription = ''
       Ghostscript is the name of a set of tools that provides (i) an
@@ -55,6 +54,9 @@ stdenv.mkDerivation rec {
       of output drivers for various file formats and printers.
     '';
 
-    license = "GPLv2";
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/misc/ghostscript/mkromfs-zlib.patch b/pkgs/misc/ghostscript/mkromfs-zlib.patch
deleted file mode 100644
index 7583113a9bc0a..0000000000000
--- a/pkgs/misc/ghostscript/mkromfs-zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Current makefiles stupidly omit `-lz' when building `mkromfs'.
-
---- gnu-ghostscript-8.64.0/base/unix-aux.mak	2008-05-04 16:34:47.000000000 +0200
-+++ gnu-ghostscript-8.64.0/base/unix-aux.mak	2008-07-17 17:58:20.000000000 +0200
-@@ -97,7 +97,7 @@ MKROMFS_OBJS= $(MKROMFS_ZLIB_OBJS) $(GLO
- endif
- 
- $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
--	$(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm $(EXTRALIBS)
-+	$(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm $(EXTRALIBS) -lz
- 
- # Query the environment to construct gconfig_.h.
- # The "else true;" is required because Ultrix's implementation of sh -e
diff --git a/pkgs/misc/xsane/default.nix b/pkgs/misc/xsane/default.nix
index 36b36b8e0fcc7..28a53d98b38c9 100644
--- a/pkgs/misc/xsane/default.nix
+++ b/pkgs/misc/xsane/default.nix
@@ -14,4 +14,8 @@ stdenv.mkDerivation {
 
   buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++
 	(if (libusb != null) then [libusb] else []);
+
+  meta = {
+    homepage = http://www.sane-project.org/;
+  };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index adda4b4be8c60..e80a74b0f8879 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -198,11 +198,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.21";
+    version = "2.6.32.23";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "14hc1ky8ww95qq7c9w9r8yvapx583kbf6fkd6d80kv3rll49xyil";
+      sha256 = "0xhxcdrxd6v21zjwf16m1bc0zrpy1scgxdp7xby2yhg63abh97nr";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
index 1f44ae0551004..a055487239625 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
@@ -194,11 +194,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.34.4";
+    version = "2.6.34.7";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "19flipl10cbn4xf4skjr6v3p8baxv3igzvhxm175lkrg2qphv5nd";
+      sha256 = "0jyw7pl46iffv81qgrjf1cn492mks994klly8fvadc13c6jsb77h";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
index 2fd0c15b63dc1..56f0c49e8d4b1 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix
@@ -190,11 +190,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.35.3";
+    version = "2.6.35.6";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "83149a9ab30f8dfe45c63d735018422909cf0dd3f5b5501e42f7349f4044f5f1";
+      sha256 = "1mz0sk7flyr115dcqwqmrzwk845v6pghmlp7j133p8z3jii49c8r";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index f5a8aab985061..08d671d960e37 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -37,6 +37,7 @@ rec {
       
   meta = {
     description = "SparQL query server (RDF storage)";
+    homepage = http://4store.org/;
     maintainers = with a.lib.maintainers;
     [
       raskin
diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix
index fb72c6a355db7..f7dd2199b5425 100644
--- a/pkgs/servers/http/couchdb/src-for-default.nix
+++ b/pkgs/servers/http/couchdb/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.11.0";
-   name="couchdb-0.11.0";
-   hash="0jdh9h6kzay02fpcjvhpwgvpwy9s8yl0hjc5j67lyw504wn2d441";
-   url="mirror://apache/couchdb/0.11.0/apache-couchdb-${version}.tar.gz";
-   advertisedUrl="http://www.apache.org/dist/couchdb/0.11.0/apache-couchdb-0.11.0.tar.gz";
+   version="1.0.1";
+   name="couchdb-1.0.1";
+   hash="07wb21qi471qbb6nqlmdmmvg4z8f7m9wn2bm22c7fig32gz5njmp";
+   url="mirror://apache/couchdb/1.0.1/apache-couchdb-${version}.tar.gz";
+   advertisedUrl="http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz";
   
   
 }
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 28d37869e7bd7..31db36c638a7d 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam
 , acl
-, useKerberos ? false, kerberos ? null
+, useKerberos ? false, kerberos ? null, winbind ? true
 
 # Eg. smbclient and smbspool require a smb.conf file.
 # If you set configDir to "" an empty configuration file
@@ -11,8 +11,11 @@
 # /etc/samba/smb.conf. That's why nixos touches /etc/samba/smb.conf even if you
 # don't enable the samba upstart service.
 , configDir ? "/etc/samba"
-}:
 
+}:
+let
+ usewith = flag: option: if flag then "--with-"+option else "";
+in
 stdenv.mkDerivation rec {
   name = "samba-3.3.3";
 
@@ -42,6 +45,7 @@ stdenv.mkDerivation rec {
     --disable-swat
     --enable-shared-libs
     --with-configdir=${configDir}
+    ${usewith winbind "winbind"}
     ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""}
   '';
 }
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index a87c02c7d0457..9e11a1bf761e1 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -1,9 +1,15 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "cabextract-1.2";
+stdenv.mkDerivation rec {
+  name = "cabextract-1.3";
   src = fetchurl {
-    url = http://www.cabextract.org.uk/cabextract-1.2.tar.gz;
-    sha256 = "1sr5f7qicj5q2h5m4wbmfcaaqxg5zkl5vkxlhyc11spwfh58d75f";
+    url = meta.homepage + name + ".tar.gz";
+    sha256 = "00f0qcrz9f2gwvm98qglbrjpwrzwrfdgh0hck6im93dl6lx3hr6l";
+  };
+
+  meta = {
+    homepage = http://www.cabextract.org.uk/;
+    description = "Free Software for extracting Microsoft cabinet files";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/bluetooth/kbluetooth/default.nix b/pkgs/tools/bluetooth/kbluetooth/default.nix
new file mode 100644
index 0000000000000..047b4f822ae75
--- /dev/null
+++ b/pkgs/tools/bluetooth/kbluetooth/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase_workspace, soprano, gettext
+, semanticDesktop ? true }:
+with stdenv;
+mkDerivation rec {
+  name = "kbluetooth-${version}";
+  version = "0.4.2";
+
+  src = fetchurl {
+    url = "http://kde-apps.org/CONTENT/content-files/112110-${name}.tar.bz2";
+    sha256 = "0z5clp677g1vgh3dd09ilq1r481y342q2cx5pzjj51y1d9lb5zp5";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon kdebase_workspace soprano gettext]
+    ++ lib.optional semanticDesktop soprano;
+
+  patchPhase = ''
+      substituteInPlace src/CMakeLists.txt --replace "DESTINATION \''${KDE4_BIN_INSTALL_DIR}" "DESTINATION bin"
+      substituteInPlace src/inputwizard/CMakeLists.txt --replace "DESTINATION \''${KDE4_BIN_INSTALL_DIR}" "DESTINATION bin"
+      substituteInPlace src/device-manager/CMakeLists.txt  --replace "DESTINATION \''${KDE4_BIN_INSTALL_DIR}" "DESTINATION bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Bluetooth manager for KDE";
+    license = "GPLv2";
+    inherit (kdelibs.meta) platforms;
+    maintainers = [ maintainers.phreedom ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 30cb4b8114906..a092064dbf5b7 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, zlib}:
+{stdenv, fetchurl, zlib, attr}:
 
 stdenv.mkDerivation rec {
-  name = "squashfs-4.0";
+  name = "squashfs-4.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/squashfs/squashfs4.0.tar.gz;
-    sha256 = "089fw543fx2d3dadszjv5swf8hr6jvxrpagf0x1jrb3bw3dqx50q";
+    url = mirror://sourceforge/squashfs/squashfs4.1.tar.gz;
+    sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs";
   };
   
-  buildInputs = [zlib];
+  buildInputs = [zlib attr];
 
   preBuild = ''
     cd squashfs-tools
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 74a9ffca74a15..30af04d25d9b7 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libjpeg, lcms, gettext }:
 
-stdenv.mkDerivation {
-  name = "dcraw-8.99";
+stdenv.mkDerivation rec {
+  name = "dcraw-9.04";
 
   src = fetchurl {
-    url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.99.tar.gz;
-    sha256 = "0w557lsrj8fs666cxzhhv1rigmy705bnkn94rn856dwck59l3ipq";
+    url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
+    sha256 = "1i9w35pldyzp5xjjcy20rps7p9wkxs6vj4wz43vhfyda93nij4y0";
   };
 
   buildInputs = [ libjpeg lcms gettext ];
@@ -25,5 +25,7 @@ stdenv.mkDerivation {
     homepage = http://www.cybercom.net/~dcoffin/dcraw/;
     description = "Decoder for many camera raw picture formats";
     license = "free";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 105cccea3d9f2..f1388135bcb74 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -13,12 +13,12 @@
 , readline
 }:
 
-stdenv.mkDerivation {
-  name = "gnuplot-4.4.0";
+stdenv.mkDerivation rec {
+  name = "gnuplot-4.4.2";
   
   src = fetchurl {
-    url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz";
-    sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0";
+    url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
+    sha256 = "1r799l6ww9w21qnklqfn335jkfc6y0ilhv3sv4x4mf4ghgacis1p";
   };
 
   configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
@@ -27,4 +27,10 @@ stdenv.mkDerivation {
     [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
       wxGTK pango cairo pkgconfig
     ];
+
+  meta = {
+    homepage = http://www.gnuplot.info;
+    description = "A portable command-line driven graphing utility for many platforms";
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index da0ff24700c62..b8c3657bb6458 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -12,4 +12,9 @@ stdenv.mkDerivation {
   configureFlags = "--with-readline";
 
   buildInputs = [flex readline];
+
+  meta = {
+    description = "GNU software calculator";
+    homepage = http://www.gnu.org/software/bc/;
+  };
 }
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index 71e196e449fa6..7ce810a7b56f0 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -8,6 +8,9 @@ let
     glib pkgconfig
   ];
 in
+
+assert a.stdenv ? glibc;
+
 rec {
   src = a.fetchUrlFromSrcInfo s;
 
@@ -26,12 +29,12 @@ rec {
     export CFLAGS="-ggdb -O0 -include ${a.stdenv.glibc}/include/locale.h"
     export CXXFLAGS="-ggdb -O0"
 
-    patch -p 1 < ${/tmp/patch}
   '' [ "minInit" "doUnpack" ];
       
   inherit(s) name;
   meta = {
     description = "Cellphone tool";
+    homepage = http://www.gnokii.org;
     maintainers = [a.lib.maintainers.raskin];
     platforms = with a.lib.platforms; linux;
   };
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
new file mode 100644
index 0000000000000..e7342d9b3e619
--- /dev/null
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
+  libiconv, autoconf, automake, libtool }:
+
+stdenv.mkDerivation {
+  name = "mdbtools-git";
+
+  src = fetchgit {
+    url = "http://github.com/brianb/mdbtools.git";
+    rev = "5ac44b69d9375cca3e1055b70fd22abf7fbf17ab";
+    sha256 = "094e6b480c6fda3a000d0d8539b209d2d7c204a440660a21c11f2e1c9b3aa345";
+  };
+
+  buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake
+    libtool];
+
+  preConfigure = ''
+    sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
+    export NIX_LDFLAGS="$NIX_LDFLAGS -liconv"
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = ".mdb (MS Access) format tools";
+  };
+}
diff --git a/pkgs/tools/misc/ttf2pt1/ttf2pt1-cl-pdf.nix b/pkgs/tools/misc/ttf2pt1/ttf2pt1-cl-pdf.nix
new file mode 100644
index 0000000000000..97a052db20db5
--- /dev/null
+++ b/pkgs/tools/misc/ttf2pt1/ttf2pt1-cl-pdf.nix
@@ -0,0 +1,20 @@
+{ttf2pt1, lib, fetchurl, unzip}:
+
+lib.overrideDerivation ttf2pt1 
+(x:
+{
+  name = "ttf2pt1-cl-pdf";
+  src = fetchurl {
+    url = "http://www.fractalconcept.com/fcweb/download/ttf2pt1-src.zip";
+    sha256 = "1w6kxgnrj3x67lf346bswmcqny9lmyhbnkp6kv99l6wfaq4gs82b";
+  };
+  buildInputs = x.buildInputs ++ [unzip];
+  sourceRoot = "ttf2pt1-cl-pdf";
+  preBuild = ''
+    chmod a+x scripts/*
+  '';
+  meta = x.meta // {
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
new file mode 100644
index 0000000000000..1b7c78369213a
--- /dev/null
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "usbmuxd-1.0.5";
+
+  src = fetchurl {
+    url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2";
+    sha256 = "130h5hk2qhki5xflcindx0prrgm5h7aqhbygrpasvr6030k6bkiv";
+  };
+
+  buildInputs = [ cmake pkgconfig ];
+  propagatedBuildInputs = [ libusb1 libplist ];
+
+  patchPhase = "sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt";
+
+  cmakeFlags = ''-DLIB_SUFFIX='';
+  meta = {
+    homepage = http://marcansoft.com/blog/iphonelinux/usbmuxd/;
+    description = "USB Multiplex Daemon (for talking to iPhone or iPod)";
+    longDescription = ''
+      usbmuxd: USB Multiplex Daemon. This bit of software is in charge of
+      talking to your iPhone or iPod Touch over USB and coordinating access to
+      its services by other applications.'';
+    inherit (libusb1.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
new file mode 100644
index 0000000000000..83cfee07e66e0
--- /dev/null
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  pname = "torsocks";
+  name = "${pname}-${version}";
+  version = "1.0-epsilon";
+  
+  src = fetchurl {
+    url = "http://${pname}.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0508i4q9gm0rrav018z1jn4as5if3qrfdng6dmmzgs324hvdgap5";
+  };
+
+  preConfigure = ''
+      export configureFlags="$configureFlags --libdir=$out/lib"
+  '';
+
+  meta = {
+    description = "use socks-friendly applications with Tor";
+    homepage = http://code.google.com/p/torsocks/;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
new file mode 100644
index 0000000000000..a87ba0d0a0751
--- /dev/null
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "sg3_utils-1.29";
+
+  src = fetchurl {
+    url = "http://sg.danny.cz/sg/p/${name}.tgz";
+    sha256 = "0d1vlijp9y4n3c0sm0zzba38ad87b5v6nh3prgd8sfwvy79720fi";
+  };
+
+  meta = {
+    homepage = http://sg.danny.cz/sg/;
+    description = "Utilities that send SCSI commands to devices";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix
index 8b6307e82176a..77532fd216c90 100644
--- a/pkgs/tools/text/sgml/openjade/default.nix
+++ b/pkgs/tools/text/sgml/openjade/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "OpenJade-1.3.2";
 
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/openjade/openjade-1.3.2.tar.gz";
+    url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz";
     sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
   };
 
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix
new file mode 100644
index 0000000000000..b4573118a49f3
--- /dev/null
+++ b/pkgs/tools/text/uni2ascii/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "uni2ascii-4.15";
+  src = fetchurl {
+    url = "http://billposer.org/Software/Downloads/${name}.tar.gz";
+    sha256 = "0vlwsqrzmdsb2mx0hbhmw1dvzy56jk8779hphnj6yxijryva6g2v";
+  };
+
+  meta = {
+    license = "GPLv3";
+    homepage = http://billposer.org/Software/uni2ascii.html;
+    description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back";
+
+    longDescription = '' 
+    This package provides conversion in both directions between UTF-8
+    Unicode and more than thirty 7-bit ASCII equivalents, including
+    RFC 2396 URI format and RFC 2045 Quoted Printable format, the
+    representations used in HTML, SGML, XML, OOXML, the Unicode
+    standard, Rich Text Format, POSIX portable charmaps, POSIX locale
+    specifications, and Apache log files, and the escapes used for
+    including Unicode in Ada, C, Common Lisp, Java, Pascal, Perl,
+    Postscript, Python, Scheme, and Tcl.
+
+    Such ASCII equivalents are useful when including Unicode text in
+    program source, when debugging, and when entering text into web
+    programs that can handle the Unicode character set but are not
+    8-bit safe. For example, MovableType, the blog software, truncates
+    posts as soon as it encounters a byte with the high bit
+    set. However, if Unicode is entered in the form of HTML numeric
+    character entities, Movable Type will not garble the post.
+
+    It also provides ways of converting non-ASCII characters to
+    similar ASCII characters, e.g. by stripping diacritics.
+    '';
+    maintainers = [ "cillian.deroiste@gmail.com" ];
+  };
+}
diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix
index 77f9388b8240d..0d1602143764b 100644
--- a/pkgs/tools/typesetting/lout/default.nix
+++ b/pkgs/tools/typesetting/lout/default.nix
@@ -1,16 +1,17 @@
 {stdenv, fetchurl, ghostscript}:
 
 stdenv.mkDerivation rec {
-  name = "lout-3.38";
+  name = "lout-3.39";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.cs.usyd.edu.au/jeff/lout/${name}.tar.gz"
-      "mirror://sourceforge/lout/${name}.tar.gz"
+      "mirror://savannah/lout/${name}.tar.gz"      # new!
+      "mirror://sourceforge/lout/${name}.tar.gz"   # to be phased out
       # XXX: We could add the CTAN mirrors
       # (see http://www.ctan.org/tex-archive/support/lout/).
     ];
-    sha256 = "02nqv99jsps2g3v20piyvaq6lji8v9w8fclkk39ixa5lm1jdqaka";
+    sha256 = "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq";
   };
 
   buildInputs = [ ghostscript ];
@@ -39,9 +40,13 @@ stdenv.mkDerivation rec {
       went back to the beginning.
     '';
 
-    # Author's page: http://www.cs.usyd.edu.au/~jeff/ .
-    homepage = http://lout.wiki.sourceforge.net/;
+    # Author's page: http://www.cs.usyd.edu.au/~jeff/
+    # Wiki: http://lout.wiki.sourceforge.net/
+    homepage = http://savannah.nongnu.org/projects/lout/;
 
     license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 813043027a197..1e383ebb573d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -369,6 +369,16 @@ let
 
   amule = callPackage ../tools/networking/p2p/amule { };
 
+  amuleDaemon = amule.override {
+    monolithic = false;
+    daemon = true;
+  };
+  
+  amuleGui = amule.override {
+    monolithic = false;
+    client = true;
+  };
+  
   aria = builderDefsPackage (import ../tools/networking/aria) {
   };
 
@@ -611,6 +621,8 @@ let
 
   unix2dos = callPackage ../tools/text/unix2dos { };
 
+  uni2ascii = callPackage ../tools/text/uni2ascii { };
+
   gawk = callPackage ../tools/text/gawk { };
 
   gdmap = callPackage ../tools/system/gdmap {
@@ -813,6 +825,10 @@ let
     flex = flex2535;
   };
 
+  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix {
+    flex = flex2535;
+  };
+
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
   mjpegtools = callPackage ../tools/video/mjpegtools { };
@@ -1118,6 +1134,8 @@ let
     inherit groff;
   };
 
+  sg3_utils = callPackage ../tools/system/sg3_utils { };
+
   sharutils = callPackage ../tools/archivers/sharutils { };
 
   shebangfix = callPackage ../tools/misc/shebangfix { };
@@ -1187,7 +1205,10 @@ let
 
   tor = callPackage ../tools/security/tor { };
 
+  torsocks = callPackage ../tools/security/tor/torsocks.nix { };
+
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
+  ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { };
 
   ucl = callPackage ../development/libraries/ucl { };
 
@@ -1198,6 +1219,10 @@ let
   unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
 
   upx = callPackage ../tools/compression/upx { };
+  
+  usbmuxd = callPackage ../tools/misc/usbmuxd {};
+
+  vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
 
   vbetool = builderDefsPackage ../tools/system/vbetool {
     inherit pciutils libx86 zlib;
@@ -1414,6 +1439,8 @@ let
     inherit gmp mpfr;
   };
 
+  eql = callPackage ../development/compilers/eql {};
+
   adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
 
   fpc = callPackage ../development/compilers/fpc { };
@@ -1787,14 +1814,7 @@ let
   # reducing the number or "enabled" versions again.
 
   # Helper functions to abstract away from repetitive instantiations.
-  haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
-    inherit pkgs newScope;
-    enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
-    ghc = callPackage ghcPath {
-      ghc = ghc6101Binary;    };
-  });
-
-  haskellPackagesFun612 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
+  haskellPackagesFun = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
     inherit pkgs newScope;
     enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
     ghc = callPackage ghcPath {
@@ -1803,36 +1823,32 @@ let
 
   # Currently active GHC versions.
   haskellPackages_ghc6101 =
-    haskellPackagesFun610 ../development/compilers/ghc/6.10.1.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.10.1.nix false;
 
   haskellPackages_ghc6102 =
-    haskellPackagesFun610 ../development/compilers/ghc/6.10.2.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.10.2.nix false;
 
   haskellPackages_ghc6103 =
-    haskellPackagesFun610 ../development/compilers/ghc/6.10.3.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.10.3.nix false;
 
-  # Current default version.
   haskellPackages_ghc6104 =
-    haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.10.4.nix false;
 
   haskellPackages_ghc6121 =
-    haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.12.1.nix false;
 
   haskellPackages_ghc6122 =
-    haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.12.2.nix false;
 
+  # Current default version.
   haskellPackages_ghc6123 =
-    haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false;
+    haskellPackagesFun ../development/compilers/ghc/6.12.3.nix false;
 
-  # Currently not pointing to the actual HEAD, therefore disabled
-  /*
-  haskellPackages_ghcHEAD = lowPrio (import ./haskell-packages.nix {
-    inherit pkgs;
-    ghc = callPackage ../development/compilers/ghc/6.11.nix {
-      inherit (haskellPackages) happy alex; # hope these aren't required for the final version
-      ghc = ghc6101Binary;    };
-  });
-  */
+  haskellPackages_ghc701 =
+    lowPrio (haskellPackagesFun ../development/compilers/ghc/7.0.1.nix false);
+
+  haskellPackages_ghcHEAD =
+    lowPrio (haskellPackagesFun ../development/compilers/ghc/head.nix false);
 
   haxeDist = import ../development/compilers/haxe {
     inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;
@@ -1944,7 +1960,7 @@ let
 
   stalin = callPackage ../development/compilers/stalin { };
 
-  strategoPackages = strategoPackages017;
+  strategoPackages = strategoPackages018;
 
   strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix {
     stdenv = overrideInStdenv stdenv [gnumake380];
@@ -2142,6 +2158,8 @@ let
 
   qi = callPackage ../development/compilers/qi { };
 
+  racket = callPackage ../development/interpreters/racket { };
+
   ruby18 = callPackage ../development/interpreters/ruby { };
   #ruby19 = import ../development/interpreters/ruby/ruby-19.nix { inherit ruby18 fetchurl; };
   ruby = ruby18;
@@ -2228,11 +2246,13 @@ let
 
   antlr3 = callPackage ../development/tools/parsing/antlr { };
 
-  antDarwin = apacheAnt.override rec { jdk = openjdkDarwin ; name = "ant-" + jdk.name ; } ;
+  antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ;
 
   ant = apacheAnt;
+  
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant {
-    name = "ant-" + jdk.name;  };
+    name = "ant-" + jdk.name;
+  };
 
   apacheAnt14 = callPackage ../development/tools/build-managers/apache-ant {
     jdk = j2sdk14x;
@@ -2865,6 +2885,8 @@ let
 
   libdwg = callPackage ../development/libraries/libdwg { };
 
+  libgadu = callPackage ../development/libraries/libgadu { };
+
   eglibc = callPackage ../development/libraries/eglibc {
     kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
@@ -3114,6 +3136,8 @@ let
 
   jetty_util = callPackage ../development/libraries/java/jetty-util { };
 
+  json_glib = callPackage ../development/libraries/json-glib { };
+
   judy = callPackage ../development/libraries/judy { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
@@ -3172,6 +3196,8 @@ let
 
   libcm = callPackage ../development/libraries/libcm { };
 
+  libctemplate = callPackage ../development/libraries/libctemplate { };
+
   libcue = callPackage ../development/libraries/libcue { };
 
   libcv = builderDefsPackage (import ../development/libraries/libcv) {
@@ -3241,28 +3267,40 @@ let
 
   libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
 
-  libgpod = callPackage ../development/libraries/libgpod { };
+  libgpod = callPackage ../development/libraries/libgpod {
+    inherit (pkgs.pythonPackages) mutagen;
+  };
 
   libharu = callPackage ../development/libraries/libharu { };
 
   libical = callPackage ../development/libraries/libical { };
 
+  libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
+
   libiodbc = callPackage ../development/libraries/libiodbc {
     useGTK = getPkgConfig "libiodbc" "gtk" false;
   };
 
   libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { };
 
+  liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
+
+  liblastfm = callPackage ../development/libraries/liblastfm { };
+
   liblqr1 = callPackage ../development/libraries/liblqr-1 {
     inherit (gnome) glib;
   };
 
   libmhash = callPackage ../development/libraries/libmhash {};
 
+  libmtp = callPackage ../development/libraries/libmtp { };
+
   libnice = callPackage ../development/libraries/libnice {
     inherit (gnome) glib;
   };
 
+  libplist = callPackage ../development/libraries/libplist { };
+
   libQGLViewer = callPackage ../development/libraries/libqglviewer { };
 
   libsamplerate = callPackage ../development/libraries/libsamplerate { };
@@ -3406,6 +3444,8 @@ let
 
   libusb = callPackage ../development/libraries/libusb { };
 
+  libusb1 = callPackage ../development/libraries/libusb1 { };
+
   libunwind = callPackage ../development/libraries/libunwind { };
 
   libv4l = callPackage ../development/libraries/libv4l { };
@@ -3433,6 +3473,8 @@ let
     inherit (gnome) glib;
   };
 
+  libwpg = callPackage ../development/libraries/libwpg { };
+
   libx86 = builderDefsPackage ../development/libraries/libx86 {};
 
   libxcrypt = callPackage ../development/libraries/libxcrypt { };
@@ -3690,6 +3732,16 @@ let
 
   quassel = newScope pkgs.kde4 ../applications/networking/irc/quassel { };
 
+  quasselDaemon = quassel.override {
+    monolithic = false;
+    daemon = true;
+  };
+  
+  quasselClient = quassel.override {
+    monolithic = false;
+    client = true;
+  };
+  
   quesoglc = callPackage ../development/libraries/quesoglc { };
 
   readline = readline6;
@@ -3782,6 +3834,8 @@ let
   t1lib = callPackage ../development/libraries/t1lib { };
 
   taglib = callPackage ../development/libraries/taglib { };
+  
+  taglib17 = callPackage ../development/libraries/taglib/1.7.nix { };
 
   taglib_extras = callPackage ../development/libraries/taglib-extras { };
 
@@ -3857,6 +3911,8 @@ let
     flex = flex2533;
   };
 
+  xbase = callPackage ../development/libraries/xbase { };
+
   xineLib = callPackage ../development/libraries/xine-lib { };
 
   xautolock = callPackage ../misc/screensavers/xautolock { };
@@ -5155,6 +5211,8 @@ let
     inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
   };
 
+  amarok = newScope pkgs.kde4 ../applications/audio/amarok { };
+
   amsn = callPackage ../applications/networking/instant-messengers/amsn {
     libstdcpp = gcc33.gcc;
   };
@@ -5164,6 +5222,8 @@ let
     inherit (gnome) libgnomecanvas;
   };
 
+  arora = callPackage ../applications/networking/browsers/arora { };
+
   audacious = callPackage ../applications/audio/audacious { };
 
   audacity = callPackage ../applications/audio/audacity { };
@@ -5556,7 +5616,7 @@ let
 
   flashplayer10 = (
     import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
-      inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat;
+      inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat cairo;
       inherit (xlibs) libX11 libXext libXrender libXt ;
       inherit (gtkLibs) gtk glib pango atk;
       debug = getConfig ["flashplayer" "debug"] false;
@@ -5763,6 +5823,15 @@ let
 
   jwm = callPackage ../applications/window-managers/jwm { };
 
+  kadu = callPackage ../applications/networking/instant-messengers/kadu {
+    qt = qt4;
+    inherit fetchurl cmake libgadu bash libsndfile wget alsaLib;
+    inherit (xlibs) libXScrnSaver libX11;
+    inherit (kde45) qca2;
+  };
+
+  kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
+
   kermit = callPackage ../tools/misc/kermit { };
 
   kino = import ../applications/video/kino {
@@ -5773,6 +5842,8 @@ let
     inherit (xlibs) libXv libX11;
   };
 
+  koffice = newScope pkgs.kde4 ../applications/office/koffice { };
+
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
 
   krename = newScope pkgs.kde4 ../applications/misc/krename { };
@@ -5803,6 +5874,8 @@ let
     inherit (xlibs) libX11 libXau xproto libXt;
   };
 
+  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx {
@@ -6421,6 +6494,8 @@ let
     inherit mesa freeglut;
   };
 
+  crack_attack = callPackage ../games/crack-attack { };
+
   eduke32 = callPackage ../games/eduke32 { };
 
   egoboo = callPackage ../games/egoboo { };
@@ -6459,6 +6534,10 @@ let
 
   hexen = callPackage ../games/hexen { };
 
+  instead = callPackage ../games/instead {
+    lua = lua5;
+  };
+
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
   lincity = builderDefsPackage (import ../games/lincity) {
@@ -6924,6 +7003,11 @@ let
     tex = tetex;
   };
 
+  mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { 
+    lua = lua5;
+    inherit (pythonPackages) pexpect paramiko;
+  };
+
   pgadmin = callPackage ../applications/misc/pgadmin { };
 
   pgf = pgf2;
@@ -7029,6 +7113,10 @@ let
     flex = pkgsi686Linux.flex2535;
   };
 
+  wineWacraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix {
+    flex = pkgsi686Linux.flex2535;
+  };
+
   x2x = callPackage ../tools/X11/x2x { };
 
   xosd = callPackage ../misc/xosd { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c79b41ddd6f03..f4f840678995d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -676,6 +676,8 @@ rec {
     inherit (pkgs) fetchsvn stdenv coreutils glibc m4 libtool llvm;
   };
 
+  epic = callPackage ../development/compilers/epic {};
+
   helium = callPackage ../development/compilers/helium {};
 
   idris = callPackage ../development/compilers/idris {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8e96cdce5cae..58bfa7e341b83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -375,6 +375,21 @@ rec {
     };
   }));
 
+  mutagen = buildPythonPackage (rec {
+    name = "mutagen-1.20";
+
+    src = fetchurl {
+      url = "http://mutagen.googlecode.com/files/${name}.tar.gz";
+      sha256 = "1rz63nh7r6qj3zsidf8d3a7ih647prvvqzi51p8dqkqmvrwc8mky";
+    };
+
+    meta = {
+      description = "Python multimedia tagging library";
+      homepage = http://code.google.com/p/mutagen;
+      license = "LGPLv2";
+    };
+  });
+
 
   namebench = buildPythonPackage (rec {
     name = "namebench-1.0.5";
@@ -525,6 +540,37 @@ rec {
     };
   });
 
+  paramiko = buildPythonPackage {
+    name = "paramiko-1.7.6";
+
+    src = fetchurl {
+      url = "http://www.lag.net/paramiko/download/paramiko-1.7.6.tar.gz";
+      sha256 = "00jhzl3s9xdkbj32h1kq1swk8wpx9zky7qfda40n8mb204xjcn9h";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = "http://www.lag.net/paramiko/";
+      description = "SSH2 protocol for python";
+      license = "LGPL";
+
+      longDescription = ''
+        paramiko is a module for python 2.2 (or higher) that implements the
+        SSH2 protocol for secure (encrypted and authenticated) connections to
+        remote machines. unlike SSL (aka TLS), SSH2 protocol does not require
+        heirarchical certificates signed by a powerful central authority. you
+        may know SSH2 as the protocol that replaced telnet and rsh for secure
+        access to remote shells, but the protocol also includes the ability
+        to open arbitrary channels to remote services across the encrypted
+        tunnel -- this is how sftp works, for example.  it is written
+        entirely in python (no C or platform-dependent code) and is released
+        under the GNU LGPL (lesser GPL).  '';
+
+      platforms = python.meta.platforms;
+    };
+  };
+
   pexpect = buildPythonPackage {
     name = "pexpect-2.3";
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6ee6b7dd99fdf..f385e9a069af6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -437,6 +437,10 @@ with (import ./release-lib.nix);
     xmonad = linux;
   };
 
+  haskellPackages_ghc701 = {
+    ghc = ghcSupported;
+  };
+
   kde3 = {
     kdebase = linux;
     kdelibs = linux;