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

pkgs/applications/editors/vbindiff/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "vbindiff-${version}";
+  version = "3.0_beta4";
+
+  buildInputs = [ ncurses ];
+
+  src = fetchurl {
+    url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
+    sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
+  };
+
+  meta = {
+    description = "A terminal visual binary diff viewer";
+    homepage = "http://www.cjmweb.net/vbindiff/";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}

pkgs/applications/misc/librecad/2.0.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, qt4, muparser, which, boost}:
+
+stdenv.mkDerivation {
+  name = "librecad-2.0.0beta1";
+
+  src = fetchurl {
+    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.0beta1;
+    name = "librecad-2.0.0beta1.tar.gz";
+    sha256 = "8bf969b79be115f3b3ff72cc030a4c21fe93164dd0cb19ddfb78a7d66b8bc770";
+  };
+
+  patchPhase = ''
+    sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
+    sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
+  '';
+
+  configurePhase = ''
+    qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost}
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/share
+    cp -R unix/librecad $out/bin
+    cp -R unix/resources $out/share/librecad
+  '';
+
+  buildInputs = [ qt4 muparser which boost ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A 2D CAD package based upon Qt";
+    homepage = http://librecad.org;
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/rxvt_unicode/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation (rec {
 
   preConfigure =
     ''
-      configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
+      configureFlags="--with-terminfo=$out/share/terminfo ${if perlSupport then "--enable-perl" else "--disable-perl"}";
       export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
       NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
       NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
@@ -36,10 +36,6 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "A clone of the well-known terminal emulator rxvt";
-    longDescription = "
-      You should put this into your ~/.bashrc:
-      export TERMINFO=~/.nix-profile/share/terminfo
-    ";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
   };
 })

pkgs/applications/networking/browsers/chromium/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, config, fetchurl, makeWrapper, which
+{ stdenv, fetchurl, makeWrapper, which
 
 # default dependencies
 , bzip2, flac, speex
@@ -15,32 +15,24 @@
 , libXScrnSaver, libXcursor, mesa
 
 # optional dependencies
-, libgnome_keyring # config.gnomeKeyring
+, libgcrypt ? null # gnomeSupport || cupsSupport
-, gconf # config.gnome
+
-, libgcrypt # config.gnome || config.cups
+# package customization
-, nss, openssl # config.openssl
+, channel ? "stable"
-, pulseaudio # config.pulseaudio
+, enableSELinux ? false, libselinux ? null
-, libselinux # config.selinux
+, enableNaCl ? false
+, useOpenSSL ? false, nss ? null, openssl ? null
+, gnomeSupport ? false, gconf ? null
+, gnomeKeyringSupport ? false, libgnome_keyring ? null
+, proprietaryCodecs ? true
+, cupsSupport ? false
+, pulseSupport ? false, pulseaudio ? null
 }:
 
 with stdenv.lib;
 
 let
-  mkConfigurable = mapAttrs (flag: default: attrByPath ["chromium" flag] default config);
+  sourceInfo = builtins.getAttr channel (import ./sources.nix);
-
-  cfg = mkConfigurable {
-    channel = "stable";
-    selinux = false;
-    nacl = false;
-    openssl = false;
-    gnome = false;
-    gnomeKeyring = false;
-    proprietaryCodecs = true;
-    cups = false;
-    pulseaudio = config.pulseaudio or true;
-  };
-
-  sourceInfo = builtins.getAttr cfg.channel (import ./sources.nix);
 
   mkGypFlags =
     let
@@ -62,7 +54,7 @@ let
     use_system_libusb = true;
     use_system_libxml = true;
     use_system_speex = true;
-    use_system_ssl = cfg.openssl;
+    use_system_ssl = useOpenSSL;
     use_system_stlport = true;
     use_system_xdg_utils = true;
     use_system_yasm = true;
@@ -87,7 +79,7 @@ let
   post23 = !versionOlder sourceInfo.version "24.0.0.0";
   post24 = !versionOlder sourceInfo.version "25.0.0.0";
 
-  maybeFixPulseAudioBuild = optional (post23 && cfg.pulseaudio) (fetchurl {
+  maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl {
     url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch;
     sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb";
   });
@@ -107,28 +99,28 @@ in stdenv.mkDerivation rec {
     which makeWrapper
     python perl pkgconfig
     nspr udev
-    (if cfg.openssl then openssl else nss)
+    (if useOpenSSL then openssl else nss)
     utillinux alsaLib
     gcc bison gperf
     krb5
     glib gtk dbus_glib
     libXScrnSaver libXcursor mesa
-  ] ++ optional cfg.gnomeKeyring libgnome_keyring
+  ] ++ optional gnomeKeyringSupport libgnome_keyring
-    ++ optionals cfg.gnome [ gconf libgcrypt ]
+    ++ optionals gnomeSupport [ gconf libgcrypt ]
-    ++ optional cfg.selinux libselinux
+    ++ optional enableSELinux libselinux
-    ++ optional cfg.cups libgcrypt
+    ++ optional cupsSupport libgcrypt
-    ++ optional cfg.pulseaudio pulseaudio
+    ++ optional pulseSupport pulseaudio
     ++ optional post24 pciutils;
 
-  opensslPatches = optional cfg.openssl openssl.patches;
+  opensslPatches = optional useOpenSSL openssl.patches;
 
   prePatch = "patchShebangs .";
 
-  patches = optional cfg.cups ./cups_allow_deprecated.patch
+  patches = optional cupsSupport ./cups_allow_deprecated.patch
-         ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
+         ++ optional pulseSupport ./pulseaudio_array_bounds.patch
          ++ maybeFixPulseAudioBuild;
 
-  postPatch = optionalString cfg.openssl ''
+  postPatch = optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
   '';
 
@@ -136,15 +128,15 @@ in stdenv.mkDerivation rec {
     linux_use_gold_binary = false;
     linux_use_gold_flags = false;
     proprietary_codecs = false;
-    use_gnome_keyring = cfg.gnomeKeyring;
+    use_gnome_keyring = gnomeKeyringSupport;
-    use_gconf = cfg.gnome;
+    use_gconf = gnomeSupport;
-    use_gio = cfg.gnome;
+    use_gio = gnomeSupport;
-    use_pulseaudio = cfg.pulseaudio;
+    use_pulseaudio = pulseSupport;
-    disable_nacl = !cfg.nacl;
+    disable_nacl = !enableNaCl;
-    use_openssl = cfg.openssl;
+    use_openssl = useOpenSSL;
-    selinux = cfg.selinux;
+    selinux = enableSELinux;
-    use_cups = cfg.cups;
+    use_cups = cupsSupport;
-  } // optionalAttrs cfg.proprietaryCodecs {
+  } // optionalAttrs proprietaryCodecs {
     # enable support for the H.264 codec
     proprietary_codecs = true;
     ffmpeg_branding = "Chrome";

pkgs/applications/networking/browsers/chromium/sources.nix

@@ -6,13 +6,13 @@
     sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
   };
   beta = {
-    version = "24.0.1312.25";
+    version = "24.0.1312.35";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.25.tar.bz2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.35.tar.bz2";
-    sha256 = "1d2wnv0pmvja1vwqmccngajwgf9kwz55bhid43k1db7yczi591fr";
+    sha256 = "0mb6xz5lrnzjk1zqr83jyprsxv20svy3a7lyxv9iwdb2bh1i13ci";
   };
   stable = {
-    version = "23.0.1271.91";
+    version = "23.0.1271.97";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.91.tar.bz2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.97.tar.bz2";
-    sha256 = "00avyc8bszkb99jq399jr3h1ia7lw68msszvrdhl5rh052z1lp9q";
+    sha256 = "1qf21n6msj1jmxhnlw8fapsz7q6dd851rxdqv4334v06ny4i5fip";
   };
 }

pkgs/applications/networking/instant-messengers/skype/default.nix

@@ -5,11 +5,11 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "skype-4.0.0.8";
+  name = "skype-4.1.0.20";
 
   src = fetchurl {
     url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "0gq24rbmjd05ihraarn45rwr79gidnwgllvprzrh5zqx02xll17p";
+    sha256 = "1qhcxkfmlpblpy9rqimzdl79rm781swbldkzi6nyw56bbp6lf7n3";
   };
 
   buildInputs =

pkgs/applications/networking/mailreaders/thunderbird/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8";
   };
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   buildInputs =
     [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr

pkgs/applications/office/abiword/default.nix

@@ -10,6 +10,18 @@ stdenv.mkDerivation {
     sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
   };
 
+  prePatch = ''
+    sed -i -e '/#include <glib\/gerror.h>/d' src/af/util/xp/ut_go_file.h
+    sed -i -e 's|#include <glib/gmacros.h>|#include <glib.h>|' \
+      goffice-bits/goffice/app/goffice-app.h
+    sed -i -e 's/ptr->jmpbuf/jmpbuf(png_ptr)/' src/af/util/xp/ut_png.cpp
+    sed -i -e 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
+      src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
+    sed -i -e 's/--no-undefined //' src/Makefile*
+  '';
+
+  enableParallelBuilding = true;
+
   buildInputs =
     [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
       libgsf enchant wv libjpeg

pkgs/applications/science/logic/eprover/default.nix

@@ -1,12 +1,21 @@
 { stdenv, fetchurl, which, texLive }:
-
+let
+  s = # Generated upstream information
+  rec {
+    baseName="eprover";
+    version="1.6";
+    name="${baseName}-${version}";
+    hash="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
+    url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.6/E.tgz";
+    sha256="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
+  };
+in
 stdenv.mkDerivation {
-  name = "EProver-1.4";
+  inherit (s) name;
 
   src = fetchurl {
-    name = "E-1.4.tar.gz";
+    name = "E-${s.version}.tar.gz";
-    url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.4/E.tgz";
+    inherit (s) url sha256;
-    sha256 = "1hxkr21xqkkh4bzqip6qf70w9xvvb8p20zzkvyin631ffgvyvr93";
   };
 
   buildInputs = [which texLive];
@@ -27,6 +36,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    inherit (s) version;
     description = "E automated theorem prover";
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;

pkgs/applications/science/logic/eprover/default.upstream

@@ -0,0 +1,3 @@
+url http://www4.informatik.tu-muenchen.de/~schulz/E/Download.html
+version_link '[.]tgz$'
+version '.*[/]V_([0-9.]+)[/].*' '\1'

pkgs/applications/version-management/git-and-tools/default.nix

@@ -76,6 +76,11 @@ rec {
     inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl;
   };
 
+  hub = import ./hub {
+    inherit (rubyLibs) rake;
+    inherit stdenv fetchgit groff makeWrapper;
+  };
+
   gitFastExport = import ./fast-export {
     inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
   };

pkgs/applications/version-management/git-and-tools/hub/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, groff, rake, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "hub-${version}";
+  version = "1.10.3";
+
+  src = fetchgit {
+    url = "git://github.com/defunkt/hub.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg";
+  };
+
+  buildInputs = [ rake makeWrapper ];
+
+  installPhase = ''
+    rake install "prefix=$out"
+  '';
+
+  fixupPhase = ''
+    wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin
+  '';
+
+  meta = {
+    description = "A GitHub specific wrapper for git";
+    homepage = "http://defunkt.io/hub/";
+    license = stdenv.lib.licenses.mit;
+  };
+}

pkgs/applications/version-management/mercurial/default.nix

@@ -17,8 +17,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
-  PYTHONPATH = "${python}/lib/python2.6/site-packages:${python}/lib/python2.7/site-packages:${docutils}/lib/python2.5/site-packages:${docutils}/lib/python2.6/site-packages:${docutils}/lib/python2.7/site-packages";
-
   makeFlags = "PREFIX=$(out)";
 
   postInstall = (stdenv.lib.optionalString guiSupport
@@ -47,8 +45,6 @@ stdenv.mkDerivation {
       chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
 
-  doCheck = false;  # The test suite fails, unfortunately. Not sure why.
-
   meta = {
     description = "A fast, lightweight SCM system for very large distributed projects";
     homepage = "http://www.selenic.com/mercurial/";

pkgs/applications/virtualization/virtualbox/default.nix

@@ -4,6 +4,7 @@
 , xorriso, makeself, perl, pkgconfig
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python ? null
+, enableExtensionPack ? false, requireFile ? null, patchelf ? null
 }:
 
 with stdenv.lib;
@@ -11,6 +12,7 @@ with stdenv.lib;
 let
 
   version = "4.2.4";
+  extpackRevision = "81684";
 
   forEachModule = action: ''
     for mod in \
@@ -29,6 +31,14 @@ let
     done
   '';
 
+  extensionPack = requireFile {
+    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
+         + ".vbox-extpack";
+    # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
+    sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed";
+    url = "https://www.virtualbox.org/wiki/Downloads";
+  };
+
 in stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
@@ -108,6 +118,15 @@ in stdenv.mkDerivation {
         ln -s "$libexec/$file" $out/bin/$file
     done
 
+    ${optionalString enableExtensionPack ''
+      "$libexec/VBoxExtPackHelperApp" install \
+        --base-dir "$libexec/ExtensionPacks" \
+        --cert-dir "$libexec/ExtPackCertificates" \
+        --name "Oracle VM VirtualBox Extension Pack" \
+        --tarball "${extensionPack}"
+        --sha-256 "${extensionPack.outputHash}"
+    ''}
+
     # Create and fix desktop item
     mkdir -p $out/share/applications
     sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop

pkgs/build-support/fetchurl/mirrors.nix

@@ -248,8 +248,6 @@ rec {
   ];
 
   postgresql = [
-    http://ftp2.nl.postgresql.org/
-    ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/
     ftp://ftp.postgresql.org/pub/
     ftp://ftp-archives.postgresql.org/pub/
   ];

pkgs/build-support/upstream-updater/update-walker.sh

@@ -97,6 +97,12 @@ ensure_name () {
   echo "Resulting name: $CURRENT_NAME"
 }
 
+ensure_attribute_name () {
+  echo "Ensuring attribute name. CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2
+  [ -z "$CURRENT_ATTRIBUTE_NAME" ] && attribute_name "$CURRENT_NAME"
+  echo "Resulting attribute name: $CURRENT_ATTRIBUTE_NAME"
+}
+
 ensure_choice () {
   echo "Ensuring that choice is made." >&2
   echo "NEED_TO_CHOOSE_URL: [$NEED_TO_CHOOSE_URL]." >&2
@@ -127,8 +133,13 @@ name () {
   echo "CURRENT_NAME: $CURRENT_NAME" >&2
 }
 
+attribute_name () {
+  CURRENT_ATTRIBUTE_NAME="$1"
+  echo "CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2
+}
+
 retrieve_version () {
-  PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_NAME".meta.version | xargs)"
+  PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta.version | xargs)"
 }
 
 directory_of () {
@@ -159,7 +170,7 @@ do_write_expression () {
   echo "${1}rec {"
   echo "${1}  baseName=\"$CURRENT_NAME\";"
   echo "${1}  version=\"$CURRENT_VERSION\";"
-  echo "${1}  name=\"$CURRENT_NAME-$CURRENT_VERSION\";"
+  echo "${1}  name=\"\${baseName}-\${version}\";"
   echo "${1}  hash=\"$CURRENT_HASH\";"
   echo "${1}  url=\"$CURRENT_URL\";"
   echo "${1}  sha256=\"$CURRENT_HASH\";"
@@ -219,6 +230,7 @@ process_config () {
   BEGIN_EXPRESSION='# Generated upstream information';
   source "$CONFIG_DIR/$(basename "$1")"
   ensure_name
+  ensure_attribute_name
   retrieve_version
   ensure_choice
   ensure_version

pkgs/build-support/upstream-updater/urls-from-page.sh

@@ -11,4 +11,4 @@ echo "URL: $url" >&2
 
 curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]="([^"]*)"/\n+\1\n-/g' | \
   sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \
-  sed -re 's~^[^:]*$~'"$protocol://$basepath/&~"
+  sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`"

pkgs/build-support/vm/deb/deb-closure.pl

@@ -1,5 +1,5 @@
 use strict;
-use Dpkg::Cdata;
+use Dpkg::Control;
 use Dpkg::Deps;
 use File::Basename;
 
@@ -7,6 +7,7 @@ my $packagesFile = shift @ARGV;
 my $urlPrefix = shift @ARGV;
 my @toplevelPkgs = @ARGV;
 
+
 my %packages;
 
 
@@ -14,10 +15,10 @@ my %packages;
 open PACKAGES, "<$packagesFile" or die;
 
 while (1) {
-    my $cdata = parsecdata(\*PACKAGES, $packagesFile);
+    my $cdata = Dpkg::Control->new(type => CTRL_INFO_PKG);
-    last unless defined $cdata;
+    last if not $cdata->parse(\*PACKAGES, $packagesFile);
-    #print $cdata->{Package}, "\n";
     die unless defined $cdata->{Package};
+    #print STDERR $cdata->{Package}, "\n";
     $packages{$cdata->{Package}} = $cdata;
 }
 
@@ -50,7 +51,7 @@ my %provides;
 
 foreach my $cdata (values %packages) {
     next unless defined $cdata->{Provides};
-    my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides}));
+    my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides}));
     foreach my $name (@provides) {
         #die "conflicting provide: $name\n" if defined $provides{$name};
         #warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n";
@@ -83,7 +84,7 @@ sub closePackage {
     $donePkgs{$pkgName} = 1;
 
     if (defined $cdata->{Provides}) {
-        foreach my $name (getDeps(Dpkg::Deps::parse($cdata->{Provides}))) {
+        foreach my $name (getDeps(Dpkg::Deps::deps_parse($cdata->{Provides}))) {
             $provides{$name} = $cdata->{Package};
         }
     }
@@ -92,14 +93,14 @@ sub closePackage {
 
     if (defined $cdata->{Depends}) {
         print STDERR "    $pkgName: $cdata->{Depends}\n";
-        my $deps = Dpkg::Deps::parse($cdata->{Depends});
+        my $deps = Dpkg::Deps::deps_parse($cdata->{Depends});
         die unless defined $deps;
         push @depNames, getDeps($deps);
     }
 
     if (defined $cdata->{'Pre-Depends'}) {
         print STDERR "    $pkgName: $cdata->{'Pre-Depends'}\n";
-        my $deps = Dpkg::Deps::parse($cdata->{'Pre-Depends'});
+        my $deps = Dpkg::Deps::deps_parse($cdata->{'Pre-Depends'});
         die unless defined $deps;
         push @depNames, getDeps($deps);
     }

pkgs/build-support/vm/default.nix

@@ -761,7 +761,7 @@ rec {
   debClosureGenerator =
     {name, packagesLists, urlPrefix, packages}:
 
-    runCommand "${name}.nix" {} ''
+    runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } ''
       for i in ${toString packagesLists}; do
         echo "adding $i..."
         bunzip2 < $i >> ./Packages
@@ -770,7 +770,7 @@ rec {
       # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279
       sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g
 
-      ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \
+      perl -w ${deb/deb-closure.pl} \
         ./Packages ${urlPrefix} ${toString packages} > $out
     '';
 
@@ -1306,6 +1306,40 @@ rec {
       packages = commonDebPackages ++ [ "diffutils" ];
     };
 
+    ubuntu1210i386 = {
+      name = "ubuntu-12.10-quantal-i386";
+      fullName = "Ubuntu 12.10 Quantal (i386)";
+      packagesLists =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/quantal/main/binary-i386/Packages.bz2;
+            sha256 = "bee3200ac8f037700ccd2311fb8b0de665bd02d46bdb2ae946cf50c5885001c3";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/quantal/universe/binary-i386/Packages.bz2;
+            sha256 = "323036e81c8bf409f71d3bc5cf37cfba72fe1d0fc82e9b5418d4d0cb516646e1";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+
+    ubuntu1210x86_64 = {
+      name = "ubuntu-12.10-quantal-amd64";
+      fullName = "Ubuntu 12.10 Quantal (amd64)";
+      packagesList =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/quantal/main/binary-amd64/Packages.bz2;
+            sha256 = "ef14073f335ef118ebe1c7d45f5a0c17ef28f72abb57c10b9082ab5e04b5d003";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/quantal/universe/binary-amd64/Packages.bz2;
+            sha256 = "c762bd4ed063326577a62ff783cf9720e772b03d4a2aa38048918ee6287b96ce";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+
     debian40i386 = {
       name = "debian-4.0r9-etch-i386";
       fullName = "Debian 4.0r9 Etch (i386)";
@@ -1351,22 +1385,22 @@ rec {
     };
 
     debian60i386 = {
-      name = "debian-6.0.4-squeeze-i386";
+      name = "debian-6.0.6-squeeze-i386";
-      fullName = "Debian 6.0.4 Squeeze (i386)";
+      fullName = "Debian 6.0.6 Squeeze (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
-        sha256 = "1aih4n1iz4gzzm5cy1j14mpx8i25jj1237994j33k7dm0gnqgr2w";
+        sha256 = "18c0473jacd877nkky1x21dkmp4992d8qra6wj07sq0yz5gdc9c4";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian60x86_64 = {
-      name = "debian-6.0.4-squeeze-amd64";
+      name = "debian-6.0.6-squeeze-amd64";
-      fullName = "Debian 6.0.4 Squeeze (amd64)";
+      fullName = "Debian 6.0.6 Squeeze (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
-        sha256 = "1gb3im7kl8dwd7z82xj4wb5g58r86fjj8cirvq0ssrvcm9bqaiz7";
+        sha256 = "1n1h3pz6axcaraxq8gfzq0jywlpdrqand1dnd4q79dy6cl788bi2";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

pkgs/development/compilers/julia/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
  , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
- , tcl, tk
+ , tcl, tk, xproto, libX11
  } :
 let
   realGcc = stdenv.gcc.gcc;
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  date = "20121122";
+  date = "20121209";
   name = "${pname}-git-${date}";
 
   grisu_ver = "1.1.1";
@@ -60,21 +60,20 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
-    rev = "53598b026b6fd9f79eba02cbc4e2d6c38ca32bd7";
+    rev = "27b950f62aeb3664ab76e5d827b30b4885a9efb9";
-    sha256 = "159yasgfbbj6px16kgwf7bg478giv8zbm5hg90ipncp1ls2lv3jy";
+    sha256 = "0khx8ln2zq3vpj0g66hnsdhw04hxl79fq43rc06ggsmc1j4xrifb";
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
     fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack
+    openblas liblapack tcl tk xproto libX11 
     ];
 
   configurePhase = ''
     for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB; 
     do 
-      sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc; 
+      makeFlags="$makeFlags USE_SYSTEM_$i=1 "
     done
-    sed -e 's@-lcurses@@g' -i Make.inc
 
     copy_kill_hash(){
       cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
@@ -89,8 +88,6 @@ stdenv.mkDerivation rec {
     ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''}
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
 
-    sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
-
     export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
 
     export GLPK_PREFIX="${glpk}/include"
@@ -107,20 +104,19 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
-    make -C test/unicode all SHELL="${stdenv.shell}"
-    make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" SHELL="${stdenv.shell}"
-
     mkdir -p usr/lib
     ln -s libuv.a usr/lib/uv.a
   '';
 
+  preInstall = ''
+    make -C deps install-tk-wrapper
+  '';
+
   postInstall = ''
-   ld -E --whole-archive --shared ${suitesparse}/lib/lib*[a-z].a -o "$out"/lib/libsuitesparse-shared.so
+   (
-   for i in umfpack cholmod amd camd colamd btf cxsparse ldl rbio spqr suitesparseconfig; do
+   cd $out/share/julia/test/ 
-     ln -s "libsuitesparse-shared.so" "$out/lib/lib$i.so"
+   $out/bin/julia runtests.jl all
-   done
+   ) || true
-   ln -s "${lighttpd}/sbin/lighttpd" "$out/sbin/"
-   ln -s "${lighttpd}/lib/"* "$out/lib/"
   '';
 
   meta = {

pkgs/development/interpreters/python/2.6/default.nix

@@ -60,6 +60,8 @@ let
     postInstall =
       ''
         rm -rf "$out/lib/python${majorVersion}/test"
+        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
+        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
       '';
 
     passthru = {

pkgs/development/interpreters/python/2.7/default.nix

@@ -74,6 +74,8 @@ let
     postInstall =
       ''
         rm -rf "$out/lib/python${majorVersion}/test"
+        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
+        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
       '';
 
     passthru = {

pkgs/development/interpreters/python/wrapper.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   unpackPhase = "true";
   installPhase = ''
     mkdir -p "$out/bin"
-    for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
+    for prg in 2to3 idle pdb pdb${python.majorVersion} pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
       makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
     done
     ensureDir "$out/share"

pkgs/development/libraries/SDL_image/default.nix

@@ -1,41 +1,27 @@
-{ stdenv, fetchhg, SDL, libpng, libjpeg, libtiff, libungif, libXpm, automake,
+{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
-  autoconf, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  pname = "SDL_image";
+  name = "SDL_image-1.2.12";
-  version = "1.2.10-20110925";
 
-  name = "${pname}-${version}";
+  src = fetchurl {
-
+    url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
-  src = fetchhg {
+    sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
-    url = http://hg.libsdl.org/SDL_image;
-    tag = "bb611e7cb1e5";
-    sha256 = "0003inlvvmlc2fyrzy01lwhhfb90ppsar2skaa7x6rhmpc71dakz";
   };
 
   buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
-  buildNativeInputs = [ automake autoconf pkgconfig ];
-
-  patches = [ ./jpeg-linux.diff ];
-
-  preConfigure = ''
-    ./autogen.sh
-    '';
-
   postInstall = ''
     sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-    -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
+      -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
-    -e 's,"begin_code.h",<SDL/begin_code.h>,' \
+      -e 's,"begin_code.h",<SDL/begin_code.h>,' \
-    -e 's,"close_code.h",<SDL/close_code.h>,' \
+      -e 's,"close_code.h",<SDL/close_code.h>,' \
       $out/include/SDL/SDL_image.h
-
+    ln -sv SDL/SDL_image.h $out/include/SDL_image.h
-    ln -sv $out/include/SDL/SDL_image.h $out/include/
   '';
 
   meta = {
     description = "SDL image library";
-    homepage = http://www.libsdl.org/projects/SDL_image/;
+    homepage = "http://www.libsdl.org/projects/SDL_image/";
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/SDL_image/jpeg-linux.diff

@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Yury G. Kudryashov <urkud@ya.ru>
-# Date 1316994786 -14400
-# Node ID 4c3cd9a4b0602c45c11ec62bcc1f5562ea071d70
-# Parent  bb611e7cb1e58cc37a6773a22a15c74b55e3d267
-Fix compilation on Linux
-
-Submitted upstream, see http://bugzilla.libsdl.org/show_bug.cgi?id=1179
-
-diff -r bb611e7cb1e5 -r 4c3cd9a4b060 IMG_jpg.c
---- a/IMG_jpg.c	Thu Aug 25 02:24:35 2011 -0400
-+++ b/IMG_jpg.c	Mon Sep 26 03:53:06 2011 +0400
-@@ -34,7 +34,7 @@
- 
- #include <jpeglib.h>
- 
--#if JPEG_LIB_VERSION >= 80
-+#ifdef JPEG_TRUE /* MinGW version of jpeg-8.x renamed TRUE to JPEG_TRUE etc. */
- 	typedef JPEG_boolean boolean;
- 	#define TRUE JPEG_TRUE
- 	#define FALSE JPEG_FALSE

pkgs/development/libraries/boost/1.52.nix

@@ -63,7 +63,12 @@ stdenv.mkDerivation {
 
   buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
 
-  installPhase = ":";
+  # normal install does not install bjam, this is a separate step
+  installPhase = ''
+    cd tools/build/v2
+    sh bootstrap.sh
+    ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install
+  '';
 
   crossAttrs = rec {
     buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];

pkgs/development/libraries/ftgl/2.1.2.nix

@@ -13,6 +13,8 @@ stdenv.mkDerivation {
 
   buildInputs = [freetype mesa];
 
+  NIX_LDFLAGS = "-lGLU -lGL";
+
   patches = [ ./gcc.patch ];
 
   configureFlags = "--enable-shared";

pkgs/development/libraries/haskell/ansi-terminal/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ansi-terminal";
-  version = "0.5.5";
+  version = "0.5.5.1";
-  sha256 = "09r4nlpmkis6cp30jkymfas13hz6ph4zqxhvigrxn6s76v7nb5a8";
+  sha256 = "146kqp49dvsskws7pn54yynpac1sb1s51pbm4nkqj86wwp04f0lc";
   isLibrary = true;
   isExecutable = true;
   meta = {

pkgs/development/libraries/haskell/base64-conduit/default.nix

@@ -0,0 +1,14 @@
+{ cabal, base64Bytestring, conduit }:
+
+cabal.mkDerivation (self: {
+  pname = "base64-conduit";
+  version = "0.5.1";
+  sha256 = "1zmp6iv55rac7x7w59az7zaarq79fr7zvgg2wcb5b627axlw909l";
+  buildDepends = [ base64Bytestring conduit ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Base64-encode and decode streams of bytes";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/blaze-html/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.5.1.1";
+  version = "0.5.1.3";
-  sha256 = "1z1lnfph4spy9vx2nfhbykkfcdnw14fars5aydrgi70spaq5ial2";
+  sha256 = "0ia7pk346lc7664w859q09p163cxgxjjpkk7cbmbl1wj2shshh1w";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

pkgs/development/libraries/haskell/blaze-markup/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-markup";
-  version = "0.5.1.2";
+  version = "0.5.1.4";
-  sha256 = "1iqwcmb35793drkvnxx8z3zkyyzd6b84x9b8cp2aza2n0qw7sihm";
+  sha256 = "0g316qhk7yv6y680w93613apfhm458a01g3jmq42yv4ndydkv4rr";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

pkgs/development/libraries/haskell/blaze-svg/default.nix

@@ -0,0 +1,14 @@
+{ cabal, blazeMarkup, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "blaze-svg";
+  version = "0.3.3.0";
+  sha256 = "1wi4nc73ic3qmbx6v9fniacwcz2nlvmp5snn144fdiwb22klfn5f";
+  buildDepends = [ blazeMarkup mtl ];
+  meta = {
+    homepage = "https://github.com/deepakjois/blaze-svg";
+    description = "SVG combinator library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/cipher-aes/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.1.4";
+  version = "0.1.5";
-  sha256 = "0yidq4swwhn1ldm16faraa00gpy946r9ndjkwhfps4pb3h96z0hz";
+  sha256 = "0n0qbq2hwyksdbr6fn7yj5vwicmdrn58mfz0dprl8fj456r4j3kn";
   meta = {
     homepage = "http://github.com/vincenthz/hs-cipher-aes";
     description = "Fast AES cipher implementation with advanced mode of operations";

pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix

@@ -1,10 +1,15 @@
-{ cabal, classyPrelude, conduit, xmlConduit }:
+{ cabal, classyPrelude, conduit, monadControl, resourcet
+, transformers, void, xmlConduit
+}:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.4.1";
+  version = "0.4.2";
-  sha256 = "0llir0xnnyhgxifay019x64jw7mnn9p1sqs1xwm14gjcqr2nqqg8";
+  sha256 = "1p5j519s95cgiy5ig0agbfs4vyay8srzwsimnblij68zz5jjfrzp";
-  buildDepends = [ classyPrelude conduit xmlConduit ];
+  buildDepends = [
+    classyPrelude conduit monadControl resourcet transformers void
+    xmlConduit
+  ];
   meta = {
     homepage = "https://github.com/snoyberg/classy-prelude";
     description = "conduit instances for classy-prelude";

pkgs/development/libraries/haskell/classy-prelude/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.4.1";
+  version = "0.4.2";
-  sha256 = "14s1qirss8qbicdw4bc7smdnk1xrpp1xsii8kgmrb1z4ji0h9bf1";
+  sha256 = "082zqhyswzlnl250g8pf88nmh7pkwxwjwnkp0pm9960qsl6kbn7s";
   buildDepends = [
     basicPrelude hashable systemFilepath text transformers
     unorderedContainers vector

pkgs/development/libraries/haskell/cprng-aes/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.3.0";
+  version = "0.3.1";
-  sha256 = "1a8imapda8k0rf0bvag1iin66f2r97pfgip7dkvpvmdkp3j1212h";
+  sha256 = "0z1kpgy9d4yp1vmcparsv3r5g1khv2yqqkr99ac3mgvr6pyh24dk";
   buildDepends = [
     cipherAes cryptoApi cryptoRandomApi entropy random
   ];

pkgs/development/libraries/haskell/crypto-conduit/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.4.1";
+  version = "0.4.2";
-  sha256 = "1gdznwcq3fb9ls68lgpwna6k1k612j241c8441z7r2kx3a64dqwv";
+  sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3";
   buildDepends = [ cereal conduit cryptoApi transformers ];
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";

pkgs/development/libraries/haskell/cryptocipher/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.3.6";
+  version = "0.3.7";
-  sha256 = "0r2alw0in0ndaz7y9bzqigla74wbn8h1z43s2zx5rc3sq5p3rp6s";
+  sha256 = "14qhi3969q1h9n85flb7wwsr50gdn63q7pmcpm2npy5vkp34lkp5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/cryptohash/default.nix

@@ -2,10 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.9";
+  version = "0.8.1";
-  sha256 = "1prbc65klr93mvqj4hass5yyxv353fral70mj379jrf4m93429hz";
+  sha256 = "1xxnmxfpd77ahyjhy2fq3fxhiivhj6k12v1z72ndyhrd3369zqky";
-  isLibrary = true;
-  isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash";

pkgs/development/libraries/haskell/diagrams/cairo.nix

@@ -1,15 +1,15 @@
-{ cabal, cairo, cmdargs, diagramsCore, diagramsLib, filepath, gtk
+{ cabal, cairo, cmdargs, colour, diagramsCore, diagramsLib
-, mtl, split
+, filepath, mtl, split, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "0.5.0.2";
+  version = "0.6";
-  sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8";
+  sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
   buildDepends = [
-    cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split
+    cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
+    time
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Cairo backend for diagrams drawing EDSL";

pkgs/development/libraries/haskell/diagrams/contrib.nix

@@ -0,0 +1,18 @@
+{ cabal, colour, dataDefault, diagramsLib, forceLayout, lens, mtl
+, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-contrib";
+  version = "0.6";
+  sha256 = "059ljwsbrkzj2wvx9q4viinz46nw5lf4yjmx2c1dmwaqfz3i7j7i";
+  buildDepends = [
+    colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Collection of user contributions to diagrams EDSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/diagrams/core.nix

@@ -1,15 +1,15 @@
-{ cabal, MemoTrie, newtype, semigroups, vectorSpace
+{ cabal, dualTree, MemoTrie, monoidExtras, newtype, semigroups
-, vectorSpacePoints
+, vectorSpace, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "0.5.0.1";
+  version = "0.6";
-  sha256 = "073fk9cxm1kh92alr51dgwps9wxc5w3470axc6q7w91sk5cskpxy";
+  sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778";
   buildDepends = [
-    MemoTrie newtype semigroups vectorSpace vectorSpacePoints
+    dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
+    vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Core libraries for diagrams EDSL";

pkgs/development/libraries/haskell/diagrams/diagrams.nix

@@ -1,10 +1,12 @@
-{ cabal, diagramsCairo, diagramsCore, diagramsLib }:
+{ cabal, diagramsContrib, diagramsCore, diagramsLib, diagramsSvg }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "0.5";
+  version = "0.6";
-  sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5";
+  sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
-  buildDepends = [ diagramsCairo diagramsCore diagramsLib ];
+  buildDepends = [
+    diagramsContrib diagramsCore diagramsLib diagramsSvg
+  ];
   noHaddock = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";

pkgs/development/libraries/haskell/diagrams/lib.nix

@@ -1,14 +1,14 @@
-{ cabal, active, colour, dataDefault, diagramsCore, newtype
+{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
-, NumInstances, semigroups, vectorSpace
+, newtype, NumInstances, semigroups, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.5.0.1";
+  version = "0.6";
-  sha256 = "0spfsllr2z064cxkdqcij02f0ikxxmll2dqj7rfikp4738wj21dy";
+  sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf";
   buildDepends = [
-    active colour dataDefault diagramsCore newtype NumInstances
+    active colour dataDefault diagramsCore monoidExtras newtype
-    semigroups vectorSpace
+    NumInstances semigroups vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";

pkgs/development/libraries/haskell/diagrams/svg.nix

@@ -0,0 +1,19 @@
+{ cabal, blazeSvg, cmdargs, colour, diagramsCore, diagramsLib
+, filepath, monoidExtras, mtl, split, time, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-svg";
+  version = "0.6";
+  sha256 = "0yiqilpksgsy87dxx4664pgbbgqcr98j1da4krb751x0yxkglyh5";
+  buildDepends = [
+    blazeSvg cmdargs colour diagramsCore diagramsLib filepath
+    monoidExtras mtl split time vectorSpace
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "SVG backend for diagrams drawing EDSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/digestive-functors-heist/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.5.0.0";
+  version = "0.5.1.0";
-  sha256 = "1cqzpnr53mailnmjgkbqk4f4hrjd84h6682mr8x7qg5v27zvcdbn";
+  sha256 = "1rycf6y1c0car2m71iia929si5iqpc2rdyyxzp326q0rgj94whpk";
   buildDepends = [ digestiveFunctors heist text xmlhtml ];
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";

pkgs/development/libraries/haskell/dual-tree/default.nix

@@ -0,0 +1,13 @@
+{ cabal, monoidExtras, newtype, semigroups }:
+
+cabal.mkDerivation (self: {
+  pname = "dual-tree";
+  version = "0.1.0.0";
+  sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167";
+  buildDepends = [ monoidExtras newtype semigroups ];
+  meta = {
+    description = "Rose trees with cached and accumulating monoidal annotations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/either/default.nix

@@ -0,0 +1,14 @@
+{ cabal, semigroupoids, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "either";
+  version = "3.0.2";
+  sha256 = "1s3rpxxqc9052hrmiznwqwxhl4826qzbgpivpv5acxfhm0w06lhg";
+  buildDepends = [ semigroupoids semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/either/";
+    description = "Haskell 98 either monad transformer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/errors/default.nix

@@ -0,0 +1,13 @@
+{ cabal, either, safe, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "errors";
+  version = "1.3.1";
+  sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik";
+  buildDepends = [ either safe transformers ];
+  meta = {
+    description = "Simplified error-handling";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/force-layout/default.nix

@@ -0,0 +1,13 @@
+{ cabal, lens, newtype, vectorSpace, vectorSpacePoints }:
+
+cabal.mkDerivation (self: {
+  pname = "force-layout";
+  version = "0.2";
+  sha256 = "0aif7a28qs8ya7q9sklp02gb5228jyj8k4jabbp2sia7j4khrkpv";
+  buildDepends = [ lens newtype vectorSpace vectorSpacePoints ];
+  meta = {
+    description = "Simple force-directed layout";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/generic-deriving/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.3.1";
+  version = "1.4.0";
-  sha256 = "1z02j86lgn57ws0rfq2m0zb0m866k9afh9346k8bbwb5c4914wm3";
+  sha256 = "15av3l4m4qn5by41rkpdvp1kyp3fi9ixvy76wmyj20c46kjbmra7";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/ghc-mod/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.11.2";
+  version = "1.11.3";
-  sha256 = "0df1g57mwgd9avd2smnc7j97n14553p3zdmnbjanhnzin2fqj0dc";
+  sha256 = "13r3cz25lf0ndsyfc5adqx5mdv7hcl3qp7n2syg2msrn133xpwb2";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/gloss/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.7.1";
+  version = "1.7.8.1";
-  sha256 = "0g5ik7zv2iywvqingnjvmb9ihk31fwpnjkbfiglzslmga5cjix2a";
+  sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {

pkgs/development/libraries/haskell/glpk-hs/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "glpk-hs";
-  version = "0.3.3";
+  version = "0.3.4";
-  sha256 = "1pnq0v5va7f40ky9xb8c4z9wcmmnny2vk4afasz5pwivbxh42mfl";
+  sha256 = "0wyasd0dqi5nnh52lx980vnyhm0rwib0sd7qnpj4s9hq8rn994cm";
   buildDepends = [ deepseq mtl ];
   extraLibraries = [ glpk ];
   meta = {

pkgs/development/libraries/haskell/hakyll/default.nix

@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
     tagsoup text time
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

pkgs/development/libraries/haskell/hamlet/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.1.1";
+  version = "1.1.2";
-  sha256 = "0vxnvh9npsf1jxh471fnr2d13bdi7p8sxn5b2w86bla3q273jxp8";
+  sha256 = "0k6wnjqmap4wv0p1hvzpd8br4wr4vda9aw87agzf7pix6hwmiybq";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

pkgs/development/libraries/haskell/heist/default.nix

@@ -1,20 +1,20 @@
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
-, filepath, MonadCatchIOTransformers, mtl, random, text, time
+, dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl
-, unorderedContainers, vector, xmlhtml
+, random, text, time, unorderedContainers, vector, xmlhtml
 }:
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.8.2";
+  version = "0.10.0";
-  sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj";
+  sha256 = "0cabn1yw57qa7psmypqa20k4viis140al5zm31jlpmz599rkbi9z";
   buildDepends = [
-    aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
+    aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
-    MonadCatchIOTransformers mtl random text time unorderedContainers
+    filepath hashable MonadCatchIOTransformers mtl random text time
-    vector xmlhtml
+    unorderedContainers vector xmlhtml
   ];
   meta = {
     homepage = "http://snapframework.com/";
-    description = "An (x)html templating system";
+    description = "An Haskell template system supporting both HTML5 and XML";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

pkgs/development/libraries/haskell/hledger-web/default.nix

@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     shakespeareJs shakespeareText text time transformers wai waiExtra
     warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://hledger.org";
     description = "A web interface for the hledger accounting tool";

pkgs/development/libraries/haskell/hspec/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.2.2";
+  version = "1.4.3";
-  sha256 = "0dsavcawa54pjicibb48648iy6bzggkvhiklksq85xq4ywg7r3g5";
+  sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/http-conduit/default.nix

@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.8.4.5";
+  version = "1.8.5.1";
-  sha256 = "1yr9g8pa6wggc4ycm0r3j7xccglvyf2rsd8a1y94p7h3f2hjbsgg";
+  sha256 = "1v70rslnga063mlpfs1w03y1s4x7kfisjqwbcbczynhz15s9hymx";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie

pkgs/development/libraries/haskell/http-reverse-proxy/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.0.6";
+  version = "0.1.0.7";
-  sha256 = "0ybhzyim8b2k1kv5bz0qbignj5lwf8pbpqmrp1vrvyz8a2iy71c8";
+  sha256 = "1fshng7bcpzjq5iqnvl2qsyia9yi80b8sbif18a3w86gsw5xcakk";
   buildDepends = [
     blazeBuilder caseInsensitive classyPreludeConduit conduit
     httpConduit httpTypes liftedBase monadControl network

pkgs/development/libraries/haskell/iproute/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iproute";
-  version = "1.2.7";
+  version = "1.2.9";
-  sha256 = "07ixxq45w5wzvfrvsv2b206kygiqn1v3bcclkd98afjpc6mv3ld3";
+  sha256 = "0r0g8dd0f5n462kil3m2lhycl84ygd0ayh900h9x8phgwzfxzv8i";
   buildDepends = [ appar byteorder network ];
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/iproute/";

pkgs/development/libraries/haskell/kansas-lava/default.nix

@@ -0,0 +1,22 @@
+{ cabal, cmdargs, dataDefault, dataReify, dotgen, filepath, netlist
+, netlistToVhdl, random, sizedTypes, strict
+}:
+
+cabal.mkDerivation (self: {
+  pname = "kansas-lava";
+  version = "0.2.4";
+  sha256 = "0rsjlj558k57r1sfm12n9r9wn8r615bbrwgjhal07qhvy4qip4pg";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    cmdargs dataDefault dataReify dotgen filepath netlist netlistToVhdl
+    random sizedTypes strict
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
+    description = "Kansas Lava is a hardware simulator and VHDL generator";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/language-c-quote/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.4.3";
+  version = "0.4.4";
-  sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf";
+  sha256 = "1g233ja3qy64xcimy9irfb3n8zys00vg1d0s4g3hr48ilc95dl8l";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol

pkgs/development/libraries/haskell/largeword/default.nix

@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "largeword";
-  version = "1.0.3";
+  version = "1.0.4";
-  sha256 = "18b6nhq1cww4wdbrfq0cb828kncxzcsibgs5dbgxa66y6iw93vkg";
+  sha256 = "19nrzbbbmsvxdhfhh6wc53lbk0xyjvbcwvjw0snym666j1w2b2l5";
   meta = {
-    homepage = "http://trac.haskell.org/largeword/wiki";
+    homepage = "https://github.com/idontgetoutmuch/largeword";
     description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/lens/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.6";
+  version = "3.7.0.2";
-  sha256 = "1zl52hj0ccx21qwlqrscfjmc7i0g2prikmd3lgbfbgjqlh7wnqdq";
+  sha256 = "19p71faxr78pis73r2ani0al0lmbq81cws1v2hlgqb4mv2fgw5kn";
   buildDepends = [
     comonad comonadsFd comonadTransformers filepath hashable mtl
     parallel semigroups split text transformers unorderedContainers

pkgs/development/libraries/haskell/lifted-base/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2";
+  version = "0.2.0.2";
-  sha256 = "12ai34wb1sd6fza50arlpvsdc6l2nwrrcik0xakf2q0ddzjmhjfb";
+  sha256 = "19xzparj0k5h4wx71gvbd7l653fak1p57za236sncmar8cps5pdx";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];

pkgs/development/libraries/haskell/minimorph/default.nix

@@ -0,0 +1,14 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+  pname = "minimorph";
+  version = "0.1.4.0";
+  sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6";
+  buildDepends = [ text ];
+  meta = {
+    homepage = "http://darcsden.com/kowey/minimorph";
+    description = "English spelling functions with an emphasis on simplicity";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/miniutter/default.nix

@@ -0,0 +1,14 @@
+{ cabal, minimorph, text }:
+
+cabal.mkDerivation (self: {
+  pname = "miniutter";
+  version = "0.4.0";
+  sha256 = "1l275aad8svrqp22jv9s0mmlam7wbdlf6m4m97658rm8ks4j2mbx";
+  buildDepends = [ minimorph text ];
+  meta = {
+    homepage = "https://github.com/Mikolaj/miniutter";
+    description = "Simple English clause creation from arbitrary words";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/monoid-extras/default.nix

@@ -0,0 +1,13 @@
+{ cabal, semigroups }:
+
+cabal.mkDerivation (self: {
+  pname = "monoid-extras";
+  version = "0.2.2.1";
+  sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary";
+  buildDepends = [ semigroups ];
+  meta = {
+    description = "Various extra monoid-related definitions and utilities";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/mpppc/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mpppc";
-  version = "0.1.2";
+  version = "0.1.3";
-  sha256 = "1zms71wx5a6rd60xy1pv6g1kxlx0hzh36pbr5a5lkfflc583z1k5";
+  sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
   buildDepends = [ ansiTerminal split text ];
   meta = {
     description = "Multi-dimensional parametric pretty-printer with color";

pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix

@@ -0,0 +1,13 @@
+{ cabal, netlist }:
+
+cabal.mkDerivation (self: {
+  pname = "netlist-to-vhdl";
+  version = "0.3.1";
+  sha256 = "15daik7l0pjqilya01l5rl84g2fyjwkap1md0nx82gxcp8m1v76k";
+  buildDepends = [ netlist ];
+  meta = {
+    description = "Convert a Netlist AST to VHDL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/netlist/default.nix

@@ -0,0 +1,13 @@
+{ cabal, binary, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "netlist";
+  version = "0.3.1";
+  sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
+  buildDepends = [ binary syb ];
+  meta = {
+    description = "Netlist AST";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/network-conduit/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "0.6.1.1";
+  version = "0.6.2";
-  sha256 = "00x5ks1qcq5smmd2g4bm23lb3ngdxmdlz822qkkj9l9c27lkn67n";
+  sha256 = "1v9f2x4ryqiwird60n4rkj0jlyn3lqkfs40956xi11r7p656l6q6";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];

pkgs/development/libraries/haskell/optparse-applicative/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.4.2";
+  version = "0.4.3";
-  sha256 = "0hxl4hhh24hz1fc23mbsx83ccnv2fkxbar37d9c5cmiaalsrfb19";
+  sha256 = "1zsydxgq3lcgzrf9iwas3gkjy0vxn4z2cj6h3m63h0qqa26sfcwz";
   buildDepends = [ transformers ];
   meta = {
     homepage = "https://github.com/pcapriotti/optparse-applicative";

pkgs/development/libraries/haskell/pandoc/default.nix

@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Conversion between markup formats";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/parallel-io/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parallel-io";
-  version = "0.3.2.1";
+  version = "0.3.2.2";
-  sha256 = "0wrmz0i5s8p87840pacdnpf2fi12nips4yc72vymifrc1wvlc42q";
+  sha256 = "04swl1mp704ijrpmvw800x0fpzmrbd382p45kvqzynmkgqzx33a3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ extensibleExceptions random ];

pkgs/development/libraries/haskell/parseargs/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parseargs";
-  version = "0.1.3.2";
+  version = "0.1.3.4";
-  sha256 = "1ncdbjzfkhb1f3aznsci26kss9nrv3iilc65q5xdl9nly8p837mv";
+  sha256 = "1n55ay42qiwm72fa63xbz5m5fi0ld5dr3vypmyz5mc0zzhqwxz2j";
   isLibrary = true;
   isExecutable = true;
   meta = {

pkgs/development/libraries/haskell/pem/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pem";
-  version = "0.1.1";
+  version = "0.1.2";
-  sha256 = "0klb39w6mihx35xgdw5wvi1q6r61xgrsqvcqi4c5r6psv5z94cil";
+  sha256 = "1p2sw36b9w6lf53jzj86ibyy9a48fjd786mx3x8mvc5lczx8v78m";
   buildDepends = [ attoparsec base64Bytestring cereal mtl ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-pem";

pkgs/development/libraries/haskell/persistent-postgresql/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.1.0";
+  version = "1.1.1";
-  sha256 = "0vfmlmhfp20w2chiiq0jq6mz084j3bpbviswkcyzdymdkky87kni";
+  sha256 = "19ywyf0d7n6z8ws7s7jc958g30aiy6il43qwvqh92q1cz8bd1mj9";
   buildDepends = [
     aeson conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers

pkgs/development/libraries/haskell/persistent-template/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.1.0";
+  version = "1.1.1";
-  sha256 = "18c2mawq8v094szbjncnm113fmbgzyidcfvs430xy6klag1gh629";
+  sha256 = "18rxjqgmjzx0j0sbg9ms779pkq264vf8w0qz679xsyn98wc95i36";
   buildDepends = [ aeson monadControl persistent text transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";

pkgs/development/libraries/haskell/persistent/default.nix

@@ -1,17 +1,17 @@
 { cabal, aeson, attoparsec, base64Bytestring, blazeHtml
 , blazeMarkup, conduit, liftedBase, monadControl, monadLogger
-, pathPieces, poolConduit, resourcet, sqlite, text, time
+, pathPieces, poolConduit, resourcet, silently, sqlite, text, time
 , transformers, transformersBase, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.1.0";
+  version = "1.1.0.1";
-  sha256 = "15wsw3mnpic8x7qrb8w7ww47p9sazfljp6kcdx13yv2sxa8dv153";
+  sha256 = "07b9d9fcah3k03r2pm6mfl3qsdp4s9gbb376by3122nvc26w6sjc";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit
-    resourcet text time transformers transformersBase
+    resourcet silently text time transformers transformersBase
     unorderedContainers vector
   ];
   extraLibraries = [ sqlite ];

pkgs/development/libraries/haskell/project-template/default.nix

@@ -1,14 +1,15 @@
-{ cabal, base64Bytestring, classyPreludeConduit, conduit, mtl
+{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit
-, systemFileio, systemFilepath, text, transformers
+, conduit, mtl, resourcet, systemFileio, systemFilepath, text
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.0.1";
+  version = "0.1.1";
-  sha256 = "0ahmdlfn48yz8fj7199w0qsa1dbbxr21bs9hq1lnm3s2p4qiki23";
+  sha256 = "186hqfhhl77yq9gqiw59jbnkk7xmpljqfwwilzjkjknf3ifhs5na";
   buildDepends = [
-    base64Bytestring classyPreludeConduit conduit mtl systemFileio
+    base64Bytestring base64Conduit classyPreludeConduit conduit mtl
-    systemFilepath text transformers
+    resourcet systemFileio systemFilepath text transformers
   ];
   meta = {
     homepage = "https://github.com/fpco/haskell-ide";

pkgs/development/libraries/haskell/repa-examples/default.nix

@@ -8,11 +8,11 @@ cabal.mkDerivation (self: {
   sha256 = "1lflgpnig2ks2mwp7bywyjqr2v426gbk1675mkkvjncgr5ahf11g";
   isLibrary = false;
   isExecutable = true;
-  jailbreak = true;
   buildDepends = [
     QuickCheck random repa repaAlgorithms repaIo vector
   ];
   extraLibraries = [ llvm ];
+  jailbreak = true;
   meta = {
     homepage = "http://repa.ouroborus.net";
     description = "Examples using the Repa array library";

pkgs/development/libraries/haskell/shelly/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "0.14.3";
+  version = "0.15.0";
-  sha256 = "0nlspgk5svc9zr2gry96sykhd8i7vdmqxpsvfsz22khw8climqzj";
+  sha256 = "138x2c76ynv0kl0kg86pawnnlk6973dqkaapycb30rf44p1m53j2";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];

pkgs/development/libraries/haskell/silently/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "silently";
-  version = "1.2.4";
+  version = "1.2.4.1";
-  sha256 = "0ac75b4n9566vpvv6jfcqafnyplv8dd7bgak89b16wy032z1xl5j";
+  sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52";
   buildDepends = [ deepseq ];
   meta = {
     homepage = "https://github.com/trystan/silently";

pkgs/development/libraries/haskell/simple-sendfile/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.8";
+  version = "0.2.10";
-  sha256 = "11lw8m21cy40hd9nzp80d9jawgv9hd3sfvizjcfbvdc2lpq6m17j";
+  sha256 = "07js189yyya2vs3wsc49b7c2zbh63f48kywmz88g7s394bp3n9am";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";

pkgs/development/libraries/haskell/sized-types/default.nix

@@ -0,0 +1,15 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "sized-types";
+  version = "0.3.4.0";
+  sha256 = "0fpk7xpqzzylxbnxhz56lxzfnrhfibn0x7ahxl91x6biysnh714c";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
+    description = "Sized types in Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/snap/loader-dynamic.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-loader-dynamic";
-  version = "0.9.0.1";
+  version = "0.10";
-  sha256 = "1pzn8lfqngn8cqm1dpxn5wsx70xcd7r90rd2948n4p5309qgh9mq";
+  sha256 = "0wnrsbnf3crfxhhraz4my08m6yhmqj632rv6cdy9ili3wxjkqd57";
   buildDepends = [ directoryTree hint mtl snapCore time ];
   meta = {
     homepage = "http://snapframework.com/";

pkgs/development/libraries/haskell/snap/loader-static.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-loader-static";
-  version = "0.9.0";
+  version = "0.9.0.1";
-  sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7";
+  sha256 = "0xlb8611r9l9ld97rs27nji7k1qvjg5i62b4al38xj6i0f2skyyi";
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework: static loader";

pkgs/development/libraries/haskell/snap/snap.nix

@@ -1,23 +1,23 @@
-{ cabal, aeson, attoparsec, cereal, clientsession, configurator
+{ cabal, aeson, attoparsec, cereal, clientsession, comonad
-, dataLens, dataLensTemplate, directoryTree, filepath, hashable
+, configurator, directoryTree, dlist, errors, filepath, hashable
-, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
+, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
-, pwstoreFast, snapCore, snapServer, stm, syb, text, time
+, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
-, transformers, unorderedContainers, vector, vectorAlgorithms
+, time, transformers, unorderedContainers, vector, vectorAlgorithms
 , xmlhtml
 }:
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.9.2.2";
+  version = "0.10.0.1";
-  sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw";
+  sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec cereal clientsession configurator dataLens
+    aeson attoparsec cereal clientsession comonad configurator
-    dataLensTemplate directoryTree filepath hashable heist logict
+    directoryTree dlist errors filepath hashable heist lens logict
-    MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
+    MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
-    snapServer stm syb text time transformers unorderedContainers
+    snapCore snapServer stm syb text time transformers
-    vector vectorAlgorithms xmlhtml
+    unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   meta = {
     homepage = "http://snapframework.com/";

pkgs/development/libraries/haskell/stylish-haskell/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.4.0";
+  version = "0.5.5.2";
-  sha256 = "1bnsjs5s760xnk3s1l7kjqr2svxp4a881p9z2slaywi5kn0v5mwf";
+  sha256 = "1whl8qdqyw2saic70kav8srg4f6bcn77mc86m0vk8i8n5mb3q4ny";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/tabular/default.nix

@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.2.3";
   sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76";
   buildDepends = [ csv html mtl ];
+  jailbreak = true;
   meta = {
     homepage = "http://patch-tag.com/r/kowey/tabular";
     description = "Two-dimensional data tables with rendering functions";

pkgs/development/libraries/haskell/test-framework-hunit/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-hunit";
-  version = "0.2.7";
+  version = "0.3.0";
-  sha256 = "1c7424i5vnggzncwiwqqwq7ir7kaijif2waqmss5pn6db3gj33fc";
+  sha256 = "1jwbpbf9q3g936gk71632h830l2wsiic8h6ms1jlmw209mpm7c84";
   buildDepends = [ extensibleExceptions HUnit testFramework ];
   meta = {
     homepage = "http://batterseapower.github.com/test-framework/";

pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck";
-  version = "0.2.8.1";
+  version = "0.3.0";
-  sha256 = "042vdq18mqw4rhsj3x51mz1iv9zbxvlz7jg6r9cni2xpw5m7v6dk";
+  sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv";
   buildDepends = [
     deepseq extensibleExceptions QuickCheck random testFramework
   ];

pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck2";
-  version = "0.2.12.3";
+  version = "0.3.0.1";
-  sha256 = "17pj6b1cclihy203zpb75rkx2djldc9kcj10wqkf5fjmf9vvi0ks";
+  sha256 = "1177cvlb4qsa5x2k12dd60y7b14dyd3jr1ygb49aackhjx52c41s";
   buildDepends = [
     extensibleExceptions QuickCheck random testFramework
   ];

pkgs/development/libraries/haskell/test-framework/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework";
-  version = "0.6.1";
+  version = "0.8";
-  sha256 = "1rx2c3yckw50vrydswb61ngvp27yxcimm5q6jcyqpn16fpkvxijw";
+  sha256 = "1w895nq357zpc4v6vr5nbszyrw7cpsjq5bj38vdd10bfpjjmijcl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/time-compat/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "time-compat";
-  version = "0.1.0.1";
+  version = "0.1.0.2";
-  sha256 = "1fh5ylxv9cmgirakimizfdili3xf3ggqhhz5hz3v9i13mh4bgzvd";
+  sha256 = "0687bxkvqs22p7skqb8n289k9nv7cafg8jyx32sswn2h11m7dihb";
   buildDepends = [ time ];
   meta = {
     homepage = "http://hub.darcs.net/dag/time-compat";

pkgs/development/libraries/haskell/tls-extra/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.5.0";
+  version = "0.5.1";
-  sha256 = "1r645qljn3ql7jcphsqf4cm259cl8fsva64q4p2x37mafi01bkr8";
+  sha256 = "0a977qy6ig4bhgsl6y5iw0xv52yswmcc2x37ypm1601wikjv38x3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/tls/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.0.2";
+  version = "1.0.3";
-  sha256 = "0fkbh89j4gpwq45hv88axcdy7hxhvj1wj14nf7ma8wzaga2p4m75";
+  sha256 = "14wgwz032skkgkxg2lyh8kwg1fkapmlg2jh74czbacvnssc2iidb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [