Merge branch 'master' into stdenv-updates

Conflicts: pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00 · 2013-08-16 22:51:13 +02:00 · 76244ac2e2
parent 70edf15997 a940651968
commit 76244ac2e2
300 changed files with 10324 additions and 23586 deletions
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@ -6,7 +6,7 @@


 <para>The standard build environment in the Nix Packages collection
-provides a environment for building Unix packages that does a lot of
+provides an environment for building Unix packages that does a lot of
 common build tasks automatically.  In fact, for Unix packages that use
 the standard <literal>./configure; make; make install</literal> build
 interface, you don’t need to write a build script at all; the standard
--- a/maintainers/docs/cross.txt
+++ b/maintainers/docs/cross.txt
@ -41,7 +41,7 @@ NB:

 Keep in mind that many programs are not very well suited for cross
 compilation. Either they are not intended to run on other platforms,
-because the code is highly platform specific, or the configuration proces
+because the code is highly platform specific, or the configuration process
 is not written with cross compilation in mind.

 Nix will not solve these problems for you!
@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux
 are "patch", "make" and "wget".

 If we want to build C++ programs it gets a lot more difficult. GCC has a
-three step compilation proces. In the first step a simple compiler, called
+three step compilation process. In the first step a simple compiler, called
 xgcc, that can compile only C programs is built. With that compiler it
 compiles itself two more times: one time to build a full compiler, and another
 time to build a full compiler once again with the freshly built compiler from
@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix.

 ---

-After succesfully completing the whole toolchain you can start building
+After successfully completing the whole toolchain you can start building
 packages with the newly built tools. To make everything build correctly
 you will need a stdenv for your target platform. Setting up this platform
 will take some effort. Right now there is a very experimental setup for
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/maintainers/scripts/nixpkgs-lint.pl
@ -3,27 +3,46 @@
 use strict;
 use List::Util qw(min);
 use XML::Simple qw(:strict);
-use Data::Dumper;
+use Getopt::Long qw(:config gnu_getopt);

+# Parse the command line.
+my $path = "<nixpkgs>";
 my $filter = "*";
+my $maintainer;

-my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`;
+sub showHelp {
+    print <<EOF;
+Usage: $0 [--package=NAME] [--maintainer=REGEXP] [--file=PATH]
+
+Check Nixpkgs for common errors/problems.
+
+  -p, --package        filter packages by name (default is ‘*’)
+  -m, --maintainer     filter packages by maintainer (case-insensitive regexp)
+  -f, --file           path to Nixpkgs (default is ‘<nixpkgs>’)
+
+Examples:
+  \$ nixpkgs-lint -f /my/nixpkgs -p firefox
+  \$ nixpkgs-lint -f /my/nixpkgs -m eelco
+EOF
+    exit 0;
+}
+
+GetOptions("package|p=s" => \$filter,
+           "maintainer|m=s" => \$maintainer,
+           "file|f=s" => \$path,
+           "help" => sub { showHelp() }
+    )
+    or die("syntax: $0 ...\n");
+
+# Evaluate Nixpkgs into an XML representation.
+my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`;
+die "$0: evaluation of ‘$path’ failed\n" if $? != 0;

 my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output";

-#print Dumper($info);
-
-my %pkgsByName;
-
-foreach my $attr (sort keys %{$info->{item}}) {
-    my $pkg = $info->{item}->{$attr};
-    #print STDERR "attr = $attr, name = $pkg->{name}\n";
-    $pkgsByName{$pkg->{name}} //= [];
-    push @{$pkgsByName{$pkg->{name}}}, $pkg;
-}
-
 # Check meta information.
 print "=== Package meta information ===\n\n";
+my $nrBadNames = 0;
 my $nrMissingMaintainers = 0;
 my $nrMissingDescriptions = 0;
 my $nrBadDescriptions = 0;
@ -33,7 +52,11 @@ foreach my $attr (sort keys %{$info->{item}}) {
    my $pkg = $info->{item}->{$attr};

    my $pkgName = $pkg->{name};
-    $pkgName =~ s/-[0-9].*//;
+    my $pkgVersion = "";
+    if ($pkgName =~ /(.*)(-[0-9].*)$/) {
+        $pkgName = $1;
+        $pkgVersion = $2;
+    }

    # Check the maintainers.
    my @maintainers;
@ -44,11 +67,27 @@ foreach my $attr (sort keys %{$info->{item}}) {
        @maintainers = ($x->{value});
    }

+    if (defined $maintainer && scalar(grep { $_ =~ /$maintainer/i } @maintainers) == 0) {
+        delete $info->{item}->{$attr};
+        next;
+    }
+
    if (scalar @maintainers == 0) {
        print "$attr: Lacks a maintainer\n";
        $nrMissingMaintainers++;
    }

+    # Package names should not be capitalised.
+    if ($pkgName =~ /^[A-Z]/) {
+        print "$attr: package name ‘$pkgName’ should not be capitalised\n";
+        $nrBadNames++;
+    }
+
+    if ($pkgVersion eq "") {
+        print "$attr: package has no version\n";
+        $nrBadNames++;
+    }
+
    # Check the license.
    if (!defined $pkg->{meta}->{license}) {
        print "$attr: Lacks a license\n";
@ -81,11 +120,21 @@ foreach my $attr (sort keys %{$info->{item}}) {
        $nrBadDescriptions++ if $bad;
    }
 }
+
 print "\n";

 # Find packages that have the same name.
 print "=== Package name collisions ===\n\n";

+my %pkgsByName;
+
+foreach my $attr (sort keys %{$info->{item}}) {
+    my $pkg = $info->{item}->{$attr};
+    #print STDERR "attr = $attr, name = $pkg->{name}\n";
+    $pkgsByName{$pkg->{name}} //= [];
+    push @{$pkgsByName{$pkg->{name}}}, $pkg;
+}
+
 my $nrCollisions = 0;
 foreach my $name (sort keys %pkgsByName) {
    my @pkgs = @{$pkgsByName{$name}};
@ -96,8 +145,8 @@ foreach my $name (sort keys %pkgsByName) {
    @pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs;

    # Filter packages that have a lower priority.
-    my $highest = min (map { $_->{priority} // 0 } @pkgs);
-    @pkgs = grep { ($_->{priority} // 0) == $highest } @pkgs;
+    my $highest = min (map { $_->{meta}->{priority}->{value} // 0 } @pkgs);
+    @pkgs = grep { ($_->{meta}->{priority}->{value} // 0) == $highest } @pkgs;

    next if scalar @pkgs == 1;

@ -108,6 +157,7 @@ foreach my $name (sort keys %pkgsByName) {

 print "=== Bottom line ===\n";
 print "Number of packages: ", scalar(keys %{$info->{item}}), "\n";
+print "Number of bad names: $nrBadNames\n";
 print "Number of missing maintainers: $nrMissingMaintainers\n";
 print "Number of missing licenses: $nrMissingLicenses\n";
 print "Number of missing descriptions: $nrMissingDescriptions\n";
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
  name = "${pname}-${version}";

  pname = "amarok";
-  version = "2.6.0";
+  version = "2.7.1";

  src = fetchurl {
    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
+    sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy";
  };

  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@ -1,16 +1,24 @@
 { stdenv, fetchurl, pythonPackages, gettext, pyqt4
-, pkgconfig, libdiscid, libofa, ffmpeg }:
+, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter
+}:

 pythonPackages.buildPythonPackage rec {
  name = "picard-${version}";
  namePrefix = "";
-  version = "1.1";
+  version = "1.2";

  src = fetchurl {
    url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
-    md5 = "57abb76632a423760f336ac11da5c149";
+    md5 = "d1086687b7f7b0d359a731b1a25e7b66";
  };

+  postPatch = let
+    fpr = "${acoustidFingerprinter}/bin/acoustid_fpcalc";
+  in ''
+    sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \
+      picard/ui/options/fingerprinting.py
+  '';
+
  buildInputs = [
    pkgconfig
    ffmpeg
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@ -1,23 +1,43 @@
-{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
+{ stdenv, fetchurl, lightdm, pkgconfig, intltool
+, hicolor_icon_theme, makeWrapper
+, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+}:

-stdenv.mkDerivation {
-  name = "lightdm-gtk-greeter";
+#ToDo: bad icons with gtk2;
+#  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
+
+#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory
+
+let
+  ver_branch = "1.6";
+  version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-gtk-greeter-${version}";

  src = fetchurl {
-    url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
-    sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+    sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
  };

-  buildInputs = [ pkgconfig gtk3 lightdm intltool ];
-
-  patches =
-    [ ./lightdm-gtk-greeter.patch
-    ];
-
+  patches = [ ./lightdm-gtk-greeter.patch ];
  patchFlags = "-p0";

+  buildInputs = [ pkgconfig lightdm intltool ]
+    ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
+
+  configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2";
+
  postInstall = ''
      substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
        --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+    '' + stdenv.lib.optionalString useGTK2 ''
+      wrapProgram "$out/sbin/lightdm-gtk-greeter" \
+        --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
    '';
+
+  meta = {
+    homepage = http://launchpad.net/lightdm-gtk-greeter;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@ -1,23 +1,29 @@
-{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
+{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
+, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }:

-stdenv.mkDerivation {
-  name = "lightdm-1.5.1";
+let
+  ver_branch = "1.8";
+  version = "1.7.0";
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-${version}";

  src = fetchurl {
-    url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
-    sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
+    sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5";
  };

-  buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
-
-  configureFlags = [ "--enable-liblightdm-gobject" ];
-
-  patches =
-    [ ./lightdm.patch
-    ];
-
+  patches = [ ./lightdm.patch ];
  patchFlags = "-p0";

+  buildInputs = [
+    pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
+  ] ++ stdenv.lib.optional doCheck dbus.daemon;
+
+  configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ];
+
+  doCheck = false; # some tests fail, don't know why
+
  meta = {
    homepage = http://launchpad.net/lightdm;
    platforms = stdenv.lib.platforms.linux;
--- a/pkgs/applications/editors/dhex/default.nix
+++ b/pkgs/applications/editors/dhex/default.nix
@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "dhex-${version}";
+  version = "0.68";
+
+  src = fetchurl {
+    url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz";
+    sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08";
+  };
+
+  buildInputs = [ ncurses ];
+ 
+  installPhase = ''
+    ensureDir $out/bin
+    ensureDir $out/share/man/man1
+    ensureDir $out/share/man/man5
+
+    cp dhex $out/bin
+    cp dhex.1 $out/share/man/man1
+    cp dhexrc.5 $out/share/man/man5
+    cp dhex_markers.5 $out/share/man/man5
+    cp dhex_searchlog.5 $out/share/man/man5
+  '';
+
+  meta = {
+    description = "A themeable hex editor with diff mode";
+    homepage = http://www.dettus.net/dhex/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [qknight];
+  };
+}
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@ -0,0 +1,20 @@
+{stdenv, fetchurl, fltk13, ghostscript}:
+
+stdenv.mkDerivation {
+  name = "flpsed-0.7.0";
+
+  src = fetchurl {
+    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz";
+    sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62";
+  };
+
+  buildInputs = [ fltk13 ghostscript ];
+
+  meta = {
+    description = "A WYSIWYG PostScript annotator.";
+    homepage = "http://http://flpsed.org/flpsed.html";
+    license = "GPLv3";
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
--- a/pkgs/applications/editors/mg/configure.patch
+++ b/pkgs/applications/editors/mg/configure.patch
@ -0,0 +1,35 @@
+--- configure.old	2013-07-30 19:42:51.000000000 +0200
+++ configure	2013-07-30 19:47:26.000000000 +0200
+@@ -163,31 +163,7 @@
+     echo 'Fails.'
+ fi
+ 
+-
+-if [ ! -r /usr/include/term.h ]; then
+-    note 'term.h'
+-    if [ -r /usr/include/ncurses/term.h ]; then
+-	echo "Found in /usr/include/ncurses"
+-	extraflags="$extraflags -I/usr/include/ncurses"
+-    else
+-	for i in pkg local; do
+-	    if [ -r /usr/$i/include/term.h ]; then
+-		echo "Found in /usr/$i/include"
+-		extralibs="$extralibs -L/usr/$i/lib"
+-		extraflags="$extraflags -I/usr/$i/include"
+-		break
+-	    else
+-		false
+-	    fi
+-	done ||
+-	{
+-	    echo 'Not found!' >&2
+-	    echo 'Do you have the ncurses devel package installed?' >&2
+-	    echo 'If you know where term.h is, please email the author!' >&2
+-	    exit 1
+-	}
+-    fi
+-fi
+extraflags="$extraflags $NIX_CFLAGS_COMPILE"
+ 
+ note 'base and dirname'
+ if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@ -0,0 +1,30 @@
+{ fetchurl, stdenv, ncurses }:
+stdenv.mkDerivation rec {
+  name = "mg-20110905";
+
+  src = fetchurl {
+    url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz;
+    sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw";
+  };
+
+  dontAddPrefix = true;
+
+  patches = [ ./configure.patch ];
+  patchFlags = "-p0";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mg $out/bin
+    mkdir -p $out/share/man/man1
+    cp mg.1 $out/share/man/man1
+  '';
+
+  buildInputs = [ ncurses ];
+
+  meta = {
+    homepage = http://homepage.boetes.org/software/mg/;
+    description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team.";
+    license = "public domain";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/applications/editors/tiled-qt/default.nix
+++ b/pkgs/applications/editors/tiled-qt/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt }:
+
+stdenv.mkDerivation rec {
+  name = "tiled-qt-0.9.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tiled/${name}.tar.gz";
+    sha256 = "09xm6ry56zsqbfl9fvlvc5kq9ikzdskm283r059q6rlc7crzhs38";
+  };
+
+  buildInputs = [ qt ];
+
+  preConfigure = "qmake -r PREFIX=$out";
+
+  meta = {
+    description = "A free, easy to use and flexible tile map editor";
+    homepage = "http://www.mapeditor.org/";
+    # libtiled and tmxviewer is licensed under 2-calause BSD license.
+    # The rest is GPL2 or later.
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+}
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@ -1,6 +1,6 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
-args@{source ? "latest", ...}: with args;
+args@{source ? "default", ...}: with args;


 let inherit (args.composableDerivation) composableDerivation edf; in
@ -11,7 +11,7 @@ composableDerivation {
                   else stdenv ).mkDerivation;
 } (fix: {

-    name = "vim_configurable-7.3";
+    name = "vim_configurable-7.4";

    enableParallelBuilding = true; # test this

@ -20,8 +20,8 @@ composableDerivation {
      "default" =
        # latest release
        args.fetchurl {
-            url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2;
-            sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
+            url = ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2;
+            sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
          };
      "vim-nox" =
          {
@ -31,13 +31,6 @@ composableDerivation {
            name = "vim-nox-hg-2082fc3";
            # END
          }.src;
-      "latest" = {
-        # vim latest usually is vim + bug fixes. So it should be very stable
-         # REGION AUTO UPDATE: { name="vim"; type="hg"; url="https://vim.googlecode.com/hg"; }
-         src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-hg-7f98896.tar.bz2"; sha256 = "efcb8cc5924b530631a8e5fc2a0622045c2892210d32d300add24aded51866f1"; });
-         name = "vim-hg-7f98896";
-         # END
-      }.src;
      };

    # if darwin support is enabled, we want to make sure we're not building with
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@ -1,13 +1,15 @@
 { stdenv, fetchurl, ncurses, gettext, pkgconfig }:

 stdenv.mkDerivation rec {
-  name = "vim-7.3";
+  name = "vim-7.4";
 
  src = fetchurl {
    url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
-    sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw";
+    sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
  };

+  enableParallelBuilding = true;
+ 
  buildInputs = [ ncurses pkgconfig ];
  nativeBuildInputs = [ gettext ];

--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@ -1,15 +1,18 @@
-{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
+{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus
 , freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
 , libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
 }:

 stdenv.mkDerivation rec {
-  version = "1.0.0";
-  name = "dunst-${version}";
+  rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d";
+  name = "dunst-${rev}";

-  src = fetchurl {
-    url = "https://github.com/knopwob/dunst/archive/v${version}.zip";
-    sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671";
+  # 1.0.0 release doesn't include 100% CPU fix
+  # https://github.com/knopwob/dunst/issues/98
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/knopwob/dunst.git";
+    sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj";
  };

  patchPhase = ''
@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
    libXScrnSaver xproto libXinerama perl];

  buildPhase = ''
-    export VERSION=${version};
+    export VERSION=${rev};
    export PREFIX=$out;
    make dunst;
  '';
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@ -1,18 +1,25 @@
 { stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:

 stdenv.mkDerivation rec {
-  name = "pgadmin3-1.10.0";
+  name = "pgadmin3-${version}";
+  version = "1.16.1";

  src = fetchurl {
-    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz";
-    sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
+    url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
+    sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl";
  };

  buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];

-  meta = { 
+  preConfigure = ''
+    substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
+  '';
+
+  meta = with stdenv.lib; { 
    description = "PostgreSQL administration GUI tool";
    homepage = http://www.pgadmin.org;
-    license = "GPL2";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.iElectric ];
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@ -4,11 +4,11 @@

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

  buildInputs = [ libX11 libXrandr libXxf86vm libxcb pkgconfig python
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@ -1,48 +1,31 @@
-x@{builderDefsPackage
-  , ncurses
-  , ...}:
-builderDefsPackage
-(a :  
+{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
+
 let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+  name = "vifm-${version}";
+  version = "0.7.5";

-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="vifm";
-    version="0.6.3";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2";
-    hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
+    sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01";
  };

-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  #phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [ utillinux ncurses file libX11 ];

  meta = {
    description = "A vi-like file manager";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2;
+    maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
+    platforms = pkgs.lib.platforms.linux;
+    license = pkgs.lib.licenses.gpl2;
  };
+
  passthru = {
    updateInfo = {
      downloadPage = "http://vifm.sf.net";
    };
  };
-}) x
+}

--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@ -1,5 +1,5 @@
 { cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
-, utf8String, wirelesstools, X11, X11Xft
+, utf8String, X11, X11Xft
 }:

 cabal.mkDerivation (self: {
@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
  buildDepends = [
    filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
  ];
-  extraLibraries = [ libXrandr wirelesstools ];
-  configureFlags = "-fwith_xft -fwith_iwlib";
+  extraLibraries = [ libXrandr ];
+  configureFlags = "-fwith_xft";
  meta = {
    homepage = "http://projects.haskell.org/xmobar/";
    description = "A Minimalistic Text Based Status Bar";
--- a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch
+++ b/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch
@ -1,14 +0,0 @@
-diff --git a/printing/printing.gyp b/printing/printing.gyp
-index 19fa1b2..f11d76e 100644
--- a/printing/printing.gyp
-+++ b/printing/printing.gyp
-@@ -26,6 +26,9 @@
-       'include_dirs': [
-         '..',
-       ],
-+      'cflags': [
-+        '-Wno-deprecated-declarations',
-+      ],
-       'sources': [
-         'backend/print_backend.cc',
-         'backend/print_backend.h',
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@ -127,14 +127,16 @@ in stdenv.mkDerivation rec {

  prePatch = "patchShebangs .";

-  patches = [ userns_patch ]
-         ++ optional cupsSupport ./cups_allow_deprecated.patch;
+  patches = [ userns_patch ];

  postPatch = ''
    sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
    sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
  '' + optionalString useOpenSSL ''
    cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+  '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") ''
+    sed -i -e '/struct SECItemArray/,/^};/d' \
+      net/third_party/nss/ssl/bodge/secitem_array.c
  '';

  gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
@ -213,7 +215,7 @@ in stdenv.mkDerivation rec {
  '';

  meta = {
-    description = "Chromium, an open source web browser";
+    description = "An open source web browser from Google";
    homepage = http://www.chromium.org/;
    maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
    license = licenses.bsd3;
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
  dev = {
-    version = "30.0.1573.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz";
-    sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz";
+    version = "30.0.1588.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1588.0.tar.xz";
+    sha256 = "1jwc2pkd75gax8vj8wzahhpzl6ilgrlj3bcbah975yy67m7c8p13";
  };
  beta = {
-    version = "29.0.1547.32";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz";
-    sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
+    version = "29.0.1547.49";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.49.tar.xz";
+    sha256 = "03r64rydi2kbxgi2dcpslmpb716ppadqy1jzrbw39icz5xpgmg3k";
  };
  stable = {
-    version = "28.0.1500.71";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz";
-    sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r";
+    version = "28.0.1500.95";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.95.tar.xz";
+    sha256 = "0d6pj57nyx7wfgxws98f6ly749flcyv7zg5sc3w16ggdxf5qhf1w";
  };
 }
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null;
 let optional = stdenv.lib.optional;
 in rec {

-  firefoxVersion = "22.0";
+  firefoxVersion = "23.0";

-  xulVersion = "22.0"; # this attribute is used by other packages
+  xulVersion = "23.0"; # this attribute is used by other packages


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

  commonConfigureFlags =
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@ -12,6 +12,7 @@ let
    gtksourceview pkgconfig which gettext makeWrapper 
    file libidn sqlite docutils libnotify libsoup vala
    kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
+    glib_networking
  ];
 in
 rec {
@ -34,7 +35,11 @@ rec {
      
  shebangsHere = (doPatchShebangs ".");
  shebangsInstalled = (doPatchShebangs "$out/bin");
-  wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
+  wrapWK = (makeManyWrappers "$out/bin/*" 
+  ''
+    --set WEBKIT_IGNORE_SSL_ERRORS 1 \
+    --prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules" 
+  '');

  name = "midori-${version}.${release}";
  meta = {
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@ -44,9 +44,9 @@ let
        throw "no x86_64 debugging version available"
      else rec {
        # -> http://labs.adobe.com/downloads/flashplayer10.html
-        version = "11.2.202.273";
+        version = "11.2.202.297";
        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9";
+        sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8";
      }
    else if stdenv.system == "i686-linux" then
      if debug then {
@ -55,9 +55,9 @@ let
        url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
        sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
      } else rec {
-        version = "11.2.202.273";
+        version = "11.2.202.297";
        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd";
+        sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y";
      }
    else throw "Flash Player is not supported on this platform";

--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@ -12,17 +12,17 @@
  enableOfficialBranding ? false
 }:

-let version = "17.0.7"; in
+let version = "17.0.8"; in

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

  src = fetchurl {
    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "d6dca3e1cc4293f2e15d6b35056bd8dc319014ee";
+    sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812";
  };

-  enableParallelBuilding = false;
+  enableParallelBuilding = true;

  buildInputs =
    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@ -36,9 +36,15 @@ stdenv.mkDerivation rec {
      --with-system-pcre
      --with-system-xz
      --with-ICU
-      R_SHELL="${stdenv.shell}"
+      AR=$(type -p ar)
+      AWK=$(type -p gawk)
+      CC=$(type -p gcc)
+      CXX=$(type -p g++)
+      FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
      JAVA_HOME="${jdk}"
      LDFLAGS="-L${gfortran.gcc}/lib"
+      RANLIB=$(type -p ranlib)
+      R_SHELL="${stdenv.shell}"
    )
    echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
  '';
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -89,9 +89,5 @@ rec {

  svn2git_kde = callPackage ./svn2git-kde { };

-  gitSubtree = import ./git-subtree {
-    inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
-  };
-
  darcsToGit = callPackage ./darcs-to-git { };
 }
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -1,7 +1,7 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup
 , caseInsensitive, clientsession, cryptoApi, curl, dataDefault
 , dataenc, DAV, dbus, dlist, dns, editDistance
-, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet
+, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit
 , IfElse, json, lsof, MissingH, MonadCatchIOTransformers
 , monadControl, mtl, network, networkInfo, networkMulticast
@ -14,15 +14,15 @@

 cabal.mkDerivation (self: {
  pname = "git-annex";
-  version = "4.20130723";
-  sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i";
+  version = "4.20130802";
+  sha256 = "12dvmz88sbcvhyf7aldhpkrf4aqs0x39hky0hikmfd9zcqs6vbih";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
    aeson async blazeBuilder bloomfilter caseInsensitive clientsession
    cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance
-    extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger
-    HTTP httpConduit httpTypes HUnit IfElse json MissingH
+    extensibleExceptions feed filepath gnutls hamlet hinotify hS3
+    hslogger HTTP httpConduit httpTypes HUnit IfElse json MissingH
    MonadCatchIOTransformers monadControl mtl network networkInfo
    networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
    SafeSemaphore SHA stm text time transformers unixCompat utf8String
--- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
@ -1,27 +0,0 @@
-{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
-
-stdenv.mkDerivation {
-  name = "git-subtree-0.4-2-g2793ee6";
-
-  src = fetchurl {
-    url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
-    sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
-    name = "git-subtree-0.4-2-g2793ee6.tar.gz";
-  };
-
-  buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
-
-  configurePhase = "export prefix=$out";
-
-  buildPhase = "true";
-
-  installPhase = "make install prefix=$out gitdir=$out/bin";
-
-  meta= {
-    description = "experimental alternative to the git-submodule command";
-    homepage = http://github.com/apenwarr/git-subtree;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -10,7 +10,7 @@

 let

-  version = "1.8.3.2";
+  version = "1.8.3.4";

  svn = subversionClient.override { perlBindings = true; };

@ -21,7 +21,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63";
+    sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz";
  };

  patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -51,6 +51,13 @@ stdenv.mkDerivation {
        chmod +x $1
      }

+      # Install git-subtree.
+      pushd contrib/subtree
+      make
+      make install install-doc
+      popd
+      rm -rf contrib/subtree
+
      # Install contrib stuff.
      mkdir -p $out/share/git
      mv contrib $out/share/git/
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@ -1,18 +1,18 @@
 {stdenv, fetchurl, qt, libXext, libX11}:

 stdenv.mkDerivation rec {
-  name = "qgit-2.3";
+  name = "qgit-2.5";
  meta =
  {
    license = "GPLv2";
-    homepage = "http://digilander.libero.it/mcostalba/";
+    homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
    description = "Graphical front-end to Git";
    inherit (qt.meta) platforms;
  };
  src = fetchurl
  {
-    url = "mirror://sourceforge/qgit/${name}.tar.bz2";
-    sha256 = "a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64";
+    url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
+    sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
  };
  buildInputs = [qt libXext libX11];
  configurePhase = "qmake PREFIX=$out";
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;

 stdenv.mkDerivation rec {

-  version = "1.7.10";
+  version = "1.7.11";

  name = "subversion-${version}";

  src = fetchurl {
    url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5";
+    sha1 = "d82e187803043b74c072cd5a861ac02e4a027684";
  };

  buildInputs = [ zlib apr aprutil sqlite ]
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -1,22 +1,25 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
 , attr, libcap, vde2, alsaLib, texinfo, libuuid
+, makeWrapper
 , sdlSupport ? true, SDL
 , vncSupport ? true, libjpeg, libpng
 , spiceSupport ? true, spice, spice_protocol
 , x86Only ? false
 }:

+let n = "qemu-1.5.2"; in
+
 stdenv.mkDerivation rec {
-  name = "qemu-1.5.1";
+  name = n + (if x86Only then "-x86-only" else "");

  src = fetchurl {
-    url = "http://wiki.qemu.org/download/${name}.tar.bz2";
-    sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac";
+    url = "http://wiki.qemu.org/download/${n}.tar.bz2";
+    sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
  };

  buildInputs =
    [ python zlib pkgconfig glib ncurses perl pixman attr libcap
-      vde2 alsaLib texinfo libuuid
+      vde2 alsaLib texinfo libuuid makeWrapper
    ]
    ++ stdenv.lib.optionals sdlSupport [ SDL ]
    ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
@ -31,6 +34,15 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional spiceSupport "--enable-spice"
    ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu";

+  postInstall =
+    ''
+      # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
+      p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
+      if [ -e "$p" ]; then
+        makeWrapper "$p" $out/bin/qemu-kvm --add-flags "-enable-kvm"
+      fi
+    '';
+
  meta = {
    homepage = http://www.qemu.org/;
    description = "A generic and open source machine emulator and virtualizer";
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -11,7 +11,7 @@ with stdenv.lib;

 let

-  version = "4.2.14"; # changes ./guest-additions as well
+  version = "4.2.16"; # changes ./guest-additions as well

  forEachModule = action: ''
    for mod in \
@ -31,11 +31,13 @@ let
  '';

  # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "86644";
+  extpackRevision = "86992";
  extensionPack = requireFile rec {
    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
-    # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
+    # IMPORTANT: Hash must be base16 encoded because it's used as an input to
+    # VBoxExtPackHelperApp!
+    # Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url"
+    sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d";
    message = ''
      In order to use the extension pack, you need to comply with the VirtualBox Personal Use
      and Evaluation License (PUEL) by downloading the related binaries from:
@ -54,7 +56,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
+    sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz";
  };

  buildInputs =
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
+    sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg";
  };

  KERN_DIR = "${kernelDev}/lib/modules/*/build";
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXmu }:
+
+stdenv.mkDerivation rec {
+  name = "windowmaker-${version}";
+  version = "0.95.4";
+
+  src = fetchurl {
+    url = "http://windowmaker.org/pub/source/release/"
+        + "WindowMaker-${version}.tar.gz";
+    sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXft libXmu ];
+
+  meta = {
+    homepage = "http://windowmaker.org/";
+    description = "NeXTSTEP-like window manager";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/pkgs/build-support/fetchmtn/builder.sh
@ -24,7 +24,7 @@ for source in $dbs; do
 			echo "selector $selector does not match any revision";
 		fi
 	else
-		echo "pulling branch $branch wasn't succesfull";
+		echo "pulling branch $branch wasn't successful";
 	fi;
 	if test -n "$done"; then
 		break;
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@ -4,12 +4,12 @@
 # Also generate an appropriate modules.dep.

 { stdenv, kernel, nukeReferences, rootModules
-, module_init_tools, allowMissing ? false }:
+, kmod, allowMissing ? false }:

 stdenv.mkDerivation {
  name = kernel.name + "-shrunk";
  builder = ./modules-closure.sh;
  buildInputs = [nukeReferences];
-  inherit kernel rootModules module_init_tools allowMissing;
+  inherit kernel rootModules kmod allowMissing;
  allowedReferences = ["out"];
 }
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@ -2,24 +2,20 @@ source $stdenv/setup

 set -o pipefail

-PATH=$module_init_tools/sbin:$PATH
+PATH=$kmod/sbin:$PATH

 version=$(cd $kernel/lib/modules && ls -d *)

 echo "kernel version is $version"

-export MODULE_DIR=$(readlink -f $kernel/lib/modules/)
-
 # Determine the dependencies of each root module.
 closure=
 for module in $rootModules; do
    echo "root module: $module"
-    deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
+    deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
        | sed 's/^insmod //') \
        || if test -z "$allowMissing"; then exit 1; fi
-    #for i in $deps; do echo $i; done
-    if [[ "$deps" != builtin* ]]
-    then
+    if [[ "$deps" != builtin* ]]; then
        closure="$closure $deps"
    fi
 done
@ -41,4 +37,4 @@ for module in $closure; do
    echo $target >> $out/insmod-list
 done

-MODULE_DIR=$out/lib/modules/ depmod -a $version
+depmod -b $out -a $version
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@ -40,13 +40,21 @@ rec {
    } // args);

  aggregate =
-    { name, members, meta ? { } }:
+    { name, constituents, meta ? { } }:
    pkgs.runCommand name
-      { inherit members meta;
+      { inherit constituents meta;
        _hydraAggregate = true;
      }
      ''
-        echo $members > $out
+        mkdir -p $out/nix-support
+        echo $constituents > $out/nix-support/hydra-aggregate-constituents
+
+        # Propagate build failures.
+        for i in $constituents; do
+          if [ -e $i/nix-support/failed ]; then
+            touch $out/nix-support/failed
+          fi
+        done
      '';

 }
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -1,5 +1,5 @@
 { pkgs
-, kernel ? pkgs.linux_3_9
+, kernel ? pkgs.linux_3_10
 , img ? "bzImage"
 , rootModules ?
    [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
@ -9,9 +9,9 @@ with pkgs;

 rec {

-  kvm = pkgs.qemu;
+  qemu = pkgs.qemu_kvm;

-  qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386");
+  qemuProg = "${qemu}/bin/qemu-kvm";


  modulesClosure = makeModulesClosure {
@ -91,8 +91,8 @@ rec {
      esac
    done

+    echo "loading kernel modules..."
    for i in $(cat ${modulesClosure}/insmod-list); do
-      echo "loading module $(basename $i .ko)"
      insmod $i
    done

@ -114,14 +114,14 @@ rec {

    echo "mounting Nix store..."
    mkdir -p /fs/nix/store
-    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
+    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose

    mkdir -p /fs/tmp
    mount -t tmpfs -o "mode=755" none /fs/tmp

    echo "mounting host's temporary directory..."
    mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose

    mkdir -p /fs/proc
    mount -t proc none /fs/proc
@ -133,7 +133,7 @@ rec {
    ln -sf /proc/mounts /fs/etc/mtab
    echo "127.0.0.1 localhost" > /fs/etc/hosts

-    echo "Now running: $command"
+    echo "starting stage 2 ($command)"
    test -n "$command"

    set +e
@ -188,7 +188,6 @@ rec {

  qemuCommandLinux = ''
    ${qemuProg} \
-      -enable-kvm \
      ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
      -nographic -no-reboot \
      -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
@ -196,7 +195,7 @@ rec {
      -drive file=$diskImage,if=virtio,cache=writeback,werror=report \
      -kernel ${kernel}/${img} \
      -initrd ${initrd}/initrd \
-      -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk" \
+      -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
      $QEMU_OPTS
  '';

@ -242,7 +241,7 @@ rec {
  createEmptyImage = {size, fullName}: ''
    mkdir $out
    diskImage=$out/disk-image.qcow2
-    ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"
+    ${qemu}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"

    mkdir $out/nix-support
    echo "${fullName}" > $out/nix-support/full-name
@ -362,7 +361,7 @@ rec {
      diskImage=$(pwd)/disk-image.qcow2
      origImage=${attrs.diskImage}
      if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
-      ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
+      ${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
    '';

    /* Inside the VM, run the stdenv setup script normally, but at the
@ -459,7 +458,7 @@ rec {
    fi
    diskImage="$1"
    if ! test -e "$diskImage"; then
-      ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
+      ${qemu}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
    fi
    export TMPDIR=$(mktemp -d)
    export out=/dummy
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "man-pages-3.50";
+  name = "man-pages-3.53";

  src = fetchurl {
    url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
+    sha256 = "0kzkjfrw65f7bv6laz3jism4yqajmfh3vdq2jb5d6gyp4n14sxnl";
  };

  preBuild =
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/pkgs/data/icons/tango-icon-theme/default.nix
@ -0,0 +1,22 @@
+{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "tango-icon-theme-0.8.90";
+
+  src = fetchurl {
+    url = "http://tango.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f";
+  };
+
+  patches = [ ./rsvg-convert.patch ];
+
+  buildInputs = [ intltool pkgconfig iconnamingutils imagemagick librsvg ];
+
+  configureFlags = "--enable-png-creation";
+
+  meta = {
+    description = "A basic set of icons";
+    homepage = http://tango.freedesktop.org/Tango_Icon_Library;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
+++ b/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
@ -0,0 +1,34 @@
+Based on https://build.opensuse.org/package/view_file?file=tango-icon-theme-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3A12.2&rev=faf71bf8278d5df6ec8a31726e5b8542
+
+diff -ru -x '*~' tango-icon-theme-0.8.90/configure tango-icon-theme-0.8.90-new/configure
+--- tango-icon-theme-0.8.90/configure	2009-02-26 04:08:00.000000000 +0100
+++ tango-icon-theme-0.8.90-new/configure	2013-08-15 17:54:24.167065399 +0200
+@@ -6554,7 +6554,7 @@
+   enable_large_bitmaps=no
+ fi
+    if test "x$enable_large_bitmaps" = "xyes"; then
+-      svgconvert_prog="rsvg"
+      svgconvert_prog="rsvg-convert"
+    else
+       svgconvert_prog="ksvgtopng"
+    fi
+diff -ru -x '*~' tango-icon-theme-0.8.90/svg2png.sh.in tango-icon-theme-0.8.90-new/svg2png.sh.in
+--- tango-icon-theme-0.8.90/svg2png.sh.in	2007-02-16 21:04:29.000000000 +0100
+++ tango-icon-theme-0.8.90-new/svg2png.sh.in	2013-08-15 17:54:08.275084837 +0200
+@@ -9,12 +9,14 @@
+ 
+ ICONFILE=`basename ${3}`
+ ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"`
+-if test `basename $SVGCONVERT` = "rsvg"; then
+if test `basename $SVGCONVERT` = "rsvg-convert"; then
+     OPTIONS="-w ${1} -h ${1}"
+    OUTPUT="-o"
+ else
+     OPTIONS="${1} ${1}"
+    OUTPUT=""
+ fi
+ 
+ echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
+-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
+${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png
+ 
--- a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
@ -1,7 +1,7 @@
 { kde, kdelibs }:

 kde rec {
-  name = "kde-wallpapers";
+  name = "kdeartwork-wallpapers";

  buildInputs = [ kdelibs ];

--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
@ -1,46 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79945c4..a244d0f 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,10 +32,6 @@ set(generator_SRC
-     type.cpp
- )
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
 
-# force RPATH so that the binary is usable from within the build tree
-set (CMAKE_SKIP_BUILD_RPATH FALSE)
-set (CMAKE_SKIP_RPATH FALSE)
-
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
- 
- add_executable(smokegen ${generator_SRC})
-diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
-index 947315c..de8d66c 100644
--- a/cmake/SmokeConfig.cmake.in
-+++ b/cmake/SmokeConfig.cmake.in
-@@ -44,21 +44,19 @@ macro (find_smoke_component name)
-         set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
- 
-         find_path(SMOKE_${uppercase}_INCLUDE_DIR 
-            ${lowercase}_smoke.h 
-            PATH ${SMOKE_INCLUDE_DIR}
-            NO_DEFAULT_PATH
-+            ${lowercase}_smoke.h
-+            HINTS ${SMOKE_INCLUDE_DIR}
-+            PATH_SUFFIXES smoke
-             )
-         if(WIN32)
- 		    # DLLs are in the bin directory.
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
-                PATHS "@CMAKE_INSTALL_PREFIX@/bin"
-                NO_DEFAULT_PATH)
-+                PATHS "@CMAKE_INSTALL_PREFIX@/bin")
-         else(WIN32)
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
+ find_library(SMOKE_BASE_LIBRARY smokebase 
 -              PATHS "@SMOKE_LIBRARY_PREFIX@"
 -              NO_DEFAULT_PATH)
 +              PATHS "@SMOKE_LIBRARY_PREFIX@")
-         endif(WIN32)
 
-         if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
+ if (NOT SMOKE_BASE_LIBRARY)
+     if (Smoke_FIND_REQUIRED)
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ b/pkgs/desktops/xfce/applications/mousepad.nix
@ -12,11 +12,15 @@ stdenv.mkDerivation rec {
  };
  name = "${p_name}-${ver_maj}.${ver_min}";

-  buildInputs = [
-    pkgconfig intltool libxfce4util libxfcegui4
+  buildInputs =
+    [ pkgconfig intltool libxfce4util libxfcegui4
      gtk gtksourceview dbus dbus_glib
    ];

+  # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax
+  # highlighting (in fact Mousepad segfaults without it).
+  propagatedUserEnvPkgs = [ gtksourceview ];
+
  meta = {
    homepage = http://www.xfce.org/;
    description = "A simple text editor for Xfce";
--- a/pkgs/desktops/xfce/common.nix
+++ b/pkgs/desktops/xfce/common.nix
@ -57,6 +57,8 @@
    xfce4taskmanager       = callPackage ./applications/xfce4-taskmanager.nix  { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; };
    mousepad               = callPackage ./applications/mousepad.nix           { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; };
    thunar_volman          = callPackage ./core/thunar-volman.nix              { };
+    thunar_archive_plugin  = callPackage ./core/thunar-archive-plugin.nix      { };
+

    #### ART

--- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix
+++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, thunar, intltool, exo, gtk, udev, libxfce4ui, libxfce4util, xfconf }:
+
+stdenv.mkDerivation rec {
+  name  = "thunar-archive-plugin-${version}";
+  maj_ver = "0.3";
+  version = "${maj_ver}.1";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/thunar-plugins/${name}/${maj_ver}/${name}.tar.bz2";
+    sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z";
+  };
+
+  buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ];
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/;
+    description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
+  };
+}
--- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
+++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
@ -0,0 +1,12 @@
+diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml	2013-05-05 18:12:54.000000000 +0200
+++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml	2013-08-15 15:57:48.538586286 +0200
+@@ -7,7 +7,7 @@
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+     <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
+    <property name="IconThemeName" type="string" value="Rodent"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings.nix
@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
    sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi";
  };
+
  name = "${p_name}-${ver_maj}.${ver_min}";

+  patches = [ ./xfce4-settings-default-icon-theme.patch ];
+
  buildInputs =
    [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade
      xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
      #gtk libxfce4util libxfcegui4 libwnck dbus_glib
      #xfconf libglade xorg.iceauth
    ];
+
  configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";

  meta = {
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@ -24,6 +24,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
  libxfcegui4     = callPackage ./core/libxfcegui4.nix { };
  thunar          = callPackage ./core/thunar.nix { };
  thunar_volman   = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
+  thunar_archive_plugin  = callPackage ./core/thunar-archive-plugin.nix { };
  tumbler         = callPackage ./core/tumbler.nix { };
  xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
  xfce4session    = callPackage ./core/xfce4-session.nix { };
@ -48,12 +49,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
  xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
  xfce4terminal   = callPackage ./applications/terminal.nix { };

-
  #### ART                  from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"

  xfce4icontheme  = callPackage ./art/xfce4-icon-theme.nix { };

-
  #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"

  xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom
 , avrdude, arduino_core, avrgcclibc }:

-buildPythonPackage {
-  name = "ino-0.3.4";
+buildPythonPackage rec {
+  name = "ino-0.3.5";
  namePrefix = "";

  src = fetchurl {
-    url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz";
-    sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv";
+    url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz";
+    sha256 = "1j2qzcjp6r2an1v431whq9l47s81d5af6ni8j87gv294f53sl1ab";
  };

  # TODO: add avrgcclibc, it must be rebuild with C++ support
@ -23,12 +23,17 @@ buildPythonPackage {
        requirements.txt
    sed -i -e 's@from ordereddict@from collections@' \
        ino/environment.py ino/utils.py
+
+    # Patch the upload command so it uses the correct avrdude
+    substituteInPlace ino/commands/upload.py \
+      --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \
+      --replace "'-C', self.e['avrdude.conf']," ""
  '';
 
  meta = {
    description = "Command line toolkit for working with Arduino hardware";
    homepage = http://inotool.org/;
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.antono ];
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
  };
 }
--- a/pkgs/development/compilers/avra/default.nix
+++ b/pkgs/development/compilers/avra/default.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchurl, autoconf, automake }:
+stdenv.mkDerivation rec {
+  name = "avra-1.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/avra/${name}.tar.bz2";
+    sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
+  };
+
+  buildInputs = [ autoconf automake ];
+
+  preConfigure = ''
+    cd src/
+
+    aclocal
+    autoconf
+
+    touch NEWS README AUTHORS ChangeLog
+    automake -a
+  '';
+
+  meta = {
+    description = "Assember for the Atmel AVR microcontroller family";
+    homepage = http://avra.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "elm-server";
-  version = "0.8";
-  sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
+  version = "0.9.0.2";
+  sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@ -1,18 +1,18 @@
-{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
-, indents, json, mtl, pandoc, parsec, shakespeare, text
-, transformers
+{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin
+, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate
 }:

 cabal.mkDerivation (self: {
  pname = "Elm";
-  version = "0.8.0.3";
-  sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
+  version = "0.9.0.2";
+  sha256 = "0yr395wsj0spi6h9d6lm5hvdryybpf8i1qpv4gz9dk0bwlyc8iwh";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
-    blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
-    mtl pandoc parsec shakespeare text transformers
+    binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl
+    pandoc parsec transformers unionFind uniplate
  ];
+  doCheck = false;
  meta = {
    homepage = "http://elm-lang.org";
    description = "The Elm language module";
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:

 stdenv.mkDerivation rec {
-  version = "7.7";
+  version = "7.7.20130811";
  name = "ghc-${version}";

  src = fetchurl {
-    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb";
+    url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
+    sha256 = "1jkks2nq9189vxim9lfiwmf3wrnxi834brv9kn9n31225f34qdyr";
  };

  buildInputs = [ ghc perl gmp ncurses ];
@ -19,24 +19,16 @@ stdenv.mkDerivation rec {
    DYNAMIC_BY_DEFAULT = NO
  '';

-  # The tarball errorneously contains an executable that doesn't work in
-  # Nix. Deleting it will cause the program to be re-built locally.
-  postUnpack = ''
-    rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants
-  '';
-
  preConfigure = ''
    echo "${buildMK}" > mk/build.mk
    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
  '';

-  configureFlags=[
-    "--with-gcc=${stdenv.gcc}/bin/gcc"
-  ];
+  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"];
+  stripDebugFlags = [ "-S" "--keep-file-symbols" ];

  meta = {
    homepage = "http://haskell.org/ghc";
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "orc-0.4.17";
+
+  src = fetchurl {
+    url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
+    sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
+  };
+
+  meta = {
+    description = "The Oil Runtime Compiler";
+    homepage = "http://code.entropywave.com/orc/";
+    # The source code implementing the Marsenne Twister algorithm is licensed
+    # under the 3-clause BSD license. The rest is 2-clause BSD license.
+    license = stdenv.lib.licenses.bsd3;
+    platform = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iyzsong ];
+  };
+}
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@ -0,0 +1,37 @@
+{ stdenv, fetchurl, erlang, rebar }:
+
+stdenv.mkDerivation {
+  name = "elixir-0.10.1";
+
+  src = fetchurl {
+    url = "https://github.com/elixir-lang/elixir/archive/v0.10.1.tar.gz";
+    sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w";
+  };
+
+  buildInputs = [ erlang rebar ];
+
+  preBuild = ''
+    substituteInPlace rebar \
+      --replace "/usr/bin/env escript" ${erlang}/bin/escript
+    substituteInPlace Makefile \
+      --replace '$(shell echo `pwd`/rebar)' ${rebar}/bin/rebar \
+      --replace "/usr/local" $out
+  '';
+
+  meta = {
+    homepage = "http://elixir-lang.org/";
+    description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM.";
+
+    longDescription = ''
+      Elixir is a functional, meta-programming
+      aware language built on top of the Erlang VM. It is a dynamic
+      language with flexible syntax and macro support that leverages
+      Erlang's abilities to build concurrent, distributed and
+      fault-tolerant applications with hot code upgrades.p
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
--- a/pkgs/development/interpreters/erlang/R16B01.nix
+++ b/pkgs/development/interpreters/erlang/R16B01.nix
@ -0,0 +1,47 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
+
+assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+
+let version = "16B01"; in
+
+stdenv.mkDerivation {
+  name = "erlang-" + version;
+
+  src = fetchurl {
+    url = "http://www.erlang.org/download/otp_src_R16B01.tar.gz";
+    sha256 = "1h5b2mil79z307mc7ammi38qnd8f50n3sv5vyl4d1gcfgg08nf6s";
+  };
+
+  buildInputs =
+    [ perl gnum4 ncurses openssl
+    ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+
+  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+
+  preConfigure = ''
+    export HOME=$PWD/../
+    sed -e s@/bin/pwd@pwd@g -i otp_build
+  '';
+
+  configureFlags = "--with-ssl=${openssl}";
+
+  meta = {
+    homepage = "http://www.erlang.org/";
+    description = "Programming language used for massively scalable soft real-time systems";
+
+    longDescription = ''
+      Erlang is a programming language used to build massively scalable
+      soft real-time systems with requirements on high availability.
+      Some of its uses are in telecoms, banking, e-commerce, computer
+      telephony and instant messaging. Erlang's runtime system has
+      built-in support for concurrency, distribution and fault
+      tolerance.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    # Note: Maintainer of prev. erlang version was simons. If he wants
+    # to continue maintaining erlang I'm totally ok with that.
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
--- a/pkgs/development/interpreters/lush/default.nix
+++ b/pkgs/development/interpreters/lush/default.nix
@ -0,0 +1,32 @@
+{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL
+, blas, binutils, intltool, gettext, zlib}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="lush";
+    version="2.0.1";
+    name="${baseName}-${version}";
+    hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
+    url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz";
+    sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
+  };
+  buildInputs = [
+    libX11 xproto indent readline gsl freeglut mesa SDL blas binutils
+    intltool gettext zlib
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  NIX_LDFLAGS=" -lz ";
+  meta = {
+    inherit (s) version;
+    description = ''Lisp Universal SHell'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/development/interpreters/lush/default.upstream
+++ b/pkgs/development/interpreters/lush/default.upstream
@ -0,0 +1,3 @@
+url http://sourceforge.net/projects/lush/files/lush2/
+version_link '[.]tar[.]gz/download$'
+SF_redirect
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@ -149,6 +149,12 @@ let
      deps = [ db4 ];
    };

+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
    curses = buildInternalPythonModule {
      moduleName = "curses";
      deps = [ ncurses ];
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@ -164,6 +164,12 @@ let
      deps = [ ncurses ];
    };

+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
    gdbm = buildInternalPythonModule {
      moduleName = "gdbm";
      internalName = "gdbm";
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@ -4,12 +4,12 @@

 stdenv.mkDerivation rec {
  pname = "racket";
-  version = "5.3.5";
+  version = "5.3.6";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk";
+    sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
  };

  # Various racket executables do run-time searches for these.
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
 assert ldapSupport -> openldap != null;

 stdenv.mkDerivation rec {
-  name = "apr-util-1.5.1";
+  name = "apr-util-1.5.2";

  src = fetchurl {
    url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "9c1db8606e520f201c451ec9a0b095f6";
+    md5 = "89c1348aa79e898d7c34a6206311c9c2";
  };

  configureFlags = ''
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@ -5,21 +5,19 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "apr-1.4.6";
+  name = "apr-1.4.8";

  src = fetchurl {
    url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "ffee70a111fd07372982b0550bbb14b7";
+    md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41";
  };

  patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];

  configureFlags =
-    # Don't use accept4 because it's only supported on Linux >= 2.6.28.
-    [ "apr_cv_accept4=no" ]
    # Including the Windows headers breaks unistd.h.
    # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
-    ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
+    stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";

  meta = {
    homepage = http://apr.apache.org/;
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake, fftw, boost }:
+
+stdenv.mkDerivation rec {
+  name = "chromaprint-${version}";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
+    sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf";
+  };
+
+  buildInputs = [ cmake fftw boost ];
+
+  meta = {
+    homepage = "http://acoustid.org/chromaprint";
+    description = "AcoustID audio fingerprinting library";
+    license = stdenv.lib.licenses.lgpl21Plus;
+  };
+}
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@ -8,6 +8,11 @@ cabal.mkDerivation (self: {

  preConfigure = ''
    sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
+    sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
+    sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
+    sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc
+    sed -i -e "s/IO.catch/ E.catch/" System/Fuse.hsc
+    sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc
  '';

  meta = {
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@ -1,16 +1,19 @@
-{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
-, regexCompat, time
+{ cabal, filepath, hslogger, HUnit, mtl, network, parsec
+, QuickCheck, random, regexCompat, testpack, time
 }:

 cabal.mkDerivation (self: {
  pname = "MissingH";
-  version = "1.2.0.0";
-  sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.2.0.1";
+  sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
  buildDepends = [
    filepath hslogger HUnit mtl network parsec random regexCompat time
  ];
+  testDepends = [
+    filepath hslogger HUnit mtl network parsec QuickCheck random
+    regexCompat testpack time
+  ];
+  doCheck = false;
  meta = {
    homepage = "http://software.complete.org/missingh";
    description = "Large utility library";
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "MonadRandom";
-  version = "0.1.10";
-  sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs";
+  version = "0.1.11";
+  sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3";
  buildDepends = [ mtl random transformers ];
  meta = {
    description = "Random-number generation monad";
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "bindings-posix";
-  version = "1.2.3";
-  sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
+  version = "1.2.6";
+  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
  buildDepends = [ bindingsDSL ];
  meta = {
    description = "Low level bindings to posix";
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@ -2,13 +2,13 @@

 cabal.mkDerivation (self: {
  pname = "c2hs";
-  version = "0.16.4";
-  sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi";
+  version = "0.16.5";
+  sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [ filepath languageC ];
  meta = {
-    homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/";
+    homepage = "https://github.com/haskell/c2hs";
    description = "C->Haskell FFI tool that gives some cross-language type safety";
    license = self.stdenv.lib.licenses.gpl2;
    platforms = self.ghc.meta.platforms;
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "clientsession";
-  version = "0.9";
-  sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
+  version = "0.9.0.2";
+  sha256 = "0vl310nickavp8wkaad1wfnvm8gfsg9jcfw3rgjz7698avynv3ni";
  buildDepends = [
    base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
    tagged
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "cmdargs";
-  version = "0.10.4";
-  sha256 = "0y8jmpm31z7dd02xa6b5i6gpdjb6pz4pg7m5wbqff7fhbipf0lk0";
+  version = "0.10.5";
+  sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [ filepath transformers ];
--- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
@ -0,0 +1,24 @@
+{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
+, securemem, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-tests";
+  version = "0.0.2";
+  sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz";
+  buildDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  testDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher tests";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@ -0,0 +1,14 @@
+{ cabal, byteable, securemem }:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-types";
+  version = "0.0.2";
+  sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4";
+  buildDepends = [ byteable securemem ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "cryptocipher";
-  version = "0.5.0";
-  sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd";
+  version = "0.5.1";
+  sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
    testFrameworkQuickcheck2 vector
  ];
  meta = {
-    homepage = "http://github.com/vincenthz/hs-cryptocipher";
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
    description = "Symmetrical block and stream ciphers";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "diagrams-cairo";
-  version = "0.6";
-  sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
+  version = "0.7";
+  sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy";
  buildDepends = [
    cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
    time
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@ -6,8 +6,8 @@

 cabal.mkDerivation (self: {
  pname = "diagrams-contrib";
-  version = "0.6.1";
-  sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
+  version = "0.7";
+  sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac";
  buildDepends = [
    arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
    forceLayout lens MonadRandom mtl split vectorSpace
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "diagrams-core";
-  version = "0.6.0.2";
-  sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85";
+  version = "0.7";
+  sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq";
  buildDepends = [
    dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
    vectorSpacePoints
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "diagrams";
-  version = "0.6";
-  sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
+  version = "0.7";
+  sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
  buildDepends = [
    diagramsContrib diagramsCore diagramsLib diagramsSvg
  ];
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@ -1,14 +1,15 @@
-{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
-, newtype, NumInstances, semigroups, vectorSpace
+{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree
+, intervals, monoidExtras, newtype, NumInstances, semigroups
+, vectorSpace
 }:

 cabal.mkDerivation (self: {
  pname = "diagrams-lib";
-  version = "0.6.0.3";
-  sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1";
+  version = "0.7";
+  sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j";
  buildDepends = [
-    active colour dataDefault diagramsCore monoidExtras newtype
-    NumInstances semigroups vectorSpace
+    active colour dataDefaultClass diagramsCore fingertree intervals
+    monoidExtras newtype NumInstances semigroups vectorSpace
  ];
  meta = {
    homepage = "http://projects.haskell.org/diagrams";
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "diagrams-svg";
-  version = "0.6.0.1";
-  sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk";
+  version = "0.7";
+  sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x";
  buildDepends = [
    blazeSvg cmdargs colour diagramsCore diagramsLib filepath
    monoidExtras mtl split time vectorSpace
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@ -3,8 +3,8 @@

 cabal.mkDerivation (self: {
  pname = "fast-logger";
-  version = "0.3.2";
-  sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla";
+  version = "0.3.3";
+  sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
  buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
  testDepends = [ hspec ];
  meta = {
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@ -2,10 +2,11 @@

 cabal.mkDerivation (self: {
  pname = "feed";
-  version = "0.3.8";
-  sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576";
+  version = "0.3.9.1";
+  sha256 = "1c7dj9w9qj8408qql1kfq8m28fwvfd7bpgkj32lmk5x9qm5iz04k";
  buildDepends = [ utf8String xml ];
  meta = {
+    homepage = "https://github.com/sof/feed";
    description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "generic-deriving";
-  version = "1.5.0";
-  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
+  version = "1.6.1";
+  sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j";
  meta = {
    description = "Generic programming library for generalised deriving";
    license = self.stdenv.lib.licenses.bsd3;
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@ -5,6 +5,10 @@ cabal.mkDerivation (self: {
  version = "0.5.1";
  sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
  buildDepends = [ binary transformers ];
+  postInstall = ''
+      ensureDir "$out/share/ghci"
+      ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+    '';
  meta = {
    description = "Extract the heap representation of Haskell values and thunks";
    license = self.stdenv.lib.licenses.bsd3;
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@ -10,6 +10,10 @@ cabal.mkDerivation (self: {
    cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
    transformers xdot
  ];
+  postInstall = ''
+      ensureDir "$out/share/ghci"
+      ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+    '';
  meta = {
    homepage = "http://felsin9.de/nnis/ghc-vis";
    description = "Live visualization of data structures in GHCi";
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "github";
-  version = "0.7.0";
-  sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p";
+  version = "0.7.1";
+  sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90";
  buildDepends = [
    aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
    httpConduit httpTypes network text time unorderedContainers vector
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "gloss";
-  version = "1.7.8.4";
-  sha256 = "06m90n0gxjhfdl2jalwzwsbgdg854bqw1qygkxbcfcknrpd2ampk";
+  version = "1.8.0.1";
+  sha256 = "17nnmv84pjls1my58yzifbin3pxcnlbpkprglad707rr4lrkkjvv";
  buildDepends = [ bmp GLUT OpenGL ];
  jailbreak = true;
  meta = {
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@ -8,8 +8,8 @@

 cabal.mkDerivation (self: {
  pname = "hakyll";
-  version = "4.3.1.0";
-  sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5";
+  version = "4.3.3.0";
+  sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "haskell-src-meta";
-  version = "0.6.0.2";
-  sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp";
+  version = "0.6.0.3";
+  sha256 = "1ag26pzppvqw9ch6jz1p0bhsld7fz0b01k7h9516hnmy215h7xai";
  buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
  jailbreak = true;
  meta = {
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hastache";
-  version = "0.5.0";
-  sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8";
+  version = "0.5.1";
+  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
  buildDepends = [
    blazeBuilder filepath ieee754 mtl syb text transformers utf8String
  ];
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hspec-meta";
-  version = "1.6.1";
-  sha256 = "089j6dpl856q3m1wyc7n822k7vppzb7pxdcwvzbhck2cadad3zn5";
+  version = "1.6.2";
+  sha256 = "1mw7a4215vl7fivi21kqi139swigzws09jrybmyyns0znv80fpbh";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "hspec";
-  version = "1.6.1";
-  sha256 = "16gwzc5x04kj7847w4nw0msj7myk22hlfkpal9dcpdvslzzy44nh";
+  version = "1.7.0";
+  sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@ -9,8 +9,8 @@

 cabal.mkDerivation (self: {
  pname = "http-conduit";
-  version = "1.9.4.1";
-  sha256 = "181irzldrr554naq2yvs0yzmkkfk26n59snrsmxhr79d9kdp73l4";
+  version = "1.9.4.2";
+  sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx";
  buildDepends = [
    asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
    caseInsensitive certificate conduit cookie cprngAes dataDefault
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@ -0,0 +1,14 @@
+{ cabal, numericExtras }:
+
+cabal.mkDerivation (self: {
+  pname = "intervals";
+  version = "0.2.2";
+  sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q";
+  buildDepends = [ numericExtras ];
+  meta = {
+    homepage = "http://github.com/ekmett/intervals";
+    description = "Interval Arithmetic";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/Show more
+++ b/Show more