Merge remote-tracking branch 'origin/master' into stdenv-updates.

2024-11-17 23:36:17 +01:00 · 2013-06-17 10:14:45 +02:00 · 2013-06-17 10:14:45 +02:00 · 12b29fadcb
commit 12b29fadcb
parent abc7591aaf a33fd118f5
105 changed files with 2566 additions and 914 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,6 +2,8 @@
 ,*
 .*.swp
 .*.swo
-cpan-info
-cpan_tmp/
 result
+doc/NEWS.html
+doc/NEWS.txt
+doc/manual.html
+doc/manual.pdf
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@ -21,7 +21,7 @@ standard <varname>Makefile.PL</varname>.  It’s implemented in <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>

 <para>Perl packages from CPAN are defined in <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>,
 rather than <filename>pkgs/all-packages.nix</filename>.  Most Perl
 packages are so straight-forward to build that they are defined here
 directly, rather than having a separate function for each package
@ -151,6 +151,43 @@ ClassC3Componentised = buildPerlPackage rec {

 </para>

+<section><title>Generation from CPAN</title>
+
+<para>Nix expressions for Perl packages can be generated (almost)
+automatically from CPAN.  This is done by the program
+<command>nix-generate-from-cpan</command>, which can be installed
+as follows:</para>
+
+<screen>
+$ nix-env -i nix-generate-from-cpan
+</screen>
+
+<para>This program takes a Perl module name, looks it up on CPAN,
+fetches and unpacks the corresponding package, and prints a Nix
+expression on standard output.  For example:
+
+<screen>
+$ nix-generate-from-cpan XML::Simple
+  XMLSimple = buildPerlPackage {
+    name = "XML-Simple-2.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz;
+      sha256 = "5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a";
+    };
+    propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];
+    meta = {
+      description = "Easily read/write XML (esp config files)";
+      license = "perl";
+    };
+  };
+</screen>
+
+The output can be pasted into
+<filename>pkgs/top-level/perl-packages.nix</filename> or wherever else
+you need it.</para>
+
+</section>
+
 </section>


--- a/maintainers/scripts/generate-cpan-package
+++ b/maintainers/scripts/generate-cpan-package
@ -1,120 +0,0 @@
-#! /bin/sh -e
-
-name="$1"
-[ -n "$name" ] || { echo "no name"; exit 1; }
-
-cpan -D "$name" > cpan-info
-
-url="$(echo $(cat cpan-info | sed '6!d'))"
-[ -n "$url" ] || { echo "no URL"; exit 1; }
-url="mirror://cpan/authors/id/$url"
-echo "URL = $url" >&2
-
-version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }')
-echo "VERSION = $version"
-
-declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url"))
-hash=${xs[0]}
-path=${xs[1]}
-echo "HASH = $hash" >&2
-
-namedash="$(echo $name | sed s/::/-/g)-$version"
-
-attr=$(echo $name | sed s/:://g)
-
-rm -rf cpan_tmp
-mkdir cpan_tmp
-tar xf "$path" -C cpan_tmp
-
-shopt -s nullglob
-meta=$(echo cpan_tmp/*/META.json)
-if [ -z "$meta" ]; then
-    yaml=$(echo cpan_tmp/*/META.yml)
-    [ -n "$yaml" ] || { echo "no meta file"; exit 1; }
-    meta=$(echo $yaml | sed s/\.yml$/.json/)
-    perl -e '
-      use YAML;
-      use JSON;
-      local $/;
-      $x = YAML::Load(<>);
-      print encode_json $x;
-    ' < $yaml > $meta
-fi
-
-description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')"
-homepage="$(json resources.homepage < $meta)"
-if [ -z "$homepage" ]; then
-    #homepage="$(json meta-spec.url < $meta)"
-    true
-fi
-
-license="$(json license < $meta | json -a 2> /dev/null || true)"
-if [ -z "$license" ]; then
-    license="$(json -a license < $meta)"
-fi
-license="$(echo $license | sed s/perl_5/perl5/)"
-
-f() {
-    local type="$1"
-    perl -e '
-      use JSON;
-      local $/;
-      $x = decode_json <>;
-      if (defined $x->{prereqs}) {
-        $x2 = $x->{prereqs}->{'$type'}->{requires};
-      } elsif ("'$type'" eq "runtime") {
-        $x2 = $x->{requires};
-      } elsif ("'$type'" eq "configure") {
-        $x2 = $x->{configure_requires};
-      } elsif ("'$type'" eq "build") {
-        $x2 = $x->{build_requires};
-      }
-      foreach my $y (keys %{$x2}) {
-        next if $y eq "perl";
-        eval "use $y;";
-        if (!$@) {
-          print STDERR "skipping Perl-builtin module $y\n";
-          next;
-        }
-        print $y, "\n";
-      };
-    ' < $meta | sed s/:://g
-}
-
-confdeps=$(f configure)
-builddeps=$(f build)
-testdeps=$(f test)
-runtimedeps=$(f runtime)
-
-buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq))
-propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq))
-
-echo "===" >&2
-
-cat <<EOF
-  $attr = buildPerlPackage {
-    name = "$namedash";
-    src = fetchurl {
-      url = $url;
-      sha256 = "$hash";
-    };
-EOF
-if [ -n "$buildInputs" ]; then
-    cat <<EOF
-    buildInputs = [ $buildInputs ];
-EOF
-fi
-if [ -n "$propagatedBuildInputs" ]; then
-    cat <<EOF
-    propagatedBuildInputs = [ $propagatedBuildInputs ];
-EOF
-fi
-cat <<EOF
-    meta = {
-      homepage = $homepage;
-      description = "$description";
-      license = "$license";
-    };
-  };
-EOF
-
--- a/maintainers/scripts/nix-generate-from-cpan.nix
+++ b/maintainers/scripts/nix-generate-from-cpan.nix
@ -0,0 +1,22 @@
+{ stdenv, makeWrapper, perl, perlPackages }:
+
+stdenv.mkDerivation {
+  name = "nix-generate-from-cpan-1";
+
+  buildInputs = [ makeWrapper perl perlPackages.YAMLLibYAML perlPackages.JSON ];
+
+  unpackPhase = "true";
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan
+      wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB
+    '';
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    description = "Utility to generate a Nix expression for a Perl package from CPAN";
+  };
+}
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@ -0,0 +1,168 @@
+#! /run/current-system/sw/bin/perl -w
+
+use strict;
+use CPANPLUS::Backend;
+use YAML::XS;
+use JSON;
+
+my $module_name = $ARGV[0];
+die "syntax: $0 <MODULE-NAME>\n" unless defined $module_name;
+
+my $cb = CPANPLUS::Backend->new;
+
+my @modules = $cb->search(type => "name", allow => [$module_name]);
+die "module $module_name not found\n" if scalar @modules == 0;
+die "multiple packages that match module $module_name\n" if scalar @modules > 1;
+my $module = $modules[0];
+
+sub pkg_to_attr {
+    my ($pkg_name) = @_;
+    my $attr_name = $pkg_name;
+    $attr_name =~ s/-\d.*//; # strip version
+    return "LWP" if $attr_name eq "libwww-perl";
+    $attr_name =~ s/-//g;
+    return $attr_name;
+}
+
+sub get_pkg_name {
+    my ($module) = @_;
+    my $pkg_name = $module->package;
+    $pkg_name =~ s/\.tar.*//;
+    $pkg_name =~ s/\.zip//;
+    return $pkg_name;
+}
+
+my $pkg_name = get_pkg_name $module;
+my $attr_name = pkg_to_attr $pkg_name;
+
+print STDERR "attribute name: ", $attr_name, "\n";
+print STDERR "module: ", $module->module, "\n";
+print STDERR "version: ", $module->version, "\n";
+print STDERR "package: ", $module->package, , " (", $pkg_name, ", ", $attr_name, ")\n";
+print STDERR "path: ", $module->path, "\n";
+
+my $tar_path = $module->fetch();
+print STDERR "downloaded to: $tar_path\n";
+print STDERR "sha-256: ", $module->status->checksum_value, "\n";
+
+my $pkg_path = $module->extract();
+print STDERR "unpacked to: $pkg_path\n";
+
+my $meta;
+if (-e "$pkg_path/META.yml") {
+    eval {
+	$meta = YAML::XS::LoadFile("$pkg_path/META.yml");
+    };
+    if ($@) {
+	system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
+	$meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
+    }
+}
+
+print STDERR "metadata: ", encode_json($meta), "\n";
+
+# Map a module to the attribute corresponding to its package
+# (e.g. HTML::HeadParser will be mapped to HTMLParser, because that
+# module is in the HTML-Parser package).
+sub module_to_pkg {
+    my ($module_name) = @_;
+    my @modules = $cb->search(type => "name", allow => [$module_name]);
+    if (scalar @modules == 0) {
+        # Fallback.
+        $module_name =~ s/:://g;
+        return $module_name;
+    }
+    my $module = $modules[0];
+    my $attr_name = pkg_to_attr(get_pkg_name $module);
+    print STDERR "mapped dep $module_name to $attr_name\n";
+    return $attr_name;
+}
+
+sub get_deps {
+    my ($type) = @_;
+    my $deps;
+    if (defined $meta->{prereqs}) {
+        die "unimplemented";
+    } elsif ($type eq "runtime") {
+        $deps = $meta->{requires};
+    } elsif ($type eq "configure") {
+        $deps = $meta->{configure_requires};
+    } elsif ($type eq "build") {
+        $deps = $meta->{build_requires};
+    }
+    my @res;
+    foreach my $n (keys %{$deps}) {
+        next if $n eq "perl";
+        # Hacky way to figure out if this module is part of Perl.
+        if ($n !~ /^JSON/ && $n !~ /^YAML/) {
+            eval "use $n;";
+            if (!$@) {
+                print STDERR "skipping Perl-builtin module $n\n";
+                next;
+            }
+        }
+        push @res, module_to_pkg($n);
+    }
+    return @res;
+}
+
+sub uniq {
+    return keys %{{ map { $_ => 1 } @_ }};
+}
+
+my @build_deps = sort(uniq(get_deps("configure"), get_deps("build"), get_deps("test")));
+print STDERR "build deps: @build_deps\n";
+
+my @runtime_deps = sort(uniq(get_deps("runtime")));
+print STDERR "runtime deps: @runtime_deps\n";
+
+my $homepage = $meta->{resources}->{homepage};
+print STDERR "homepage: $homepage\n" if defined $homepage;
+
+my $description = $meta->{abstract};
+$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
+$description =~ s/\.$//; # remove period at the end
+$description =~ s/\s*$//;
+$description =~ s/^\s*//;
+print STDERR "description: $description\n";
+
+my $license = $meta->{license};
+if (defined $license) {
+    $license = "perl5" if $license eq "perl_5";
+    print STDERR "license: $license\n";
+}
+
+my $build_fun = -e "$pkg_path/Build.PL" && ! -e "$pkg_path/Makefile.PL" ? "buildPerlModule" : "buildPerlPackage";
+
+print STDERR "===\n";
+
+print <<EOF;
+  $attr_name = $build_fun {
+    name = "$pkg_name";
+    src = fetchurl {
+      url = mirror://cpan/${\$module->path}/${\$module->package};
+      sha256 = "${\$module->status->checksum_value}";
+    };
+EOF
+print <<EOF if scalar @build_deps > 0;
+    buildInputs = [ @build_deps ];
+EOF
+print <<EOF if scalar @runtime_deps > 0;
+    propagatedBuildInputs = [ @runtime_deps ];
+EOF
+print <<EOF;
+    meta = {
+EOF
+print <<EOF if defined $homepage;
+      homepage = $homepage;
+EOF
+print <<EOF;
+      description = "$description";
+EOF
+print <<EOF if defined $license;
+      license = "$license";
+EOF
+print <<EOF;
+    };
+  };
+EOF
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@ -1,25 +1,19 @@
 { stdenv, fetchurl, libogg }:

 stdenv.mkDerivation rec {
-  name = "flac-1.2.1";
+  name = "flac-1.3.0";

  src = fetchurl {
-    url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
-    sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
+    url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
+    sha256 = "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs";
  };

  buildInputs = [ libogg ];

-  patches =
-    [ # Fix for building on GCC 4.3.
-      (fetchurl {
-        url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch";
-        sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
-      })
-    ];
+  doCheck = true; # takes lots of time but will be run rarely (small build-time closure)

  meta = {
-    homepage = http://flac.sourceforge.net;
+    homepage = http://xiph.org/flac/;
    description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
  };
 }
--- a/pkgs/applications/editors/emacs-modes/ess/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ess/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, emacs, texinfo }:
+
+stdenv.mkDerivation {
+  name = "ess-13.05";
+
+  src = fetchurl {
+    url = "http://ess.r-project.org/downloads/ess/ess-13.05.tgz";
+    sha256 = "007rd8hg1aclr2i8178ym5c4bi7vgmwkp802v1mkgr85h50zlfdk";
+  };
+
+  buildInputs = [ emacs texinfo ];
+
+  configurePhase = "makeFlags=PREFIX=$out";
+
+  meta = {
+    description = "Emacs Speaks Statistics";
+    homepage = "http://ess.r-project.org/";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@ -4,7 +4,12 @@ args@{source ? "latest", ...}: with args;


 let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} (fix: {
+composableDerivation {
+  # use gccApple to compile on darwin
+  mkDerivation = ( if stdenv.isDarwin
+                   then stdenvAdapters.overrideGCC stdenv gccApple
+                   else stdenv ).mkDerivation;
+} (fix: {

    name = "vim_configurable-7.3";

@ -35,11 +40,12 @@ composableDerivation {} (fix: {
      }.src;
    };

-    configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
+    configureFlags
+      = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];

-    nativeBuildInputs = [ncurses pkgconfig]
-      ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib 
-           libICE ];
+    nativeBuildInputs
+      = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
+          libXmu glib libICE ];

    # most interpreters aren't tested yet.. (see python for example how to do it)
    flags = {
@ -71,14 +77,19 @@ composableDerivation {} (fix: {

  cfg = {
    pythonSupport    = config.vim.python or true;
-    darwinSupport    = config.vim.darwin or false;
+    rubySupport      = config.vim.ruby or true;
    nlsSupport       = config.vim.nls or false;
    tclSupport       = config.vim.tcl or false;
    multibyteSupport = config.vim.multibyte or false;
    cscopeSupport    = config.vim.cscope or false;
+    netbeansSupport  = config.netbeans or true; # eg envim is using it
+
+    # by default, compile with darwin support if we're compiling on darwin, but
+    # allow this to be disabled by setting config.vim.darwin to false
+    darwinSupport    = stdenv.isDarwin && (config.vim.darwin or true);
+
    # add .nix filetype detection and minimal syntax highlighting support
    ftNixSupport     = config.vim.ftNix or true;
-    netbeansSupport = config.netbeans or true; # eg envim is using it
  };

  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
@ -93,22 +104,23 @@ composableDerivation {} (fix: {
      // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program
    */

-  postInstall = "
-    rpath=`patchelf --print-rpath \$out/bin/vim`;
-    for i in \$nativeBuildInputs; do
-      echo adding \$i/lib
-      rpath=\$rpath:\$i/lib
+  postInstall = if stdenv.isLinux then ''
+    rpath=`patchelf --print-rpath $out/bin/vim`;
+    for i in $nativeBuildInputs; do
+      echo adding $i/lib
+      rpath=$rpath:$i/lib
    done
-    echo \$nativeBuildInputs
-    echo \$rpath
-    patchelf --set-rpath \$rpath \$out/bin/{vim,gvim}
-  ";
-  dontStrip =1;
+    echo $nativeBuildInputs
+    echo $rpath
+    patchelf --set-rpath $rpath $out/bin/{vim,gvim}
+  '' else "";
+
+  dontStrip = 1;

  meta = {
    description = "The most popular clone of the VI editor";
-    homepage = "www.vim.org";
+    homepage    = "www.vim.org";
+    platforms   = lib.platforms.unix;
  };
-
 })

--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@ -1,28 +1,33 @@
 { stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }:

 let
+  majVersion = "3.02";
+  version = "${majVersion}.02";
+
  f = lang : sha256 : let
      src = fetchurl {
-        url = "http://tesseract-ocr.googlecode.com/files/${lang}.traineddata.gz";
+        url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz";
        inherit sha256;
      };
    in 
-      "gunzip -c ${src} > $out/share/tessdata/${lang}.traineddata";
+      "tar xfvz ${src} -C $out/share/ --strip=1";

  extraLanguages = ''
-    ${f "cat" "1qndk8qygw9bq7nzn7kzgxkm3jhlq7jgvdqpj5id4rrcaavjvifw"}
-    ${f "rus" "0yjzks189bgcmi2vr4v0l0fla11qdrw3cb1nvpxl9mdis8qr9vcc"}
-    ${f "spa" "1q1hw3qi95q5ww3l02fbhjqacxm34cp65fkbx10wjdcg0s5p9q2x"}
-    ${f "nld" "0cbqfhl2rwb1mg4y1140nw2vhhcilc0nk7bfbnxw6bzj1y5n49i8"}
+    ${f "cat" "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"}
+    ${f "rus" "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"}
+    ${f "spa" "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"}
+    ${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"}
+    ${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"}
+    ${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"}
  '';
 in

-stdenv.mkDerivation {
-  name = "tesseract-3.0.1";
+stdenv.mkDerivation rec {
+  name = "tesseract-${version}";

  src = fetchurl {
-    url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz;
-    sha256 = "c24b0bd278291bc93ab242f93841c1d8743689c943bd804afbc5b898dc0a1c9b";
+    url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${version}.tar.gz";
+    sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96";
  };

  buildInputs = [ autoconf automake libtool leptonica libpng libtiff ];
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@ -0,0 +1,44 @@
+{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
+  curl, ncurses, amdappsdk, amdadlsdk, xorg }:
+
+stdenv.mkDerivation rec {
+  version = "2.11.4";
+  name = "cgminer-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/ckolivas/cgminer.git";
+    rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715";
+    sha256  = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a";
+  };
+
+  buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ];
+  configureScript = "./autogen.sh";
+  configureFlags = "--enable-scrypt";
+  NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
+
+  preConfigure = ''
+    ln -s ${amdadlsdk}/include/* ADL_SDK/
+  '';
+
+  postBuild = ''
+    gcc api-example.c -I compat/jansson -o cgminer-api
+  '';
+
+  postInstall = ''
+    cp cgminer-api $out/bin/
+    chmod 444 $out/bin/*.cl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CPU/GPU miner in c for bitcoin";
+    longDescription= ''
+      This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU
+      monitoring, (over)clocking and fanspeed support for bitcoin and derivative
+      coins. Do not use on multiple block chains at the same time!
+    '';
+    homepage = "https://github.com/ckolivas/cgminer";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.offline ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@ -0,0 +1,45 @@
+{ stdenv, fetchurl, unzip, makeDesktopItem, mono }:
+
+stdenv.mkDerivation rec {
+  name = "keepass-${version}";
+  version = "2.22";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/keepass/KeePass-${version}.zip";
+    sha256 = "0mman7r1jmirfwzix5qww0yn4rrgzcg7546basxjvvfc8flp43j0";
+  };
+
+  sourceRoot = ".";
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  desktopItem = makeDesktopItem {
+    name = "keepass";
+    exec = "keepass";
+    comment = "Password manager";
+    desktopName = "Keepass";
+    genericName = "Password manager";    
+    categories = "Application;Other;";
+  };
+
+
+  installPhase = ''
+    ensureDir "$out/bin"
+    echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass
+    chmod +x $out/bin/keepass
+    echo $out
+    cp -r ./* $out/
+    ensureDir "$out/share/applications"
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  buildInputs = [ unzip ];
+
+  meta = {
+    description = "GUI password manager with strong cryptography";
+    homepage = http://www.keepass.info/;
+    maintainers = with stdenv.lib.maintainers; [amorsillo];
+    platforms = with stdenv.lib.platforms; all;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
  dev = {
-    version = "29.0.1516.3";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1516.3.tar.xz";
-    sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k";
+    version = "29.0.1521.3";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1521.3.tar.xz";
+    sha256 = "0szc3g24jlhcp8cgijdv0q9rfn3mhp2kjyc85ml4snskkpasfrv3";
  };
  beta = {
-    version = "28.0.1500.36";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.36.tar.xz";
-    sha256 = "1bz9w46ps8gj056hfwbcj4myyxyr7y759nagz9idraia8116m3pp";
+    version = "28.0.1500.45";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.45.tar.xz";
+    sha256 = "01sxqv6i7m5h0jsypg801w2ivbrir37wdi4ijd5yvprkyzbd90zi";
  };
  stable = {
    version = "27.0.1453.110";
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@ -1,6 +1,7 @@
 #!/bin/sh

 channels_url="http://omahaproxy.appspot.com/all?csv=1";
+history_url="http://omahaproxy.appspot.com/history";
 bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
 output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix";

@ -41,6 +42,17 @@ sha_insert()
    ver_sha_table="$ver_sha_table $version:$sha256";
 }

+get_newest_ver()
+{
+    versions="$(for v in $@; do echo "$v"; done)";
+    if oldest="$(echo "$versions" | sort -V 2> /dev/null | tail -n1)";
+    then
+        echo "$oldest";
+    else
+        echo "$versions" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n1;
+    fi;
+}
+
 if [ -e "$output_file" ];
 then
    get_sha256()
@ -53,38 +65,55 @@ then

        echo -n "Checking if $oldver ($channel) is up to date..." >&2;

-        if [ "x$version" != "x$oldver" ];
+        if [ "x$(get_newest_ver "$version" "$oldver")" != "x$oldver" ];
        then
            echo " no, getting sha256 for new version $version:" >&2;
-            sha256="$(nix-prefetch-url "$url")";
+            sha256="$(nix-prefetch-url "$url")" || return 1;
        else
            echo " yes, keeping old sha256." >&2;
-            sha256="$(nix_getattr "$output_file" "$channel.sha256")";
+            sha256="$(nix_getattr "$output_file" "$channel.sha256")" \
+                || return 1;
        fi;

        sha_insert "$version" "$sha256";
        echo "$sha256";
+        return 0;
    }
 else
    get_sha256()
    {
-        nix-prefetch-url "$url";
+        nix-prefetch-url "$3";
    }
 fi;

+fetch_filtered_history()
+{
+    curl -s "$history_url" | sed -nr 's/^'"linux,$1"',([^,]+).*$/\1/p';
+}
+
+get_prev_sha256()
+{
+    channel="$1";
+    current_version="$2";
+
+    for version in $(fetch_filtered_history "$channel");
+    do
+        [ "x$version" = "x$current_version" ] && continue;
+        url="${bucket_url%/}/chromium-$version.tar.xz";
+        sha256="$(get_sha256 "$channel" "$version" "$url")" || continue;
+        echo "$sha256:$version:$url";
+        return 0;
+    done;
+}
+
 get_channel_exprs()
 {
-    for chline in $(echo "$1" | cut -d, -f-2);
+    for chline in $1;
    do
        channel="${chline%%,*}";
        version="${chline##*,}";

-        # XXX: Remove case after version 26 is stable:
-        if [ "${version%%.*}" -ge 26 ]; then
-            url="${bucket_url%/}/chromium-$version.tar.xz";
-        else
-            url="${bucket_url%/}/chromium-$version.tar.bz2";
-        fi;
+        url="${bucket_url%/}/chromium-$version.tar.xz";

        echo -n "Checking if sha256 of version $version is cached..." >&2;
        if sha256="$(sha_lookup "$version")";
@ -93,6 +122,17 @@ get_channel_exprs()
        else
            echo " no." >&2;
            sha256="$(get_sha256 "$channel" "$version" "$url")";
+            if [ $? -ne 0 ];
+            then
+                echo "Whoops, failed to fetch $version, trying previous" \
+                     "versions:" >&2;
+
+                sha_ver_url="$(get_prev_sha256 "$channel" "$version")";
+                sha256="${sha_ver_url%%:*}";
+                ver_url="${sha_ver_url#*:}";
+                version="${ver_url%%:*}";
+                url="${ver_url#*:}";
+            fi;
        fi;

        sha_insert "$version" "$sha256";
@ -108,7 +148,7 @@ get_channel_exprs()
 cd "$(dirname "$0")";

 omaha="$(curl -s "$channels_url")";
-versions="$(echo "$omaha" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')";
+versions="$(echo "$omaha" | sed -nr -e 's/^linux,([^,]+,[^,]+).*$/\1/p')";
 channel_exprs="$(get_channel_exprs "$versions")";

 cat > "$output_file" <<-EOF
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@ -1,16 +1,16 @@
 { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:

 let
-  rev = "59ddcbe66a";
+  rev = "cab3fc915c";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-20130315-${rev}";
+  name = "irssi-otr-20130601-${rev}";
  
  src = fetchurl {
    url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
    name = "${name}.tar.gz";
-    sha256 = "095dak0d10j6cpkwlqmk967p1wypwzvqr4wdqvb30w14dbn8dy0d";
+    sha256 = "0kn9c562zfh36gpcrbpslwjjr78baagdwphczz2d608ndczm1vrk";
  };

  patchPhase = ''
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@ -3,12 +3,12 @@
 , pythonPackages, cacert, cmake, makeWrapper }:

 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.4.1";
  name = "weechat-${version}";

  src = fetchurl {
    url = "http://weechat.org/files/src/${name}.tar.gz";
-    sha256 = "17jxknam1bbakmdfqy1b2cfc8l9ag90l3z1gcxdvwg358wasv9dc";
+    sha256 = "0gsn0mp921j7jpvrxc74h0gs0bn0w808j2zqghm1w7xbjw9hl49w";
  };

  buildInputs = 
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@ -0,0 +1,63 @@
+{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
+, xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic
+, trollop, lockfile, gettext, iconv, locale, text }:
+
+stdenv.mkDerivation {
+  name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4";
+  
+  meta = {
+    homepage = http://supmua.org;
+    description = "A curses threads-with-tags style email client";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+  };
+
+  dontStrip = true;
+
+  src = fetchurl {
+    url = "https://github.com/sup-heliotrope/sup/archive/d21f027afcd6a4031de9619acd8dacbd2f2f4fd4.tar.gz";
+    sha256 = "0syifva6pqrg3nyy7xx7nan9zswb4ls6bkk96vi9ki2ly1ymwcdp";
+  };
+
+  buildInputs =
+    [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_full_alaveteli
+      libiconvOrEmpty ];
+
+  buildPhase = "rake gem";
+
+  # TODO: Move gem dependencies out
+
+  installPhase = ''
+    export HOME=$TMP/home; mkdir -pv "$HOME"
+
+    GEM_PATH="$GEM_PATH:$out/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${chronic}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${gettext}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${iconv}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${locale}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}"
+    GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}"
+
+    # Don't install some dependencies -- we have already installed
+    # the dependencies but gem doesn't acknowledge this
+    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
+        --bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \
+        --ignore-dependencies
+
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH"
+    done
+
+    for prog in $out/gems/*/bin/*; do
+      [[ -e "$out/bin/$(basename $prog)" ]]
+    done
+  '';
+}
+
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@ -4,15 +4,15 @@
 , makeWrapper, autoconf, automake }:

 let
-  rev = "27317";
+  rev = "27399";
 in
 stdenv.mkDerivation rec {
  name = "gnunet-svn-${rev}";

  src = fetchsvn {
    url =  https://gnunet.org/svn/gnunet;
-    rev = "27317";
-    sha256 = "1l7jypm57wjhzlwdj8xzhfppjdpy6wbph4nqgwxxb9q056wwf9zy";
+    inherit rev;
+    sha256 = "0fn7ppfnc4v6lkxwww11s0h8mdvwyv7f40f6wrbfilqpn2ncrf8c";
  };

  buildInputs = [
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@ -9,11 +9,11 @@
 */

 stdenv.mkDerivation rec {
-  name = "gnucash-2.4.11";
+  name = "gnucash-2.4.13";

  src = fetchurl {
    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0qbpgd6spclkmwryi66cih0igi5a6pmsnk41mmnscpfpz1mddhwk";
+    sha256 = "0j4m00a3r1hcrhkfjkx3sgi2r4id4wrc639i4s00j35rx80540pn";
  };

  buildInputs = [
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@ -3,7 +3,7 @@
 {stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:

 let 
-  version = "8.4";
+  version = "8.4pl2";
  buildIde = lablgtk != null;
  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
  idePath = if buildIde then ''
@ -15,8 +15,8 @@ stdenv.mkDerivation {
  name = "coq-${version}";

  src = fetchurl {
-    url = "http://pauillac.inria.fr/~herbelin/coq/distrib/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0ka2lak9il4hlblk461awf0hbi3mxqhc1wz6kllxradyy2vfaspl";
+    url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
+    sha256 = "1n52pky7bb45irk2jw6f4rd3kvy8lm2yfldjwdhiic0kyqw9lwgv";
  };

  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
--- 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.9";
+  version = "1.7.10";

  name = "subversion-${version}";

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

  buildInputs = [ zlib apr aprutil sqlite ]
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@ -10,13 +10,18 @@

 stdenv.mkDerivation rec {
  name = "vlc-${version}";
-  version = "2.0.6";
+  version = "2.0.7";

  src = fetchurl {
    url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i";
+    sha256 = "052kfkpd0r2fwkyz97qhz2a368xqxa905qacrd1bkl2bkvahfc94";
  };

+  postPatch = /* flac 1.3.0 fix */ ''
+    sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c
+    sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c
+  '';
+
  buildInputs =
    [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
      libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@ -1,21 +1,21 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
 , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
- , tcl, tk, xproto, libX11, git
+ , tcl, tk, xproto, libX11, git, mpfr
 } :
 let
  realGcc = stdenv.gcc.gcc;
 in
 stdenv.mkDerivation rec {
  pname = "julia";
-  date = "20130205";
+  date = "20130611";
  name = "${pname}-git-${date}";

  grisu_ver = "1.1.1";
  dsfmt_ver = "2.2";
  openblas_ver = "v0.2.2";
  lapack_ver = "3.4.1";
-  arpack_ver = "3.1.2";
+  arpack_ver = "3.1.3";
  clp_ver = "1.14.5";
  lighttpd_ver = "1.4.29";
  patchelf_ver = "0.6";
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
    sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e";
  };
  arpack_src = fetchurl {
-    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/497/get/";
-    name = "arpack-ng_${arpack_ver}.tar.gz";
-    sha256 = "1wk06bdjgap4hshx0lswzi7vxy2lrdx353y1k7yvm97mpsjvsf4k";
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/607/get/";
+    name = "arpack-ng-${arpack_ver}.tar.gz";
+    sha256 = "039w7j3dr1xy35a3hp92zg2g92gmjq6xsv0g4awlb4cffy09nr2d";
  };
  lapack_src = fetchurl {
    url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
@ -65,17 +65,17 @@ stdenv.mkDerivation rec {

  src = fetchgit {
    url = "git://github.com/JuliaLang/julia.git";
-    rev = "efc696bf74eec7605b4da19f6f1605ba99959ed3";
-    sha256 = "19if7aj3mrp84dg9g2d3zbhasrq0nz28djl9a01m0y4y9bfymp7s";
+    rev = "60cc4e44bf415dcda90f2bbe22300f842fe44098";
+    sha256 = "018s0zyvdkxjldbvcdv40q3v2gcjznyyql5pv3zhhy1iq11jddfz";
  };

  buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack tcl tk xproto libX11 git
+    openblas liblapack tcl tk xproto libX11 git mpfr
    ];

  configurePhase = ''
-    for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB; 
+    for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; 
    do 
      makeFlags="$makeFlags USE_SYSTEM_$i=1 "
    done
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
    copy_kill_hash "${dsfmt_src}" deps/random

    ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''}
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "

    export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
@ -110,6 +110,21 @@ stdenv.mkDerivation rec {

  preBuild = ''
    mkdir -p usr/lib
+    
+    echo "$out"
+    mkdir -p "$out/lib"
+    (
+    cd "$(mktemp -d)"
+    for i in "${suitesparse}"/lib/lib*.a; do
+      ar -x $i
+    done
+    gcc *.o --shared -o "$out/lib/libsuitesparse.so"
+    )
+    cp "$out/lib/libsuitesparse.so" usr/lib
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
+      ln -s libsuitesparse.so "usr"/lib/lib$i.so;
+    done
  '';

  preInstall = ''
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}:
+{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11}:

 stdenv.mkDerivation rec {
  name = "mono-2.11.4";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
    sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr";
  };

-  buildInputs = [bison pkgconfig glib gettext perl libgdiplus];
+  buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11];
  propagatedBuildInputs = [glib];

  NIX_LDFLAGS = "-lgcc_s" ;
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  # In fact I think this line does not help at all to what I
  # wanted to achieve: have mono to find libgdiplus automatically
-  configureFlags = "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so";
+  configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so";

  # Attempt to fix this error when running "mcs --version":
  # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
@ -31,6 +31,17 @@ stdenv.mkDerivation rec {
    patchShebangs ./
  ";

+  #Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
+  #Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
+  #http://www.mono-project.com/Config_DllMap
+  postBuild = ''
+    find . -name 'config' -type f | while read i; do
+        sed -i "s@libMonoPosixHelper.so@$out/lib/libMonoPosixHelper.so@g" $i
+        sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i
+        sed -i '2 i\<dllmap dll="gdiplus.dll" target="${libgdiplus}/lib/libgdiplus.so" os="!windows"/>' $i
+    done
+  '';
+
  meta = {
    homepage = http://mono-project.com/;
    description = "Cross platform, open source .NET development framework";
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@ -89,7 +89,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
      };

      gd = {
-        configureFlags = ["--with-gd=${gd} --with-freetype-dir=${freetype}"];
+        configureFlags = [
+          "--with-gd"
+          "--with-freetype-dir=${freetype}"
+          "--with-png-dir=${libpng}"
+          "--with-jpeg-dir=${libjpeg}"
+        ];
        buildInputs = [gd libpng libjpeg freetype];
      };

--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@ -90,7 +90,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)

      gd = {
        # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
-        configureFlags = ["--with-gd --with-freetype-dir=${freetype} --with-png-dir=${libpng}"];
+        configureFlags = [
+          "--with-gd"
+          "--with-freetype-dir=${freetype}"
+          "--with-png-dir=${libpng}"
+          "--with-jpeg-dir=${libjpeg}"
+        ];
        buildInputs = [ libpng libjpeg freetype ];
      };

--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@ -35,16 +35,20 @@ g: # Get dependencies from patched gems
    ffi = g.ffi_1_6_0;
    file_tail = g.file_tail_1_0_12;
    foreman = g.foreman_0_62_0;
+    gettext = g.gettext_2_3_9;
    highline = g.highline_1_6_16;
    hike = g.hike_1_2_1;
    hoe = g.hoe_3_1_0;
    i18n = g.i18n_0_6_4;
+    iconv = g.iconv_1_0_3;
    journey = g.journey_1_0_4;
    jruby_pageant = g.jruby_pageant_1_1_1;
    jsduck = g.jsduck_4_7_1;
    json = g.json_1_7_7;
    json_pure = g.json_pure_1_7_7;
    libv8 = g.libv8_3_3_10_4;
+    locale = g.locale_2_0_8;
+    lockfile = g.lockfile_2_1_0;
    macaddr = g.macaddr_1_6_1;
    mail = g.mail_2_5_3;
    mime_types = g.mime_types_1_21;
@ -74,6 +78,7 @@ g: # Get dependencies from patched gems
    right_aws = g.right_aws_3_0_5;
    right_http_connection = g.right_http_connection_1_3_0;
    rjb = g.rjb_1_4_6;
+    rmail = g.rmail_1_0_0;
    rspec = g.rspec_2_11_0;
    rspec_core = g.rspec_core_2_11_1;
    rspec_expectations = g.rspec_expectations_2_11_3;
@ -87,16 +92,19 @@ g: # Get dependencies from patched gems
    sprockets = g.sprockets_2_2_2;
    syslog_protocol = g.syslog_protocol_0_9_2;
    systemu = g.systemu_2_5_2;
+    text = g.text_1_2_1;
    therubyracer = g.therubyracer_0_10_2;
    thin = g.thin_1_5_1;
    thor = g.thor_0_18_0;
    tilt = g.tilt_1_3_6;
    tins = g.tins_0_7_2;
    treetop = g.treetop_1_4_12;
+    trollop = g.trollop_2_0;
    tzinfo = g.tzinfo_0_3_37;
    uuid = g.uuid_2_3_7;
    uuidtools = g.uuidtools_2_1_3;
    websocket = g.websocket_1_0_7;
+    xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5;
    xml_simple = g.xml_simple_1_1_1;
    yajl_ruby = g.yajl_ruby_1_1_0;
  };
@ -570,6 +578,20 @@ using TCP/IP, especially if custom protocols are required.'';
      requiredGems = [ g.thor_0_18_0 ];
      sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
    };
+    gettext_2_3_9 = {
+      basename = ''gettext'';
+      meta = {
+        description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
+        homepage = ''http://ruby-gettext.github.com/'';
+        longDescription = ''Gettext is a GNU gettext-like program for Ruby.
+The catalog file(po-file) is same format with GNU gettext.
+So you can use GNU gettext tools for maintaining.
+'';
+      };
+      name = ''gettext-2.3.9'';
+      requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ];
+      sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj'';
+    };
    highline_1_6_16 = {
      basename = ''highline'';
      meta = {
@ -653,6 +675,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
      requiredGems = [  ];
      sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f'';
    };
+    iconv_1_0_3 = {
+      basename = ''iconv'';
+      meta = {
+        description = ''iconv wrapper library'';
+        homepage = ''https://github.com/nurse/iconv'';
+        longDescription = ''iconv wrapper library'';
+      };
+      name = ''iconv-1.0.3'';
+      requiredGems = [  ];
+      sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl'';
+    };
    journey_1_0_4 = {
      basename = ''journey'';
      meta = {
@ -730,6 +763,29 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
      requiredGems = [  ];
      sha256 = ''0zy585rs1ihm8nsw525wgmbkcq7aqy1k9dbkk8s6953adl0bpz42'';
    };
+    locale_2_0_8 = {
+      basename = ''locale'';
+      meta = {
+        description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.'';
+        homepage = ''https://github.com/ruby-gettext/locale'';
+        longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+'';
+      };
+      name = ''locale-2.0.8'';
+      requiredGems = [  ];
+      sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12'';
+    };
+    lockfile_2_1_0 = {
+      basename = ''lockfile'';
+      meta = {
+        description = ''lockfile'';
+        homepage = ''https://github.com/ahoward/lockfile'';
+        longDescription = ''description: lockfile kicks the ass'';
+      };
+      name = ''lockfile-2.1.0'';
+      requiredGems = [  ];
+      sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf'';
+    };
    macaddr_1_6_1 = {
      basename = ''macaddr'';
      meta = {
@ -1199,6 +1255,17 @@ algorithm for low-level network errors.
      requiredGems = [  ];
      sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20'';
    };
+    rmail_1_0_0 = {
+      basename = ''rmail'';
+      meta = {
+        description = ''A MIME mail parsing and generation library.'';
+        homepage = ''http://www.rfc20.org/rubymail'';
+        longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.'';
+      };
+      name = ''rmail-1.0.0'';
+      requiredGems = [  ];
+      sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp'';
+    };
    rspec_2_11_0 = {
      basename = ''rspec'';
      meta = {
@ -1355,6 +1422,17 @@ interpreters.'';
      requiredGems = [  ];
      sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
    };
+    text_1_2_1 = {
+      basename = ''text'';
+      meta = {
+        description = ''A collection of text algorithms'';
+        homepage = ''http://github.com/threedaymonk/text'';
+        longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming'';
+      };
+      name = ''text-1.2.1'';
+      requiredGems = [  ];
+      sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
+    };
    therubyracer_0_10_2 = {
      basename = ''therubyracer'';
      meta = {
@ -1420,6 +1498,21 @@ interpreters.'';
      requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
      sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
    };
+    trollop_2_0 = {
+      basename = ''trollop'';
+      meta = {
+        description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.'';
+        homepage = ''http://trollop.rubyforge.org'';
+        longDescription = ''Trollop is a commandline option parser for Ruby that just
+gets out of your way. One line of code per option is all you need to write.
+For that, you get a nice automatically-generated help page, robust option
+parsing, command subcompletion, and sensible defaults for everything you don't
+specify.'';
+      };
+      name = ''trollop-2.0'';
+      requiredGems = [  ];
+      sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz'';
+    };
    tzinfo_0_3_37 = {
      basename = ''tzinfo'';
      meta = {
@ -1467,6 +1560,16 @@ interpreters.'';
      requiredGems = [  ];
      sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0'';
    };
+    xapian_full_alaveteli_1_2_9_5 = {
+      basename = ''xapian_full_alaveteli'';
+      meta = {
+        description = ''xapian-core + Ruby xapian-bindings'';
+        longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library'';
+      };
+      name = ''xapian-full-alaveteli-1.2.9.5'';
+      requiredGems = [  ];
+      sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm'';
+    };
    xml_simple_1_1_1 = {
      basename = ''xml_simple'';
      meta = {
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@ -1,5 +1,5 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
-, zlib, libuuid, gems, jdk, python, stdenv }:
+, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty }:

 let

@ -13,7 +13,7 @@ let
 in

 {
-  sup = { buildInputs = [ gems.ncursesw ]; };
+  iconv = { buildInputs = [ libiconvOrEmpty ]; };

  libv8 = {
    # This fix is needed to fool scons, which clears the environment by default.
@ -91,6 +91,10 @@ in
    gemFlags = "--no-rdoc --no-ri";
  };

+  xapian_full_alaveteli = {
+    buildInputs = [ zlib libuuid ];
+  };
+
  rjb = {
    buildInputs = [ jdk ];
    JAVA_HOME = jdk;
--- a/pkgs/development/libraries/atk/2.6.x.nix
+++ b/pkgs/development/libraries/atk/2.6.x.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib }:
+{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:

 stdenv.mkDerivation rec {
  name = "atk-2.6.0";
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
    sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
  };

+  buildInputs = libintlOrEmpty;
+
  nativeBuildInputs = [ pkgconfig perl ];

  propagatedBuildInputs = [ glib ];
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
    stdenv.lib.optional postscriptSupport zlib ++
    stdenv.lib.optional pngSupport libpng;

+  NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
+
  configureFlags =
    [ "--enable-tee" ]
    ++ stdenv.lib.optional xcbSupport "--enable-xcb"
--- a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
+, jasper, libintlOrEmpty }:

 stdenv.mkDerivation rec {
  name = "gdk-pixbuf-2.26.1";
@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
  };

  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 ];
+  buildInputs = [ libX11 libintlOrEmpty ];

  nativeBuildInputs = [ pkgconfig ];

--- a/pkgs/development/libraries/gtk+/2.24.x.nix
+++ b/pkgs/development/libraries/gtk+/2.24.x.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
-, gdk_pixbuf, xz
+, gdk_pixbuf, xz, libintlOrEmpty
 , xineramaSupport ? true
 , cupsSupport ? true, cups ? null
 }:
@ -17,12 +17,14 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+
  nativeBuildInputs = [ perl pkgconfig ];

  propagatedBuildInputs =
    [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
-      xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
-    ]
+      xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ]
+    ++ libintlOrEmpty
    ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
    ++ stdenv.lib.optionals cupsSupport [ cups ];

--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "Agda";
-  version = "2.3.2";
-  sha256 = "1xp0qvag6wx6zjwhmb7nm13hp63vlh8h4a2rkc85rsh610m0nynl";
+  version = "2.3.2.1";
+  sha256 = "1dlf0cs913ma8wjvra8x6p0lwi1pk7ynbdq4lxgbdfgqkbnh43kr";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@ -0,0 +1,18 @@
+{ cabal, cairo, Chart, colour, dataAccessor, dataAccessorTemplate
+, gtk, mtl, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Chart-gtk";
+  version = "0.17";
+  sha256 = "1i411kdpz75azyhfaryazr0bpij5xcl0y82m9a7k23w8mhybqwc7";
+  buildDepends = [
+    cairo Chart colour dataAccessor dataAccessorTemplate gtk mtl time
+  ];
+  meta = {
+    homepage = "https://github.com/timbod7/haskell-chart/wiki";
+    description = "Utility functions for using the chart library with GTK";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@ -4,13 +4,13 @@

 cabal.mkDerivation (self: {
  pname = "Chart";
-  version = "0.16";
-  sha256 = "1mb8hgxj0i5s7l061pfn49m5f6qdwvmgy6ni7jmg85vpy6b7jra3";
+  version = "0.17";
+  sha256 = "1ip1a61ryypwfzj6dc6n6pl92rflf7lqf1760ppjyg05q5pn6qxg";
  buildDepends = [
    cairo colour dataAccessor dataAccessorTemplate mtl time
  ];
  meta = {
-    homepage = "http://www.dockerz.net/software/chart.html";
+    homepage = "https://github.com/timbod7/haskell-chart/wiki";
    description = "A library for generating 2D Charts and Plots";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@ -1,11 +1,11 @@
-{ cabal }:
+{ cabal, HUnit, QuickCheck, random, text, vector }:

 cabal.mkDerivation (self: {
  pname = "ListLike";
-  version = "3.1.7.1";
-  sha256 = "1g3i8iz71x3j41ji9xsbh84v5hj3mxls0zqnx27sb31mx6bic4w1";
-  isLibrary = true;
-  isExecutable = true;
+  version = "4.0.0";
+  sha256 = "13dw8pkj8dwxb81gbcm7gn221zyr3ck9s9s1iv7v1b69chv0zyxk";
+  buildDepends = [ text vector ];
+  testDepends = [ HUnit QuickCheck random text vector ];
  meta = {
    homepage = "http://software.complete.org/listlike";
    description = "Generic support for list-like structures";
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@ -5,8 +5,8 @@

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

 cabal.mkDerivation (self: {
  pname = "accelerate-io";
-  version = "0.13.0.1";
-  sha256 = "0wjprbhcddnjqbhmpxiwq73hazdnhafhjj7mpvpxhs9pz1dbv89h";
+  version = "0.13.0.2";
+  sha256 = "0lm1kkjs5gbd70k554vi9977v4bxxcxaw39r9wmwxf8nx2qxvshh";
  buildDepends = [ accelerate bmp repa vector ];
  meta = {
    homepage = "https://github.com/AccelerateHS/accelerate-io";
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "accelerate";
-  version = "0.13.0.4";
-  sha256 = "1rhbvzgafw3cx2wi4zfil4nxcziqpbh20q3nafck30q2xvrwkmwm";
+  version = "0.13.0.5";
+  sha256 = "1vqkv3k0w1zy0111a786npf3hypbcg675lbdkv2cf3zx5hqcnn6j";
  buildDepends = [ fclabels hashable hashtables ];
  meta = {
    homepage = "https://github.com/AccelerateHS/accelerate/";
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "acid-state";
-  version = "0.8.3";
-  sha256 = "1n7vafw3jz7kmlp5jqn1wv0ip2rcbyfx0cdi2m1a2lvpi6dh97gc";
+  version = "0.10.0";
+  sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc";
  buildDepends = [
    cereal extensibleExceptions filepath mtl network safecopy stm
  ];
--- a/pkgs/development/libraries/haskell/binary/0.6.0.0.nix
+++ b/pkgs/development/libraries/haskell/binary/0.6.0.0.nix
@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "binary";
+  version = "0.6.0.0";
+  sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv";
+  meta = {
+    homepage = "https://github.com/kolmodin/binary";
+    description = "Binary serialisation for Haskell values using lazy ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/binary/0.7.1.0.nix
+++ b/pkgs/development/libraries/haskell/binary/0.7.1.0.nix
--- a/pkgs/development/libraries/haskell/bytedump/default.nix
+++ b/pkgs/development/libraries/haskell/bytedump/default.nix
@ -0,0 +1,15 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bytedump";
+  version = "1.0";
+  sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-bytedump";
+    description = "Flexible byte dump helpers for human readers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "concurrent-extra";
-  version = "0.7.0.5";
-  sha256 = "0g1ckrwgdyrlp1m352ivplajqzqhw5ymlkb4miiv7c5i9xyyyqnc";
+  version = "0.7.0.6";
+  sha256 = "12wq86hkgy22qydkj4fw6vb7crzv3010c2mkhsph4rdynr0v588i";
  buildDepends = [ baseUnicodeSymbols stm unboundedDelays ];
  testDepends = [
    baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@ -1,34 +1,31 @@
 { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs
-, cryptohash, dataDefault, deepseq, filepath, httpConduit
+, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit
 , httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck
-, random, regexBase, regexTdfa, snapCore, snapServer, tagsoup
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, time
+, random, regexBase, regexTdfa, snapCore, snapServer
+, systemFilepath, tagsoup, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, text, time
 }:

 cabal.mkDerivation (self: {
  pname = "hakyll";
-  version = "4.2.2.0";
-  sha256 = "0kz8v2ip0hmvqnrxgv44g2863z1dql88razl7aa3fw01q56ihz0y";
+  version = "4.3.0.0";
+  sha256 = "188j3spdi2mivx5a10whpb09fm8yhg54ddfwc6x0k040c7q3aq0q";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
-    dataDefault deepseq filepath httpConduit httpTypes lrucache mtl
-    pandoc parsec random regexBase regexTdfa snapCore snapServer
-    tagsoup text time
+    dataDefault deepseq filepath fsnotify httpConduit httpTypes
+    lrucache mtl pandoc parsec random regexBase regexTdfa snapCore
+    snapServer systemFilepath tagsoup text time
  ];
  testDepends = [
    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
-    dataDefault deepseq filepath httpConduit httpTypes HUnit lrucache
-    mtl pandoc parsec QuickCheck random regexBase regexTdfa snapCore
-    snapServer tagsoup testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time
+    dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit
+    lrucache mtl pandoc parsec QuickCheck random regexBase regexTdfa
+    snapCore snapServer systemFilepath tagsoup testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 text time
  ];
  doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|cryptohash .*,|cryptohash,|' hakyll.cabal
-  '';
  meta = {
    homepage = "http://jaspervdj.be/hakyll";
    description = "A static website compiler library";
--- a/pkgs/development/libraries/haskell/hashable/1.2.0.10.nix
+++ b/pkgs/development/libraries/haskell/hashable/1.2.0.10.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hashable";
-  version = "1.2.0.7";
-  sha256 = "1v70b85g9kx0ikgxpiqpl8dp3w9hdxm75h73g69giyiy7swn9630";
+  version = "1.2.0.10";
+  sha256 = "155r7zqc0kisjdslr8d1c04yqwvzwqx4d99c0zla113dvsdjhp37";
  buildDepends = [ text ];
  testDepends = [
    HUnit QuickCheck random testFramework testFrameworkHunit
--- a/pkgs/development/libraries/haskell/hflags/default.nix
+++ b/pkgs/development/libraries/haskell/hflags/default.nix
@ -0,0 +1,14 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+  pname = "hflags";
+  version = "0.1.3";
+  sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3";
+  buildDepends = [ text ];
+  meta = {
+    homepage = "http://github.com/errge/hflags";
+    description = "Command line flag parser, very similar to Google's gflags";
+    license = "Apache-2.0";
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@ -0,0 +1,27 @@
+{ cabal, attoparsec, blazeBuilder, bytedump, cryptohash, HUnit, mtl
+, parsec, QuickCheck, random, systemFileio, systemFilepath
+, testFramework, testFrameworkQuickcheck2, time, vector, zlib
+, zlibBindings
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hit";
+  version = "0.5.0";
+  sha256 = "05v49l3k8gwn922d5b5xrzdrakh6bw02bp8hd8yc8163jyazk2vx";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec blazeBuilder cryptohash mtl parsec random systemFileio
+    systemFilepath time vector zlib zlibBindings
+  ];
+  testDepends = [
+    bytedump HUnit QuickCheck testFramework testFrameworkQuickcheck2
+    time
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hit";
+    description = "Git operations in haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/hsdns/default.nix
+++ b/pkgs/development/libraries/haskell/hsdns/default.nix
@ -2,11 +2,10 @@

 cabal.mkDerivation (self: {
  pname = "hsdns";
-  version = "1.6";
-  sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa";
+  version = "1.6.1";
+  sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
  buildDepends = [ network ];
  extraLibraries = [ adns ];
-  noHaddock = true;
  meta = {
    homepage = "http://github.com/peti/hsdns";
    description = "Asynchronous DNS Resolver";
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
    ListLike MonadCatchIOTransformers monadControl parallel
    transformers transformersBase
  ];
+  jailbreak = true;
  meta = {
    homepage = "http://www.tiresiaspress.us/haskell/iteratee";
    description = "Iteratee-based I/O";
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "persistent";
-  version = "1.2.0.1";
-  sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb";
+  version = "1.2.0.2";
+  sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k";
  buildDepends = [
    aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
    liftedBase monadControl monadLogger pathPieces poolConduit
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "shake";
-  version = "0.10.3";
-  sha256 = "0dvpjswiiw2s4zh5sjx7qs4xp41bw2wqny0k61pkg5wvgw3b7jmh";
+  version = "0.10.5";
+  sha256 = "1abbls2rmpyxpj41c0afvfjh1bw6j6rz1n0w4jhqrmq0d32kpg7a";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@ -1,19 +1,19 @@
 { cabal, attoparsec, attoparsecEnumerator, blazeBuilder
 , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
-, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl
-, random, regexPosix, text, time, unixCompat, unorderedContainers
-, vector, zlibEnum
+, enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers
+, mtl, random, regexPosix, text, time, unixCompat
+, unorderedContainers, vector, zlibEnum
 }:

 cabal.mkDerivation (self: {
  pname = "snap-core";
-  version = "0.9.3.1";
-  sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq";
+  version = "0.9.4.0";
+  sha256 = "08afaj4ln4nl7ymdixijzjx8hc7nnr70gz7avpzaanq5nrw0k054";
  buildDepends = [
    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    bytestringMmap caseInsensitive deepseq enumerator filepath HUnit
-    MonadCatchIOTransformers mtl random regexPosix text time unixCompat
-    unorderedContainers vector zlibEnum
+    bytestringMmap caseInsensitive deepseq enumerator filepath hashable
+    HUnit MonadCatchIOTransformers mtl random regexPosix text time
+    unixCompat unorderedContainers vector zlibEnum
  ];
  meta = {
    homepage = "http://snapframework.com/";
--- a/pkgs/development/libraries/haskell/template-default/default.nix
+++ b/pkgs/development/libraries/haskell/template-default/default.nix
@ -0,0 +1,14 @@
+{ cabal, dataDefault }:
+
+cabal.mkDerivation (self: {
+  pname = "template-default";
+  version = "0.1.1";
+  sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
+  buildDepends = [ dataDefault ];
+  meta = {
+    homepage = "https://github.com/haskell-pkg-janitors/template-default";
+    description = "declaring Default instances just got even easier";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
+++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
@ -0,0 +1,13 @@
+{ cabal, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "vector-th-unbox";
+  version = "0.2.0.1";
+  sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv";
+  buildDepends = [ vector ];
+  meta = {
+    description = "Deriver for Data.Vector.Unboxed using Template Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/haskell/xtest/default.nix
+++ b/pkgs/development/libraries/haskell/xtest/default.nix
@ -0,0 +1,14 @@
+{ cabal, libXtst, X11 }:
+
+cabal.mkDerivation (self: {
+  pname = "xtest";
+  version = "0.2";
+  sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
+  buildDepends = [ X11 ];
+  extraLibraries = [ libXtst ];
+  meta = {
+    description = "Thin FFI bindings to X11 XTest library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
--- a/pkgs/development/libraries/javascript/jquery-ui/default.nix
+++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:

 stdenv.mkDerivation rec {
-  name = "jquery-ui-1.10.2";
+  name = "jquery-ui-1.10.3";

  src = fetchurl {
    url = "http://jqueryui.com/resources/download/${name}.custom.zip";
-    sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl";
+    sha256 = "1nqh3fmjgy73cbwb5sj775242i6jhz3f5b9fxgrkq00dfvkls779";
  };

  buildInputs = [ unzip ];
@ -17,9 +17,13 @@ stdenv.mkDerivation rec {

      # For convenience, provide symlinks "jquery.min.js" etc. (i.e.,
      # without the version number).
-      ln -s $out/js/jquery-ui-*.custom.min.js $out/js/jquery-ui.min.js
-      ln -s $out/js/jquery-1.*.min.js $out/js/jquery.min.js
-      ln -s $out/css/smoothness/jquery-ui-*.custom.css $out/css/smoothness/jquery-ui.css
+      pushd $out/js
+      ln -s jquery-ui-*.custom.js jquery-ui.js
+      ln -s jquery-ui-*.custom.min.js jquery-ui.min.js
+      ln -s jquery-1.*.js jquery.js
+      popd
+      pushd $out/css/smoothness
+      ln -s jquery-ui-*.custom.css jquery-ui.css
    '';

  meta = {
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@ -1,6 +1,6 @@
 { fetchurl, stdenv, libgpgerror }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
  name = "libgcrypt-1.5.2";

  src = fetchurl {
@ -34,4 +34,8 @@ stdenv.mkDerivation rec {
    homepage = http://gnupg.org/;
    platforms = stdenv.lib.platforms.all;
  };
-}
+} # old "as" problem, see #616 and http://gnupg.10057.n7.nabble.com/Fail-to-build-on-freebsd-7-3-td30245.html
+  // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686)
+    { configureFlags = [ "--disable-aesni-support" ]; }
+)
+
--- a/pkgs/development/libraries/mpfr/3.1.2.nix
+++ b/pkgs/development/libraries/mpfr/3.1.2.nix
@ -0,0 +1,51 @@
+
+{stdenv, fetchurl, gmp}:
+
+stdenv.mkDerivation (rec {
+  name = "mpfr-3.1.2";
+
+  src = fetchurl {
+    url = "mirror://gnu/mpfr/${name}.tar.bz2";
+    sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
+  };
+
+  buildInputs = [ gmp ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.mpfr.org/;
+    description = "GNU MPFR, a library for multiple-precision floating-point arithmetic";
+
+    longDescription = ''
+      The GNU MPFR library is a C library for multiple-precision
+      floating-point computations with correct rounding.  MPFR is
+      based on the GMP multiple-precision library.
+
+      The main goal of MPFR is to provide a library for
+      multiple-precision floating-point computation which is both
+      efficient and has a well-defined semantics.  It copies the good
+      ideas from the ANSI/IEEE-754 standard for double-precision
+      floating-point arithmetic (53-bit mantissa).
+    '';
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
+   /* Work around a FreeBSD bug that otherwise leads to segfaults in
+      the test suite:
+        http://hydra.bordeaux.inria.fr/build/34862
+        http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
+        http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
+    */
+   configureFlags = [ "--disable-thread-safe" ];
+ }))
--- a/pkgs/development/libraries/pango/1.30.x.nix
+++ b/pkgs/development/libraries/pango/1.30.x.nix
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
    sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
  };

+  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
+
  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/development/libraries/ruby_gpgme/default.nix
+++ b/pkgs/development/libraries/ruby_gpgme/default.nix
@ -0,0 +1,64 @@
+{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }:
+
+stdenv.mkDerivation {
+  name = "ruby-gpgme-1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz";
+    sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb";
+  };
+
+  meta = {
+    description = ''
+      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made
+      Easy)
+    '';
+    homepage = "http://rubyforge.org/projects/ruby-gpgme/";
+    longDescription = ''
+      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy).
+
+      GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
+      easier for applications. It provides a High-Level Crypto API for
+      encryption, decryption, signing, signature verification and key
+      management.
+    '';
+  };
+
+  buildInputs = [ gpgme rubygems hoe ruby ];
+
+  buildPhase = ''
+    ${ruby}/bin/ruby extconf.rb
+    rake gem
+  '';
+
+  installPhase = ''
+    export HOME=$TMP/home; mkdir -pv "$HOME"
+
+    # For some reason, the installation phase doesn't work with the default
+    # make install command run by gem (we'll fix it and do it ourselves later)
+    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
+        --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true
+
+    # Create a bare-bones gemspec file so that ruby will recognise the gem
+    cat <<EOF >"$out/${ruby.gemPath}/specifications/gpgme.gemspec"
+    Gem::Specification.new do |s|
+      s.name              = 'gpgme'
+      s.version           = '1.0.8'
+      s.files             = Dir['{lib,examples}/**/*']
+      s.rubyforge_project = 'ruby-gpgme'
+      s.require_paths     = ['lib']
+    end
+    EOF
+
+    cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8"
+    mkdir src
+    mv lib src
+    sed -i "s/srcdir = ./srcdir = src/" Makefile
+    make install
+
+    mv lib lib.bak
+    mv src/lib lib
+    rmdir src
+  '';
+}
+
--- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
+++ b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
@ -0,0 +1,47 @@
+{ stdenv, fetchurl, ncurses, ruby, rubygems }:
+
+stdenv.mkDerivation rec {
+  name = ''ncursesw-sup-afd962b9c06108ff0643e98593c5605314d76917'';
+
+  src = fetchurl {
+    url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/afd962b9c06108ff0643e98593c5605314d76917.tar.gz";
+    sha256 = "13i286p4bm8zqg9xh96a1dg7wkywj9m6975gbh3w43d3rmfc1h6a";
+  };
+
+  meta = {
+    description = ''
+      Hacked up version of ncurses gem that supports wide characters for
+      supmua.org
+    '';
+    homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby'';
+    longDescription = ''
+      This wrapper provides access to the functions, macros, global variables
+      and constants of the ncurses library.  These are mapped to a Ruby Module
+      named "Ncurses":  Functions and external variables are implemented as
+      singleton functions of the Module Ncurses.
+    '';
+  };
+
+  buildInputs = [ ncurses rubygems ];
+
+  buildPhase = "gem build ncursesw.gemspec";
+
+  installPhase = ''
+    export HOME=$TMP/home; mkdir -pv "$HOME"
+
+    # For some reason, the installation phase doesn't work with the default
+    # make install command run by gem (we'll fix it and do it ourselves later)
+    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
+        --bindir "$out/bin" --no-rdoc --no-ri ncursesw-sup-1.3.1.2.gem || true
+
+    # Needed for ruby to recognise the gem
+    cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications"
+
+    cd "$out/${ruby.gemPath}/gems/ncursesw-sup-1.3.1.2"
+    mkdir src
+    mv lib src
+    sed -i "s/srcdir = ./srcdir = src/" Makefile
+    make install
+  '';
+}
+
--- a/pkgs/development/libraries/suitesparse/default.nix
+++ b/pkgs/development/libraries/suitesparse/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, blas, liblapack, gfortran } :
 stdenv.mkDerivation rec {
-  version = "4.0.0";
+  version = "4.2.0";
  name = "suitesparse-${version}";
  src = fetchurl {
    url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
-    sha256 = "1nvbdw10wa6654k8sa2vhr607q6fflcywyji5xd767cqpwag4v5j";  			
+    sha256 = "0i0ivsc5sr3jdz6nqq4wz5lwxc8rpnkqgddyhqqgfhwzgrcqh9v6";  			
  };
  buildInputs = [blas liblapack gfortran] ;
  patches = [./disable-metis.patch];
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@ -0,0 +1,44 @@
+{ fetchurl, stdenv, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "4.0";
+  name = "amdadl-sdk-${version}";
+
+  src = fetchurl {
+    url = "http://download2-developer.amd.com/amd/GPU/zip/ADL_SDK_${version}.zip";
+    sha256 = "4265ee2f265b69cc39b61e10f79741c1d799f4edb71dce14a7d88509fbec0efa";
+  };
+
+  buildInputs = [ unzip ];
+
+  doCheck = false;
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  buildPhase = ''
+    #Build adlutil
+    cd adlutil
+    gcc main.c -o adlutil -DLINUX -ldl -I ../include/ 
+    cd ..
+  '';
+
+  installPhase = ''
+    #Install SDK
+    mkdir -p $out/bin
+    cp -r include "$out/"
+    cp "adlutil/adlutil" "$out/bin/adlutil"
+
+    #Fix modes
+    chmod -R 755 "$out/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "API to access display driver functionality for ATI graphics cards";
+    homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
+    license = licenses.amdadl;
+    maintainers = [ maintainers.offline ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
--- a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch
+++ b/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch
@ -0,0 +1,10 @@
+--- samples/Makefile	2012-11-29 05:58:48.000000000 +0100
+++ samples/Makefile	2012-12-30 20:13:30.926576277 +0100
+@@ -3,7 +3,6 @@
+ include $(DEPTH)/make/openclsdkdefs.mk 
+ 
+ SUBDIRS = opencl 
+-SUBDIRS += aparapi 
+ ifneq ($(OS), lnx)
+ SUBDIRS += C++Amp
+ ifeq ($(BITS), 64)
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@ -0,0 +1,105 @@
+{ stdenv, fetchurl, makeWrapper, perl, mesa, xorg,
+  version? "2.8", # What version
+  samples? false # Should samples be installed
+}:
+
+let
+
+  src_hashes = {
+    "2.6" = {
+      x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356";
+      x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih";
+    };
+
+    "2.7" = {
+      x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356";
+      x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1";
+    };
+
+    "2.8" = {
+      x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356";
+      x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681";
+    };
+  };
+
+  bits = if stdenv.system == "x86_64-linux" then "64"
+         else "32";
+
+  arch = if stdenv.system == "x86_64-linux" then "x86_64"
+         else "x86";
+
+in stdenv.mkDerivation rec {
+  name = "amdapp-sdk-${version}";
+
+  src = if stdenv.system == "x86_64-linux" then fetchurl {
+    url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v${version}-lnx64.tgz";
+    sha256 = (builtins.getAttr version src_hashes).x86_64;
+  } else if stdenv.system == "i686-linux" then fetchurl {
+    url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v${version}-lnx32.tgz";
+    sha256 = (builtins.getAttr version src_hashes).x86;
+  } else
+    throw "System not supported";
+
+  # TODO: Add support for aparapi, java parallel api
+  patches = [ ./01-remove-aparapi-samples.patch ];
+
+  patchFlags = "-p0";
+  buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
+  propagatedBuildInputs = [ stdenv.gcc ];
+  NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";
+  doCheck = false;
+
+  unpackPhase = ''
+    tar xvzf $src
+    tar xf AMD-APP-SDK-v${version}-RC-lnx${bits}.tgz
+    cd AMD-APP-SDK-v${version}-RC-lnx${bits}
+  '';
+
+  buildPhase = if !samples then ''echo "nothing to build"'' else null;
+
+  installPhase = ''
+    # Install SDK
+    mkdir -p $out
+    cp -r {docs,include} "$out/"
+    mkdir -p "$out/"{bin,lib,samples/opencl/bin}
+    cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo"
+    cp -r "./lib/${arch}/"* "$out/lib/"
+
+    # Register ICD
+    mkdir -p "$out/etc/OpenCL/vendors"
+    echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd"
+    # The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt
+
+    # Install includes
+    mkdir -p "$out/usr/include/"{CAL,OpenVideo}
+    install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/"
+
+    ${ if samples then ''
+      # Install samples
+      find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \;
+      cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin"
+      for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*");
+      do
+        wrapProgram "$f" --prefix PATH ":" "${stdenv.gcc}/bin"
+      done'' else ""
+    }
+
+    # Create wrappers
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/clinfo
+    patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/bin/clinfo
+
+    # Fix modes
+    find "$out/" -type f -exec chmod 644 {} \;
+    chmod -R 755 "$out/bin/"
+    find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \;
+    find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
+    homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/;
+    license = licenses.amd;
+    maintainers = [ maintainers.offline ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@ -1,14 +1,14 @@
 {stdenv, fetchurl, unzip, makeWrapper, python, jdk}:

 stdenv.mkDerivation {
-  name = "titanium-mobilesdk-3.1.0.v20130415184552";
+  name = "titanium-mobilesdk-3.1.1.v20130612114553";
  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-linux.zip;
-    sha1 = "7a8b34b92f6c3eff33eefb9a1b6b0d2e3670001d";
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.1.v20130612114553-linux.zip;
+    sha1 = "410ba7e8171a887b6a4b3173116430657c3d84aa";
  }
  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-osx.zip;
-    sha1 = "e0ed7e399a104e0838e245550197bf787a66bf98";
+    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.1.v20130612114553-osx.zip;
+    sha1 = "0893a1560ac6fb63369fc9f6ea9550b6649438fa";
  }
  else throw "Platform: ${stdenv.system} not supported!";
  
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@ -0,0 +1,43 @@
+{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng_apng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "camlimages";
+  version = "4.0.1";
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl { 
+    url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz";
+    sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
+  };
+
+  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
+
+  propagatedbuildInputs = [libtiff libjpeg libpng_apng giflib freetype libXpm ];
+
+  createFindlibDestdir = true;
+
+  preConfigure = ''
+    rm ./configure
+  '';
+
+  buildPhase = ''
+    omake
+  '';
+
+  installPhase = ''
+    omake install
+  '';
+
+  #makeFlags = "BINDIR=$(out)/bin  MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib";
+
+  meta = {
+    homepage = http://cristal.inria.fr/camlimages;
+    description = "Image manipulation library";
+    license = "GnuGPLV2";
+#    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@ -2,16 +2,16 @@

 let
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "1.04";
+  version = "1.05";
 in

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

  src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/328/" +
+    url = "http://forge.ocamlcore.org/frs/download.php/1037/" +
          "camlzip-${version}.tar.gz";
-    sha256 = "1zpchmp199x7f4mzmapvfywgy7f6wy9yynd9nd8yh8l78s5gixbn";
+    sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
  };

  buildInputs = [zlib ocaml findlib];
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@ -2,16 +2,16 @@

 let
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "1.5";
+  version = "1.7";
 in

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

  src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/639/" +
+    url = "http://forge.ocamlcore.org/frs/download.php/1166/" +
          "cryptokit-${version}.tar.gz";
-    sha256 = "1r5kbsbsicrbpdrdim7h8xg2b1a8qg8sxig9q6cywzm57r33lj72";
+    sha256 = "56a8c0339c47ca3cf43c8881d5b519d3bff68bc8a53267e9c5c9cbc9239600ca";
  };

  buildInputs = [zlib ocaml findlib ncurses];
--- a/pkgs/development/ocaml-modules/dypgen/default.nix
+++ b/pkgs/development/ocaml-modules/dypgen/default.nix
@ -0,0 +1,33 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "dypgen";
+  version = "20120619-1";
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2";
+    sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97";
+  };
+
+  buildInputs = [ocaml findlib];
+
+  createFindlibDestdir = true;
+
+  buildPhase = ''
+    make
+  '';
+
+  makeFlags = "BINDIR=$(out)/bin  MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib";
+
+  meta = {
+    homepage = http://dypgen.free.fr;
+    description = "Dypgen GLR self extensible parser generator";
+    license = "CeCILL-B_V1";
+#    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
--- a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
+++ b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
@ -0,0 +1,117 @@
+diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config
+--- lablGL.ori/Makefile.config	1970-01-01 01:00:00.000000000 +0100
+++ lablGL/Makefile.config	2013-06-02 08:13:10.000000000 +0200
+@@ -0,0 +1,63 @@
+#	LablGL and Togl configuration file
+#
+# Please have a look at the config/Makefile in the Objective Caml distribution,
+# or at the labltklink script to get the information needed here
+#
+
+##### Adjust these always
+
+# Uncomment if you have the fast ".opt" compilers
+#CAMLC = ocamlc.opt
+#CAMLOPT = ocamlopt.opt
+
+# Where to put the lablgl script
+BINDIR = @BINDIR@
+
+# Where to find X headers
+XINCLUDES = @XINCLUDES@
+# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
+#XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 -lXi
+
+# Where to find Tcl/Tk headers
+# This must the same version as for LablTk
+TKINCLUDES = @TKINCLUDES@
+# Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
+#TKLIBS = -L/usr/local/lib -ltk84 -ltcl84
+
+# Where to find OpenGL/Mesa/Glut headers and libraries
+GLINCLUDES =
+GLLIBS = -lGL -lGLU
+GLUTLIBS = -lglut
+# The following libraries may be required (try to add them one at a time)
+#GLLIBS = -lGL -lGLU -lXmu -lXext -lXi -lcipher -lpthread
+
+# How to index a library after installing (ranlib required on MacOSX)
+RANLIB = :
+#RANLIB = ranlib
+
+##### Uncomment these for windows
+#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib
+#GLLIBS = opengl32.lib glu32.lib 
+#TOOLCHAIN = msvc
+#XA = .lib
+#XB = .bat
+#XE = .exe
+#XO = .obj
+#XS = .dll
+
+##### Adjust these if non standard
+
+# The Objective Caml library directory
+#LIBDIR = `ocamlc -where`
+
+# Where to put dlls (if dynamic loading available)
+DLLDIR = @DLLDIR@
+
+# Where to put LablGL (standard)
+INSTALLDIR = @INSTALLDIR@
+
+# Where is Togl (default)
+#TOGLDIR = Togl
+
+# C Compiler options
+#COPTS = -c -O
+diff -Naur lablGL.ori/META lablGL/META
+--- lablGL.ori/META	1970-01-01 01:00:00.000000000 +0100
+++ lablGL/META	2013-06-02 22:00:59.000000000 +0200
+@@ -0,0 +1,21 @@
+description = "Bindings for OpenGL graphics engines"
+version = "1.04-1"
+archive(byte) = "lablgl.cma"
+archive(native) = "lablgl.cmxa"
+
+#package "togl" (
+#	description = "OpenGL widget for labltk"
+#	version = "1.01"
+#	requires = "lablgl, labltk"
+#	archive(byte) = "togl.cma"
+#	archive(native) = "togl.cmxa"
+#)
+
+package "glut" (
+	description = "Platform-independent OpenGL window"
+	version = "1.01"
+	requires = "lablgl"
+	archive(byte) = "lablglut.cma"
+	archive(native) = "lablglut.cmxa"
+)
+
+diff -Naur lablGL.ori/META~ lablGL/META~
+--- lablGL.ori/META~	1970-01-01 01:00:00.000000000 +0100
+++ lablGL/META~	2013-06-02 21:59:17.000000000 +0200
+@@ -0,0 +1,21 @@
+description = "Bindings for OpenGL graphics engines"
+version = "1.04-1"
+archive(byte) = "lablgl.cma"
+archive(native) = "lablgl.cmxa"
+
+#package "togl" (
+#	description = "OpenGL widget for labltk"
+#	version = "1.01"
+#	requires = "lablGL, labltk"
+#	archive(byte) = "togl.cma"
+#	archive(native) = "togl.cmxa"
+#)
+
+package "glut" (
+	description = "Platform-independent OpenGL window"
+	version = "1.01"
+	requires = "lablGL"
+	archive(byte) = "lablglut.cma"
+	archive(native) = "lablglut.cmxa"
+)
+
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@ -0,0 +1,45 @@
+{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } :
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "lablgl";
+  version = "1.04-1";
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl { 
+    url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-20120306.tar.gz";
+    sha256 = "1w5di2n38h7fkrf668zphnramygwl7ybjhrmww3pi9jcf9apa09r";
+  };
+
+  buildInputs = [ocaml findlib lablgtk mesa freeglut ];
+
+  patches = [ ./Makefile.config.patch ];
+
+  preConfigure = ''
+    substituteInPlace Makefile.config \
+      --subst-var-by BINDIR $out/bin \
+      --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \
+      --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl/stublibs \
+      --subst-var-by TKINCLUDES "" \
+      --subst-var-by XINCLUDES ""
+  '';
+
+  createFindlibDestdir = true;
+
+  #makeFlags = "BINDIR=$(out)/bin  MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib";
+  buildFlags = "lib libopt glut glutopt";
+
+  postInstall = ''
+    cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl
+  '';
+
+  meta = {
+    homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html;
+    description = "OpenGL bindings for ocaml";
+    license = "GnuGPLV2";
+#    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@ -3,25 +3,26 @@
 let
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
  pname = "lablgtk";
-  version = "2.14.2";
+  version = "2.16.0";
 in

 stdenv.mkDerivation (rec {
  name = "${pname}-${version}";
  src = fetchurl {
-    url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${name}.tar.gz";
-    sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
+    url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz";
+    sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f";
  };

  buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];

-  patches = [ ./META.patch ];
+  # patches = [ ./META.patch ];

  configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
  buildFlags = "world";

-  postInstall = ''
-    ocamlfind install lablgtk2 META
+  preInstall = ''
+    mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib
+    export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH
  '';

  meta = {
--- a/pkgs/development/ocaml-modules/ocaml-cairo/META.patch
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/META.patch
@ -0,0 +1,16 @@
+diff -Naur cairo-ocaml-1.2.0.ori/META cairo-ocaml-1.2.0/META
+--- cairo-ocaml-1.2.0.ori/META	1970-01-01 01:00:00.000000000 +0100
+++ cairo-ocaml-1.2.0/META	2013-06-04 03:31:32.000000000 +0200
+@@ -0,0 +1,12 @@
+name = "cairo-ocaml"
+description = "Bindings to the cairo library."
+version = "@VERSION@"
+archive(byte) = "cairo.cma"
+archive(native) = "cairo.cmxa"
+requires = "bigarray"
+
+package "lablgtk2" (
+        requires = "cairo lablgtk2"
+        archive(byte) = "cairo_lablgtk.cma"
+        archive(native) = "cairo_lablgtk.cmxa"
+)
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@ -0,0 +1,44 @@
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }: 
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "ocaml-cairo";
+  version = "1.2.0";
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl { 
+    url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
+    sha256 = "2d59678e322c331e3f4bc02a77240fce4a0917acb0d3ae75953a6ac62d70a125";
+  };
+
+  patches = [ ./META.patch ];
+
+  buildInputs = [ocaml automake gnum4 autoconf unzip pkgconfig findlib freetype lablgtk cairo gdk_pixbuf gtk pango ];
+
+  createFindlibDestdir = true;
+
+ preConfigure = ''
+   aclocal -I support
+   autoconf
+   export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib  gtk+ pango`" 
+   export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2
+   cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src
+   cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src
+  '';
+
+  postInstall = ''
+    cp META $out/lib/ocaml/${ocaml_version}/site-lib/cairo/
+  '';
+
+  makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/cairo";
+
+  meta = {
+    homepage = http://cairographics.org/cairo-ocaml;
+    description = "ocaml bindings for cairo library";
+    license = "GnuGPLV2";
+#    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}
--- a/pkgs/development/ocaml-modules/ocamlnet/configure.patch
+++ b/pkgs/development/ocaml-modules/ocamlnet/configure.patch
@ -0,0 +1,63 @@
+diff -Naur ocamlnet-3.6.3.ori/configure ocamlnet-3.6.3/configure
+--- ocamlnet-3.6.3.ori/configure	2013-01-14 00:04:59.000000000 +0000
+++ ocamlnet-3.6.3/configure	2013-06-02 21:33:08.000000000 +0000
+@@ -642,59 +642,6 @@
+ 	exit 1
+     fi
+ 
+-    printf "%s" "Checking whether lablgtk2 has GMain.Io.remove... "
+-    mkdir -p tmp
+-    cat <<EOF >tmp/gtk.ml
+-let _ = GMain.Io.remove;;
+-EOF
+-
+-    if ocamlfind ocamlc -package lablgtk2 -c tmp/gtk.ml >/dev/null 2>/dev/null;
+-    then
+-        echo "yes"
+-    else
+-        echo "no"
+-        echo "Your version of lablgtk2 is too old!"
+-	exit 1
+-    fi
+-    
+-    printf "%s" "Checking whether lablgtk2 has GMain.Io.add_watch with list support... "
+-    mkdir -p tmp
+-    cat <<'EOF' >tmp/gtk.ml
+-open GMain.Io
+-let _ = (add_watch : cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id);;
+-exit 0
+-EOF
+-    # Note: this newer API is never broken in the sense checked below, i.e.
+-    # such lablgtk2 versions do not exist.
+-    if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
+-        echo "yes"
+-        gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS"
+-    else
+-        echo "no"
+-        printf "%s" "Checking whether lablgtk2's GMain.Io.add_watch is broken... "
+-        mkdir -p tmp
+-        cat <<'EOF' >tmp/gtk.ml
+-GMain.Main.init();;
+-let ch = GMain.Io.channel_of_descr (Unix.stdout) in
+-let w = GMain.Io.add_watch
+-          ~cond:`OUT ~callback:(fun () -> true) ch in
+-(* add_watch is broken when it just returns Val_unit, and ok when it
+- * returns a positive int
+- *)
+-if (Obj.magic w : int) > 0 then
+-  exit 0
+-else
+-  exit 1
+-EOF
+-	if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
+-            echo "no"
+-        else
+-            echo "yes"
+-            echo "You should apply the patch-ab-ml_glib.c to lablgtk2 to fix this!"
+-	    exit 1
+-        fi
+-    fi
+-
+     for f in Makefile uq_gtk.ml uq_gtk.mli uq_gtk_helper.ml; do
+ 	rm -f src/equeue-gtk2/$f
+ 	ln -s ../equeue-gtk1/$f src/equeue-gtk2
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@ -1,18 +1,22 @@
-{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl}:
+{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, lablgtk, cryptokit }:

 let
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in

 stdenv.mkDerivation {
-  name = "ocamlnet-3.6";
+  name = "ocamlnet-3.6.3";

  src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz;
-    sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69";
+    url = http://download.camlcity.org/download/ocamlnet-3.6.3.tar.gz;
+    sha256 = "c62fe0a4db6c63c04e24c8d76bcb504054f0b59a7a41c1abcbb8dd504afc9f29";
  };

-  buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl];
+  buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit];
+
+  propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit];
+
+  patches = [ ./configure.patch ];

  createFindlibDestdir = true;

@ -23,6 +27,10 @@ stdenv.mkDerivation {
      -bindir $out/bin
      -enable-ssl
      -enable-zip
+      -enable-pcre
+      -enable-crypto
+      -disable-gtk2
+      -with-nethttpd
      -datadir $out/lib/ocaml/${ocaml_version}/ocamlnet
    )
  '';
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@ -1,18 +1,19 @@
-{stdenv, fetchurl, sqlite, ocaml, findlib}:
+{stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}:

 stdenv.mkDerivation {
-  name = "ocaml-sqlite3-1.6.3";
+  name = "ocaml-sqlite3-2.0.4";

  src = fetchurl {
-    url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-1.6.3.tar.gz;
-    sha256 = "004wysf80bmb8r4yaa648v0bqrh2ry3kzy763gdksw4n15blghv5";
+    url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-2.0.4.tar.gz;
+    sha256 = "51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1";
  };

-  buildInputs = [ocaml findlib];
+  buildInputs = [ocaml findlib pkgconfig ];

-  configureFlags = "--with-sqlite3=${sqlite}";
+  #configureFlags = "--with-sqlite3=${sqlite}";

  preConfigure = ''
+    export PKG_CONFIG_PATH=${sqlite}/lib/pkgconfig/
    export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR
    mkdir -p $out/bin
  '';
--- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix
+++ b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix
@ -0,0 +1,20 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.13.2.1";
+  sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
+  testDepends = [ Cabal deepseq filepath ];
+  buildTools = [ alex happy ];
+  doCheck = false;
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@ -3,8 +3,8 @@

 cabal.mkDerivation (self: {
  pname = "cabal2nix";
-  version = "1.51";
-  sha256 = "0la1bhdxrzn1phjyca7h54vimwf4jy5ryclwrnivbcxkncrk9lig";
+  version = "1.52";
+  sha256 = "1w38qxwbwaq37c7vypydwjjhgrn9vbaqnnk7b2y0pm8n2fh78z1s";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "timeplot";
-  version = "1.0.20";
-  sha256 = "0zlpqfd1l1ss9jjjb967a7jnn1h560ygv8zfiikcx6iagsjmysh2";
+  version = "1.0.21";
+  sha256 = "0x9f95w235yijp98xx9nry0ibsxr0iyshk6cd89n51xrk1zpk41l";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@ -0,0 +1,37 @@
+{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+let
+  pname = "omake";
+  version = "0.9.8.6-0.rc1";
+  webpage = "http://omake.metaprl.org";
+in
+stdenv.mkDerivation {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/downloads/${pname}-${version}.tar.gz";
+    sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
+  };
+  patchFlags = "-p0";
+  patches = [ ./warn.patch ];
+
+  buildInputs = [ ocaml makeWrapper ncurses ];
+
+  phases = "unpackPhase patchPhase buildPhase";
+  buildPhase = ''
+    make bootstrap
+    make PREFIX=$out all
+    make PREFIX=$out install
+  '';
+#  prefixKey = "-prefix ";
+#
+#  configureFlags = if transitional then "--transitional" else "--strict";
+#
+#  buildFlags = "world.opt";		
+
+  meta = {
+    description = "Omake build system";
+    homepage = "${webpage}";
+    license = "GPL";
+  };
+}
--- a/pkgs/development/tools/ocaml/omake/warn.patch
+++ b/pkgs/development/tools/ocaml/omake/warn.patch
@ -0,0 +1,10 @@
+diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om
+--- ../omake-0.9.8.6.ori/lib/build/OCaml.om	2008-03-05 01:07:25.000000000 +0000
+++ ./lib/build/OCaml.om	2013-06-01 15:52:37.000000000 +0000
+@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS
+ public.OCAMLPPFLAGS  =
+-public.OCAMLFLAGS    = -warn-error A
+public.OCAMLFLAGS    =
+ public.OCAMLCFLAGS   = -g
+Seulement dans ./lib/build: OCaml.om~
+Seulement dans .: warn.patch
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@ -16,6 +16,18 @@
    url = https://www.gnu.org/licenses/agpl.html;
  };

+  amd = {
+    shortName = "amd";
+    fullName = "AMD License Agreement";
+    url = "http://developer.amd.com/amd-license-agreement/";
+  };
+
+  amdadl = {
+    shortName = "amd-adl";
+    fullName = "amd-adl license";
+    url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
+  };
+
  asl20 = {
    shortName = "ASL2.0";
    fullName = "Apache Software License 2.0";
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@ -8,6 +8,7 @@
  all = "Nix Committers <nix-commits@lists.science.uu.nl>";
  amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
+  amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
  antono = "Antono Vasiljev <self@antono.info>";
  astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
  aszlig = "aszlig <aszlig@redmoonstudios.org>";
@ -22,6 +23,7 @@
  goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
  guibert = "David Guibert <david.guibert@gmail.com>";
  iElectric = "Domen Kozar <domen@dev.si>";
+  lovek323 = "Jason O'Conal <jason@oconal.id.au>";
  jcumming = "Jack Cummings <jack@mudshark.org>";
  kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
  ludo = "Ludovic Courtès <ludo@gnu.org>";
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl, lcms, freetype
+{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig
+, openssl, lcms, freetype, libiconvOrEmpty
 , x11Support, x11 ? null
 , cupsSupport ? false, cups ? null
 , gnuFork ? true
@ -74,7 +75,9 @@ stdenv.mkDerivation rec {
    # ... add other fonts here
  ];

-  buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms]
+  buildInputs
+    = [ libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms ]
+    ++ libiconvOrEmpty
    ++ stdenv.lib.optionals x11Support [x11 freetype]
    ++ stdenv.lib.optional cupsSupport cups;

--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@ -126,4 +126,23 @@ in
    };
  };

+  syntastic = stdenv.mkDerivation {
+    name = "vim-syntastic-3.0.0";
+   
+    src = fetchurl {
+      url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz";
+      sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl";
+    };
+
+    buildPhase = "";
+
+    installPhase = ''
+      mkdir -p "$out/vim-plugins"
+      cp -R autoload "$out/vim-plugins"
+      cp -R doc "$out/vim-plugins"
+      cp -R plugin "$out/vim-plugins"
+      cp -R syntax_checkers "$out/vim-plugins"
+    '';
+  };
 }
+
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@ -253,7 +253,7 @@ in
 import ./generic.nix (

  rec {
-    version = "3.9.5";
+    version = "3.9.6";
    testing = false;

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

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "05y3wrvady60p8ksjwwa5c2jia2ax9q0p7lhr62yafywh5piyfbw";
+      sha256 = "0spba7qkf56j233r84y23xl7d44ndvw5ja7h3pfhsq861dypcc0i";
    };

    config = configWithPlatform stdenv.platform;
--- a/pkgs/os-specific/linux/psmouse-alps/default.nix
+++ b/pkgs/os-specific/linux/psmouse-alps/default.nix
@ -0,0 +1,38 @@
+{ stdenv, fetchurl, kernelDev, zlib }:
+
+/* Only useful for kernels 3.2 to 3.5.
+   Fails to build in 3.8.
+   3.9 upstream already includes a proper alps driver for this */
+
+let
+  ver = "1.3";
+  bname = "psmouse-alps-${ver}";
+in
+stdenv.mkDerivation {
+  name = "psmouse-alps-${kernelDev.version}-${ver}";
+
+  src = fetchurl {
+    url = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/at_download/file;
+    name = "${bname}-alt.tar.bz2";
+    sha256 = "1ghr8xcyidz31isxbwrbcr9rvxi4ad2idwmb3byar9n2ig116cxp";
+  };
+
+  buildPhase = ''
+    cd src/${bname}/src
+    make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \
+      SUBDIRS=`pwd` INSTALL_PATH=$out
+  '';
+
+  installPhase = ''
+    make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \
+      INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install
+  '';
+      
+  meta = {
+    description = "ALPS dlkm driver with all known touchpads";
+    homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@ -2,11 +2,11 @@

 let

-  version = "2.0.4";
+  version = "2.0.6";

  src = fetchurl {
    url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0l8038j6ldsv0ywrs2j69ybjl2zv4qw42791glqvcabjj8x24m3m";
+    sha256 = "1y7dp9rqxkn8ik7bvk2qysz3zp3r07kmax5avlf9jf1x7pkagps6";
  };

  preConfigure =
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ b/pkgs/servers/nosql/riak/1.3.1.nix
@ -7,8 +7,8 @@ let
      sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01";
    };
     leveldb = fetchurl {
-      url = "https://github.com/basho/leveldb/zipball/1.3.1";
-      sha256 = "10glzfsxs1167n7hmzl106xkfmn1qdjcqvillga2r5dsmn6vvi8a";
+      url = "https://github.com/basho/leveldb/archive/1.3.1.zip";
+      sha256 = "dc48ba2b44fca11888ea90695d385c494e1a3abd84a6b266b07fdc160ab2ef64";
    };
  };
 in
@ -25,13 +25,14 @@ stdenv.mkDerivation rec {
    ln -sv ${srcs.leveldb} $sourceRoot/deps/eleveldb/c_src/leveldb.zip
    pushd $sourceRoot/deps/eleveldb/c_src/
    unzip leveldb.zip
-    mv basho-leveldb-* leveldb
+    mv leveldb-* leveldb
    cd ../../
    mkdir riaknostic/deps
    cp -R lager riaknostic/deps
    cp -R getopt riaknostic/deps
    cp -R meck riaknostic/deps
    popd
+    patchShebangs .
  '';

  buildPhase = ''
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
    homepage = http://www.tuxera.com/community/;
    description = "FUSE-base NTFS driver with full write support";
    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
    homepage = http://podgorny.cz/moin/UnionFsFuse;
    license = stdenv.lib.licenses.bsd3;
    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@ -5,11 +5,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "nix-1.5.2pre3091_772b709";
+  name = "nix-1.5.3pre3141_1b6ee8f";

  src = fetchurl {
-    url = "http://hydra.nixos.org/build/4796316/download/5/${name}.tar.xz";
-    sha256 = "f1acf131842d9604d886d5f98aaa4739bea63536023d7287ce48613c38d49fbd";
+    url = "http://hydra.nixos.org/build/5305802/download/5/${name}.tar.xz";
+    sha256 = "834a0d23456331ac06b6117078f0b9bbeecbc8620d5f844b61455e3daac6ceb0";
  };

  nativeBuildInputs = [ perl pkgconfig ];
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@ -2,9 +2,9 @@
 # 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.

 { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
-, libksba, coreutils, useLdap ? true, openldap ? null
-, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null
-, useCurl ? true, curl ? null
+, libksba, coreutils, libiconvOrEmpty
+, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null
+, useUsb ? true, libusb ? null, useCurl ? true, curl ? null
 }:

 assert useLdap -> (openldap != null);
@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
    sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f";
  };

-  buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ]
+  buildInputs
+    = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ]
+    ++ libiconvOrEmpty
    ++ stdenv.lib.optional useLdap openldap
    ++ stdenv.lib.optional useBzip2 bzip2
    ++ stdenv.lib.optional useUsb libusb
@ -28,6 +30,7 @@ stdenv.mkDerivation rec {

  patchPhase = ''
    find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
+    find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/'
  '';

  checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
--- a/pkgs/tools/typesetting/patoline/default.nix
+++ b/pkgs/tools/typesetting/patoline/default.nix
@ -0,0 +1,51 @@
+
+{ stdenv, fetchurl, ncurses, mesa, freeglut, libzip, 
+   ocaml, findlib, camomile, 
+   dypgen, ocaml_sqlite3, camlzip, 
+   lablgtk, camlimages, ocaml_cairo,
+   lablgl, ocamlnet, cryptokit,
+   ocaml_pcre }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+
+stdenv.mkDerivation {
+  name = "patoline-0.1";
+
+  src = fetchurl {
+    url = "http://lama.univ-savoie.fr/patoline/patoline-0.1.tar.bz";
+    sha256 = "c5ac8dcb87ceecaf11876bd0dd425bd0f04d43265adc2cbcb1f1e82a78846d49";
+  };
+
+  createFindlibDestdir = true;
+   
+   buildInputs = [ ocaml findlib dypgen camomile ocaml_sqlite3 camlzip 
+   lablgtk camlimages ocaml_cairo
+   lablgl ocamlnet cryptokit
+   ocaml_pcre ncurses mesa freeglut libzip ];
+
+  propagatedbuildInputs = [ camomile 
+   dypgen ocaml_sqlite3 camlzip 
+   lablgtk camlimages ocaml_cairo
+   lablgl ocamlnet cryptokit
+   ocaml_pcre ncurses mesa freeglut libzip ];
+
+  buildPhase = ''
+    ocaml configure.ml \
+       --prefix $out \
+       --ocaml-libs $out/lib/ocaml/${ocaml_version}/site-lib \
+       --ocamlfind-dir $out/lib/ocaml/${ocaml_version}/site-lib \
+       --fonts-dir $out/share/patoline/fonts \
+       --grammars-dir $out/share/patoline/grammars \
+       --hyphen-dir $out/share/patoline/hyphen
+
+    make
+  '';
+
+  
+  meta = {
+    homepage = http://patoline.com;
+    description = "Patoline ocaml based typesetting system";
+  };
+}
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@ -1,10 +1,10 @@
 args: with args;
 rec {
-  version = "1.3.0";
+  version = "1.5.1";
  name = "moderncv-${version}";
  src = fetchurl {
    url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip";
-    sha256 = "0wdj90shi04v97b2d6chhvm9qrp0bcvsm46441730ils1y74wisq";
+    sha256 = "0k26s0z8hmw3h09vnpndim7gigwh8q6n9nbbihb5qbrw5qg2yqck";
  };

  buildInputs = [texLive unzip];
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@ -0,0 +1,26 @@
+args: with args;
+rec {
+  version = "0.7";
+  name = "moderntimeline-${version}";
+  src = fetchurl {
+    url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip";
+    sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876";
+  };
+
+  buildInputs = [texLive unzip];
+  phaseNames = ["doCopy"];
+  doCopy = fullDepEntry (''
+    mkdir -p $out/texmf/tex/latex/moderntimeline $out/texmf/doc/moderntimeline $out/share
+    mv *.dtx *.ins $out/texmf/tex/latex/moderntimeline/
+    mv *.pdf $out/texmf/doc/moderntimeline/
+    ln -s $out/texmf* $out/share/
+  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+
+  meta = {
+    description = "the moderntimeline extensions for moderncv";
+    maintainers = [ args.lib.maintainers.simons ];
+
+    # Actually, arch-independent..
+    platforms = [] ;
+  };
+}
--- a/pkgs/tools/typesetting/tex/texlive/pgf.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pgf.nix
@ -1,11 +1,12 @@
 args: with args;

+
 rec {
-  name = "texlive-pgf-2007";
+  name = "texlive-pgf-2010";

  src = fetchurl {
-    url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz";
-    sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
+    url = "mirror://debian/pool/main/p/pgf/pgf_2.10.orig.tar.gz";
+    sha256 = "642092e6b49df9e33bd901ac7eb7024ff235a29f43d27e78e5827ca3bc03f120";
  };

  propagatedBuildInputs = [texLiveLatexXColor texLive];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -183,7 +183,6 @@ let

  ### Helper functions.

-
  inherit lib config stdenvAdapters;

  inherit (lib) lowPrio hiPrio appendToName makeOverridable;
@ -203,6 +202,11 @@ let
  stringsWithDeps = lib.stringsWithDeps;


+  ### Nixpkgs maintainer tools
+
+  nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
+
+
  ### STANDARD ENVIRONMENT


@ -2001,7 +2005,6 @@ let

  ### SHELLS

-
  bash = lowPrio (callPackage ../shells/bash {
    texinfo = null;
  });
@ -2025,7 +2028,6 @@ let

  ### DEVELOPMENT / COMPILERS

-
  abc =
    abcPatchable [];

@ -2637,6 +2639,7 @@ let

  julia = callPackage ../development/compilers/julia {
    liblapack = liblapack.override {shared = true;};
+    mpfr = mpfr_3_1_2;
    fftw = fftw.override {pthreads = true;};
    fftwSinglePrec = fftwSinglePrec.override {pthreads = true;};
  };
@ -2661,7 +2664,9 @@ let

  mlton = callPackage ../development/compilers/mlton { };

-  mono = callPackage ../development/compilers/mono { };
+  mono = callPackage ../development/compilers/mono {
+    inherit (xlibs) libX11;
+  };

  monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };

@ -2715,12 +2720,22 @@ let
    camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
    camomile = callPackage ../development/ocaml-modules/camomile { };

+    camlimages = callPackage ../development/ocaml-modules/camlimages { };
+
+    ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
+
    cryptokit = callPackage ../development/ocaml-modules/cryptokit { };

    findlib = callPackage ../development/tools/ocaml/findlib { };

+    dypgen = callPackage ../development/ocaml-modules/dypgen { };
+
+    patoline = callPackage ../tools/typesetting/patoline { };
+
    gmetadom = callPackage ../development/ocaml-modules/gmetadom { };

+    lablgl = callPackage ../development/ocaml-modules/lablgl { };
+
    lablgtk = callPackage ../development/ocaml-modules/lablgtk {
      inherit (gnome) libgnomecanvas libglade gtksourceview;
    };
@ -2898,6 +2913,7 @@ let

  yasm = callPackage ../development/compilers/yasm { };

+
  ### DEVELOPMENT / INTERPRETERS

  acl2 = builderDefsPackage ../development/interpreters/acl2 {
@ -3090,6 +3106,27 @@ let

  ### DEVELOPMENT / MISC

+  amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
+
+  amdappsdk26 = callPackage ../development/misc/amdapp-sdk {
+    version = "2.6";
+  };
+
+  amdappsdk27 = callPackage ../development/misc/amdapp-sdk {
+    version = "2.7";
+  };
+
+  amdappsdk28 = callPackage ../development/misc/amdapp-sdk {
+    version = "2.8";
+  };
+
+  amdappsdk = amdappsdk28;
+
+  amdappsdkFull = callPackage ../development/misc/amdapp-sdk {
+    version = "2.8";
+    samples = true;
+  };
+
  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {};

  avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
@ -3123,7 +3160,6 @@ let

  ### DEVELOPMENT / TOOLS

-
  antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };

  antlr3 = callPackage ../development/tools/parsing/antlr { };
@ -3406,6 +3442,7 @@ let
  noweb = callPackage ../development/tools/literate-programming/noweb { };

  omake = callPackage ../development/tools/ocaml/omake { };
+  omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };

  openocd = callPackage ../development/tools/misc/openocd { };

@ -3531,7 +3568,6 @@ let

  ### DEVELOPMENT / LIBRARIES

-
  a52dec = callPackage ../development/libraries/a52dec { };

  aacskeys = callPackage ../development/libraries/aacskeys { };
@ -4010,6 +4046,7 @@ let

  #GMP ex-satellite, so better keep it near gmp
  mpfr = callPackage ../development/libraries/mpfr { };
+  mpfr_3_1_2 = callPackage ../development/libraries/mpfr/3.1.2.nix { };

  gst_all = {
    inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
@ -4099,7 +4136,9 @@ let

  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };

-  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix {
+    cupsSupport = config.gtk2.cups or true;
+  };
  gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
  gtk = pkgs.gtk2;

@ -4650,7 +4689,11 @@ let

  libunique = callPackage ../development/libraries/libunique/default.nix { };

-  libusb = callPackage ../development/libraries/libusb { };
+  libusb = callPackage ../development/libraries/libusb {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };

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

@ -6248,6 +6291,8 @@ let

    perf = callPackage ../os-specific/linux/kernel/perf.nix { };

+    psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
+
    spl = callPackage ../os-specific/linux/spl/default.nix { };

    sysprof = callPackage ../development/tools/profiling/sysprof {
@ -6627,6 +6672,7 @@ let

  zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };

+
  ### DATA

  andagii = callPackage ../data/fonts/andagii {};
@ -6907,6 +6953,10 @@ let

  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };

+  cgminer = callPackage ../applications/misc/cgminer {
+    amdappsdk = amdappsdk28;
+  };
+
  chatzilla = callPackage ../applications/networking/irc/chatzilla {
    xulrunner = firefox36Pkgs.xulrunner;
  };
@ -7092,6 +7142,8 @@ let

    emms = callPackage ../applications/editors/emacs-modes/emms { };

+    ess = callPackage ../applications/editors/emacs-modes/ess { };
+
    flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };

    gh = callPackage ../applications/editors/emacs-modes/gh { };
@ -7182,6 +7234,8 @@ let

  keepassx = callPackage ../applications/misc/keepassx { };

+  keepass = callPackage ../applications/misc/keepass { };
+
  # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide
  # `share/icons/hicolor/icon-theme.cache'.  Arbitrarily give this one a
  # higher priority.
@ -7786,6 +7840,31 @@ let

  mutt = callPackage ../applications/networking/mailreaders/mutt { };

+  ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
+    ruby = ruby19;
+    hoe = rubyLibs.hoe;
+  };
+
+  ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
+
+  sup = callPackage ../applications/networking/mailreaders/sup {
+    ruby = ruby19;
+
+    chronic = rubyLibs.chronic;
+    gettext = rubyLibs.gettext;
+    gpgme = ruby_gpgme;
+    iconv = rubyLibs.iconv;
+    locale = rubyLibs.locale;
+    lockfile = rubyLibs.lockfile;
+    mime_types = rubyLibs.mime_types;
+    ncursesw_sup = ruby_ncursesw_sup;
+    rake = rubyLibs.rake_10_0_4;
+    rmail = rubyLibs.rmail;
+    text = rubyLibs.text;
+    trollop = rubyLibs.trollop;
+    xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5;
+  };
+
  msmtp = callPackage ../applications/networking/msmtp { };

  imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
@ -8223,18 +8302,21 @@ let

  vimHugeX = vim_configurable;

-  vim_configurable = callPackage (import ../applications/editors/vim/configurable.nix) {
-    inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib config;
-    inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE;
-    inherit (pkgs) glib gtk;
+  vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
+    inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext
+      composableDerivation lib config glib gtk python perl tcl ruby;
+    inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu
+      libICE;
+
    features = "huge"; # one of  tiny, small, normal, big or huge
-    # optional features by passing
-    # python
-    # TODO mzschemeinterp perlinterp
-    inherit (pkgs) python perl tcl ruby /*x11*/;
    lua = pkgs.lua5;
+    gui = config.vim.gui or "auto";
+
    # optional features by flags
    flags = [ "python" "X11" ]; # only flag "X11" by now
+
+    # so that we can use gccApple if we're building on darwin
+    inherit stdenvAdapters gccApple;
  };
  vimLatest = vim_configurable.override { source = "latest"; };
  vimNox = vim_configurable.override { source = "vim-nox"; };
@ -8446,6 +8528,7 @@ let

  zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };

+
  ### GAMES

  alienarena = callPackage ../games/alienarena { };
@ -8741,7 +8824,6 @@ let

  ### DESKTOP ENVIRONMENTS

-
  enlightenment = callPackage ../desktops/enlightenment { };

  e17 = recurseIntoAttrs (
@ -8907,6 +8989,7 @@ let
  xfce = xfce4_10;
  xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; });

+
  ### SCIENCE

  celestia = callPackage ../applications/science/astronomy/celestia {
@ -8926,6 +9009,7 @@ let

  stellarium = callPackage ../applications/science/astronomy/stellarium { };

+
  ### SCIENCE/GEOMETRY

  drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
@ -9008,6 +9092,7 @@ let
    cmake = cmakeCurses;
  });

+
  ### SCIENCE/LOGIC

  coq = callPackage ../applications/science/logic/coq {
@ -9084,6 +9169,7 @@ let

  tptp = callPackage ../applications/science/logic/tptp {};

+
  ### SCIENCE / ELECTRONICS

  eagle = callPackage_i686 ../applications/science/electronics/eagle { };
@ -9136,6 +9222,7 @@ let

  yacas = callPackage ../applications/science/math/yacas { };

+
  ### SCIENCE / MISC

  boinc = callPackage ../applications/science/misc/boinc { };
@ -9148,6 +9235,7 @@ let

  vite = callPackage ../applications/science/misc/vite { };

+
  ### MISC

  atari800 = callPackage ../misc/emulators/atari800 { };
@ -9241,13 +9329,10 @@ let
    stateDir = config.nix.stateDir or "/nix/var";
  };

-  nixUnstable = nixStable;
-  /*
  nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
    storeDir = config.nix.storeDir or "/nix/store";
    stateDir = config.nix.stateDir or "/nix/var";
  };
-  */

  nut = callPackage ../applications/misc/nut { };

@ -9356,7 +9441,8 @@ let

  texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
    paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
-              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 ];
+              texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5
+              texLiveModerntimeline ];
  });

  /* Look in configurations/misc/raskin.nix for usage example (around revisions
@ -9404,6 +9490,10 @@ let
    inherit texLive unzip;
  };

+  texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) {
+    inherit texLive unzip;
+  };
+
  thinkfan = callPackage ../tools/system/thinkfan { };

  vice = callPackage ../misc/emulators/vice { };
@ -9450,6 +9540,28 @@ let
    inherit (stdenv) mkDerivation;
  };

+  # patoline requires a rather large ocaml compilation environment.
+  # this is why it is build as an environment and not just a normal package.
+  # remark : the emacs mode is also installed, but you have to adjust your load-path.
+  PatolineEnv = pack: myEnvFun {
+      name = "patoline";
+      buildInputs = [ stdenv ncurses mesa freeglut libzip gcc
+                                   pack.ocaml pack.findlib pack.camomile
+                                   pack.dypgen pack.ocaml_sqlite3 pack.camlzip
+                                   pack.lablgtk pack.camlimages pack.ocaml_cairo
+                                   pack.lablgl pack.ocamlnet pack.cryptokit
+                                   pack.ocaml_pcre pack.patoline
+                                   ];
+    # this is to circumvent the bug with libgcc_s.so.1 which is
+    # not found when using thread
+    extraCmds = ''
+       LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
+       export LD_LIBRARY_PATH
+    '';
+   };
+
+   patoline = PatolineEnv ocamlPackages_4_00_1;
+
  znc = callPackage ../applications/networking/znc { };

  zsnes = callPackage_i686 ../misc/emulators/zsnes {
--- a/Show more
+++ b/Show more