svn merge ^/nixpkgs/trunk

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

pkgs/applications/editors/leksah/default.nix

@@ -1,6 +1,6 @@
-{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2
+{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk
-, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah
+, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec
-, regexBase, regexTdfa, strict, time, utf8String
+, processLeksah, regexBase, regexTdfa, strict, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -10,9 +10,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary binaryShared deepseq glib gtk gtksourceview2 hslogger
+    binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2
-    leksahServer ltk mtl network parsec processLeksah regexBase
+    hslogger leksahServer ltk mtl network parsec processLeksah
-    regexTdfa strict time utf8String
+    regexBase regexTdfa strict time utf8String
   ];
   noHaddock = true;
   meta = {

pkgs/applications/graphics/gimp/default.nix

@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.11";
+  name = "gimp-2.6.12";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv";
+    sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
   };
   
   buildInputs = [

pkgs/applications/graphics/paraview/default.nix

@@ -7,10 +7,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-3.10.1";
+  name = "paraview-3.12.0";
   src = fetchurl {
-    url = "http://www.paraview.org/files/v3.10/ParaView-3.10.1.tar.gz";
+    url = "http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz";
-    sha256 = "1z2wvywpd3rvz4jhfs3mi35hsx4yqkdim58d075jx9kg7gifwga5";
+    sha256 = "0n0n0hrv02rd9rb63z4baalf40m8v870027mr47b93scgp18qyim";
   };
 
   # [  5%] Generating vtkGLSLShaderLibrary.h
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
 #    "-DPYTHON_LIBRARY="
   ];
 
-  # I don't enable it due to memory bounds
+  enableParallelBuilding = true;
-  enableParallelBuilding = false;
 
   buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
 

pkgs/applications/misc/xmobar/default.nix

@@ -1,4 +1,5 @@
-{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
+{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
+, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+  buildDepends = [
+    filepath mtl parsec stm time utf8String X11 X11Xft
+  ];
   extraLibraries = [ libXrandr ];
   configureFlags = "-fwith_xft";
   meta = {

pkgs/applications/networking/p2p/tribler/default.nix

@@ -1,14 +1,15 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
+{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
+, enablePlayer ? false, vlc ? null }:
 
-let rev = "24763"; in
+let rev = "24912"; in
 
 stdenv.mkDerivation {
-  name = "tribler-5.5.10";
+  name = "tribler-5.5.13-pre${rev}";
 
   src = fetchsvn {
     url = http://svn.tribler.org/abc/branches/release-5.5.x;
     inherit rev;
-    sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6";
+    sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
@@ -34,7 +35,10 @@ stdenv.mkDerivation {
           --set _TRIBLERPATH $out/share/tribler \
           --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
           --run 'cd $_TRIBLERPATH' \
-          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py"
+          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
+          ${stdenv.lib.optionalString enablePlayer ''
+            --prefix LD_LIBRARY_PATH : ${vlc}/lib
+          ''}
     '';
 
   meta = {

pkgs/applications/office/hledger-interest/default.nix

@@ -1,4 +1,4 @@
-{ cabal, hledgerLib, mtl, time }:
+{ cabal, Cabal, hledgerLib, mtl, time }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ hledgerLib mtl time ];
+  buildDepends = [ Cabal hledgerLib mtl time ];
   meta = {
     homepage = "http://github.com/peti/hledger-interest";
     description = "computes interest for a given account";

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

@@ -1,6 +1,6 @@
-{ cabal, curl, extensibleExceptions, hashedStorage, haskeline, html
+{ cabal, curl, extensibleExceptions, filepath, hashedStorage
-, HTTP, mmap, mtl, network, parsec, random, regexCompat, tar
+, haskeline, html, HTTP, mmap, mtl, network, parsec, random
-, terminfo, text, zlib
+, regexCompat, tar, terminfo, text, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -10,8 +10,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    extensibleExceptions hashedStorage haskeline html HTTP mmap mtl
+    extensibleExceptions filepath hashedStorage haskeline html HTTP
-    network parsec random regexCompat tar terminfo text zlib
+    mmap mtl network parsec random regexCompat tar terminfo text zlib
   ];
   extraLibraries = [ curl ];
   meta = {

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

@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.2";
+  version = "1.7.3";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
+    sha1 = "624d4070361c0e8d7cf4f5c667629e72459b122d";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

pkgs/applications/video/vlc/default.nix

@@ -19,20 +19,23 @@ stdenv.mkDerivation rec {
     sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
   };
 
-  buildInputs = [
+  buildInputs =
-    perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+    [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-    dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
+      dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
-    libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+      libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-    udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
+      udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
-    libkate libtiger libv4l samba liboggz libass libdvbpsi
+      libkate libtiger libv4l samba liboggz libass libdvbpsi libva
-  ]
+      xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
-  ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
+    ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  configureFlags = [ "--enable-alsa"
+  configureFlags =
-    "--with-kde-solid=$out/share/apps/solid/actions"
+    [ "--enable-alsa"
-  ];
+      "--with-kde-solid=$out/share/apps/solid/actions"
+    ];
+
+  enableParallelBuilding = true;
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \

pkgs/development/compilers/epic/default.nix

@@ -1,4 +1,4 @@
-{ cabal, boehmgc, gmp, happy, mtl }:
+{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "epic";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ happy ];
   extraLibraries = [ boehmgc gmp ];
   meta = {

pkgs/development/compilers/idris/default.nix

@@ -1,4 +1,5 @@
-{ cabal, binary, epic, happy, haskeline, mtl, parsec, transformers
+{ cabal, binary, Cabal, epic, filepath, happy, haskeline, mtl
+, parsec, transformers
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ binary epic haskeline mtl parsec transformers ];
+  buildDepends = [
+    binary Cabal epic filepath haskeline mtl parsec transformers
+  ];
   buildTools = [ happy ];
   noHaddock = true;
   meta = {

pkgs/development/interpreters/ruby/generated.nix

@@ -3,7 +3,7 @@
 g: # Get dependencies from patched gems
 {
   aliases = {
-    ZenTest = g.ZenTest_4_5_0;
+    ZenTest = g.ZenTest_4_6_2;
     actionmailer = g.actionmailer_3_2_1;
     actionpack = g.actionpack_3_2_1;
     activemodel = g.activemodel_3_2_1;
@@ -12,10 +12,10 @@ g: # Get dependencies from patched gems
     activesupport = g.activesupport_3_2_1;
     arel = g.arel_3_0_0;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
-    autotest_rails = g.autotest_rails_4_1_1;
+    autotest_rails = g.autotest_rails_4_1_2;
     builder = g.builder_3_0_0;
     buildr = g.buildr_1_4_6;
-    bundler = g.bundler_1_0_21;
+    bundler = g.bundler_1_0_22;
     childprocess = g.childprocess_0_3_1;
     coffee_script = g.coffee_script_2_2_0;
     coffee_script_source = g.coffee_script_source_1_2_0;
@@ -53,9 +53,9 @@ g: # Get dependencies from patched gems
     rspec_expectations = g.rspec_expectations_2_1_0;
     rspec_mocks = g.rspec_mocks_2_1_0;
     rubyforge = g.rubyforge_2_0_4;
-    rubyzip = g.rubyzip_0_9_5;
+    rubyzip = g.rubyzip_0_9_6_1;
-    sass = g.sass_3_1_14;
+    sass = g.sass_3_1_15;
-    selenium_webdriver = g.selenium_webdriver_2_18_0;
+    selenium_webdriver = g.selenium_webdriver_2_19_0;
     sprockets = g.sprockets_2_1_2;
     thor = g.thor_0_14_6;
     tilt = g.tilt_1_3_3;
@@ -65,11 +65,11 @@ g: # Get dependencies from patched gems
   };
   gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
   gems = {
-    ZenTest_4_5_0 = {
+    ZenTest_4_6_2 = {
       basename = ''ZenTest'';
       meta = {
         description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
-        homepage = ''http://www.zenspider.com/ZSS/Products/ZenTest/'';
+        homepage = ''https://github.com/seattlerb/zentest'';
         longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
 multiruby.
 
@@ -80,6 +80,8 @@ tool anymore but it is the package namesake, so it stays.
 
 unit_diff is a command-line filter to diff expected results from
 actual results and allow you to quickly see exactly what is wrong.
+Do note that minitest 2.2+ provides an enhanced assert_equal obviating
+the need for unit_diff
 
 autotest is a continous testing facility meant to be used during
 development. As soon as you save a file, autotest will run the
@@ -89,9 +91,9 @@ multiruby runs anything you want on multiple versions of ruby. Great
 for compatibility checking! Use multiruby_setup to manage your
 installed versions.'';
       };
-      name = ''ZenTest-4.5.0'';
+      name = ''ZenTest-4.6.2'';
       requiredGems = [  ];
-      sha256 = ''05iam95wqafz4c890b17w7ahp9i4jbz4hsw6304p9zbsaq7d7h1h'';
+      sha256 = ''0knbim1lvp7q7k529if3h78584x845h9xyz08vykrdqa97x4lkh0'';
     };
     actionmailer_3_2_1 = {
       basename = ''actionmailer'';
@@ -199,7 +201,7 @@ database compatibility and query generation.'';
       requiredGems = [ g.rjb_1_3_9 ];
       sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy'';
     };
-    autotest_rails_4_1_1 = {
+    autotest_rails_4_1_2 = {
       basename = ''autotest_rails'';
       meta = {
         description = ''This is an autotest plugin to provide rails support'';
@@ -207,9 +209,9 @@ database compatibility and query generation.'';
         longDescription = ''This is an autotest plugin to provide rails support. It provides basic
 rails support and extra plugins for migrations and fixtures.'';
       };
-      name = ''autotest-rails-4.1.1'';
+      name = ''autotest-rails-4.1.2'';
-      requiredGems = [ g.ZenTest_4_5_0 ];
+      requiredGems = [ g.ZenTest_4_6_2 ];
-      sha256 = ''09i6mpxibs8yfdcr53nazlxq94yswahz9gdjqdz9srfshcccqbal'';
+      sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
     builder_2_1_2 = {
       basename = ''builder'';
@@ -254,16 +256,16 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
       sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz'';
     };
-    bundler_1_0_21 = {
+    bundler_1_0_22 = {
       basename = ''bundler'';
       meta = {
         description = ''The best way to manage your application's dependencies'';
         homepage = ''http://gembundler.com'';
         longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
       };
-      name = ''bundler-1.0.21'';
+      name = ''bundler-1.0.22'';
       requiredGems = [  ];
-      sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
+      sha256 = ''0hzcsicdvvyhp6b6rv208859a13ag1cxxcd3nd3hf90jldd2iry0'';
     };
     childprocess_0_3_1 = {
       basename = ''childprocess'';
@@ -676,7 +678,7 @@ request helpers feature.'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
       name = ''rails-3.2.1'';
-      requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_21 ];
+      requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_22 ];
       sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5'';
     };
     railties_3_2_1 = {
@@ -852,17 +854,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [  ];
       sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
     };
-    rubyzip_0_9_5 = {
+    rubyzip_0_9_6_1 = {
       basename = ''rubyzip'';
       meta = {
         description = ''rubyzip is a ruby module for reading and writing zip files'';
         homepage = ''http://github.com/aussiegeek/rubyzip'';
       };
-      name = ''rubyzip-0.9.5'';
+      name = ''rubyzip-0.9.6.1'';
       requiredGems = [  ];
-      sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54'';
+      sha256 = ''0azmbbv5j7xx45rn3502vb01n1b2zczi1jk84aw9qc3y9fvkwc3i'';
     };
-    sass_3_1_14 = {
+    sass_3_1_15 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -873,20 +875,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.1.14'';
+      name = ''sass-3.1.15'';
       requiredGems = [  ];
-      sha256 = ''0nrgsrqkfn3w8bpqsq9h4jv5wj0wikn3mp0gb3b7qdzkhw0h9947'';
+      sha256 = ''1lsmqm84w03w8s54i53cf3mplklpasakff2ng6zqf75digg27fzs'';
     };
-    selenium_webdriver_2_18_0 = {
+    selenium_webdriver_2_19_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.18.0'';
+      name = ''selenium-webdriver-2.19.0'';
-      requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_1 ];
+      requiredGems = [ g.rubyzip_0_9_6_1 g.childprocess_0_3_1 ];
-      sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9'';
+      sha256 = ''1phhb8ivv203r4qs2nwxnkd6qmx02lj1xgsc5wkkm0gxl2lgz0ll'';
     };
     sprockets_2_1_2 = {
       basename = ''sprockets'';

pkgs/development/libraries/apr-util/default.nix

@@ -6,11 +6,11 @@
 assert bdbSupport -> db4 != null;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.3.12";
+  name = "apr-util-1.4.1";
   
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "0f671b037ca62751a8a7005578085560";
+    md5 = "52b31b33fb1aa16e65ddaefc76e41151";
   };
   
   configureFlags = ''

pkgs/development/libraries/apr/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.4.5";
+  name = "apr-1.4.6";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "8b53f5a5669d0597f2da889a2f576eb6";
+    md5 = "ffee70a111fd07372982b0550bbb14b7";
   };
 
   configureFlags =

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

@@ -1,5 +1,5 @@
-{ cabal, alex, binary, happy, hashable, hashtables, haskeline
+{ cabal, alex, binary, filepath, happy, hashable, hashtables
-, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
+, haskeline, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary hashable hashtables haskeline haskellSrcExts mtl QuickCheck
+    binary filepath hashable hashtables haskeline haskellSrcExts mtl
-    syb xhtml zlib
+    QuickCheck syb xhtml zlib
   ];
   buildTools = [ alex happy ];
   meta = {

pkgs/development/libraries/haskell/Cabal/1.14.0.nix

@@ -0,0 +1,18 @@
+{ cabal, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "Cabal";
+  version = "1.14.0";
+  sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j";
+  buildDepends = [ filepath ];
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "A framework for packaging Haskell software";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -1,5 +1,5 @@
-{ cabal, deepseq, mtl, parsec, syb, sybWithClass, text, time
+{ cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass, text
-, utf8String
+, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.6.8";
   sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr";
   buildDepends = [
-    deepseq mtl parsec syb sybWithClass text time utf8String
+    deepseq filepath mtl parsec syb sybWithClass text time utf8String
   ];
   meta = {
     description = "StringTemplate implementation in Haskell";

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

@@ -1,4 +1,4 @@
-{ cabal, polyparse, random }:
+{ cabal, filepath, polyparse, random }:
 
 cabal.mkDerivation (self: {
   pname = "HaXml";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ polyparse random ];
+  buildDepends = [ filepath polyparse random ];
   meta = {
     homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
     description = "Utilities for manipulating XML documents";

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

@@ -1,4 +1,4 @@
-{ cabal, mtl, parsec, syb, WebBits, WebBitsHtml }:
+{ cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }:
 
 cabal.mkDerivation (self: {
   pname = "JsContracts";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl parsec syb WebBits WebBitsHtml ];
+  buildDepends = [ filepath mtl parsec syb WebBits WebBitsHtml ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "Design-by-contract for JavaScript";

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

@@ -1,4 +1,5 @@
-{ cabal, hslogger, HUnit, mtl, network, parsec, random, regexCompat
+{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
+, regexCompat
 }:
 
 cabal.mkDerivation (self: {
@@ -8,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    hslogger HUnit mtl network parsec random regexCompat
+    filepath hslogger HUnit mtl network parsec random regexCompat
   ];
   meta = {
     homepage = "http://software.complete.org/missingh";

pkgs/development/libraries/haskell/aeson-native/default.nix

@@ -1,23 +0,0 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextualNative, deepseq
-, hashable, mtl, syb, text, time, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson-native";
-  version = "0.3.3.2";
-  sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
-  buildDepends = [
-    attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb
-    text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "http://github.com/mailrank/aeson";
-    description = "Fast JSON parsing and encoding (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

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

@@ -0,0 +1,20 @@
+{ cabal, liftedBase, monadControl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "alternative-io";
+  version = "0.0.0";
+  sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y";
+  buildDepends = [
+    liftedBase monadControl transformers transformersBase
+  ];
+  meta = {
+    description = "IO as Alternative instance";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "bitmap";
-  version = "0.0.1";
+  version = "0.0.2";
-  sha256 = "281ad4d9234349cfd14f91977b48e2d1861c037f4b6562aa138cddd25c801a7e";
+  sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
   meta = {
     homepage = "http://code.haskell.org/~bkomuves/";
-    description = "A library for handling and manipulating bitmaps";
+    description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

pkgs/development/libraries/haskell/blaze-textual-native/default.nix

@@ -1,18 +0,0 @@
-{ cabal, blazeBuilder, text, time, vector }:
-
-cabal.mkDerivation (self: {
-  pname = "blaze-textual-native";
-  version = "0.2.1.1";
-  sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd";
-  buildDepends = [ blazeBuilder text time vector ];
-  meta = {
-    homepage = "http://github.com/mailrank/blaze-textual";
-    description = "Fast rendering of common datatypes (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

pkgs/development/libraries/haskell/cabal/cabal.nix

@@ -1,6 +1,6 @@
 # generic builder for Cabal packages
 
-{stdenv, fetchurl, lib, pkgconfig, ghc, enableLibraryProfiling ? false} :
+{stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, enableLibraryProfiling ? false} :
 {
   mkDerivation =
     args : # arguments for the individual package, can modify the defaults
@@ -51,7 +51,7 @@
             # default buildInputs are just ghc, if more buildInputs are required
             # buildInputs can be extended by the client by using extraBuildInputs,
             # but often propagatedBuildInputs is preferable anyway
-            buildInputs = [ghc] ++ self.extraBuildInputs;
+            buildInputs = [ghc Cabal] ++ self.extraBuildInputs;
             extraBuildInputs = self.buildTools ++
                                (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++
                                (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends);

pkgs/development/libraries/haskell/cautious-file/default.nix

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "cautious-file";
   version = "1.0";
   sha256 = "1s2la91vk9c99bj0ipzc4r6w81rcs4jfmn0xr1cgjab00bzj880q";
+  buildDepends = [ filepath ];
   meta = {
     description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -1,5 +1,5 @@
-{ cabal, hsBibutils, HTTP, json, mtl, network, pandocTypes, parsec
+{ cabal, filepath, hsBibutils, HTTP, json, mtl, network
-, syb, time, utf8String, xml
+, pandocTypes, parsec, syb, time, utf8String, xml
 }:
 
 cabal.mkDerivation (self: {
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.3.4";
   sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv";
   buildDepends = [
-    hsBibutils HTTP json mtl network pandocTypes parsec syb time
+    filepath hsBibutils HTTP json mtl network pandocTypes parsec syb
-    utf8String xml
+    time utf8String xml
   ];
   meta = {
     homepage = "http://gorgias.mine.nu/repos/citeproc-hs/";

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

@@ -1,4 +1,4 @@
-{ cabal, transformers }:
+{ cabal, filepath, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ transformers ];
+  buildDepends = [ filepath transformers ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/cmdargs/";
     description = "Command line argument processing";

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

@@ -1,4 +1,4 @@
-{ cabal, aeson, deepseq, hastache, mtl, mwcRandom, parsec
+{ cabal, aeson, deepseq, filepath, hastache, mtl, mwcRandom, parsec
 , statistics, time, transformers, vector, vectorAlgorithms
 }:
 
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.6.0.1";
   sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a";
   buildDepends = [
-    aeson deepseq hastache mtl mwcRandom parsec statistics time
+    aeson deepseq filepath hastache mtl mwcRandom parsec statistics
-    transformers vector vectorAlgorithms
+    time transformers vector vectorAlgorithms
   ];
   meta = {
     homepage = "https://github.com/bos/criterion";

pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey-types";
-  version = "0.1.0";
+  version = "0.1.1";
-  sha256 = "1ib5bqxydvv37l53wl6b4j6m6y904rsiamhh144lm6rmqiym26f5";
+  sha256 = "0chlz01nlxnh9bk5b97vm6q6ai0ifybkdaynwibj8px418mmbkib";
   buildDepends = [ cryptoApi ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";

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

@@ -1,10 +1,10 @@
-{ cabal, parsec }:
+{ cabal, filepath, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "csv";
   version = "0.1.2";
   sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
-  buildDepends = [ parsec ];
+  buildDepends = [ filepath parsec ];
   meta = {
     description = "CSV loader and dumper";
     license = self.stdenv.lib.licenses.mit;

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

@@ -1,4 +1,4 @@
-{ cabal, haskellSrcExts, syb, transformers, uniplate }:
+{ cabal, filepath, haskellSrcExts, syb, transformers, uniplate }:
 
 cabal.mkDerivation (self: {
   pname = "derive";
@@ -6,7 +6,9 @@ cabal.mkDerivation (self: {
   sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ haskellSrcExts syb transformers uniplate ];
+  buildDepends = [
+    filepath haskellSrcExts syb transformers uniplate
+  ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/derive/";
     description = "A program and library to derive instances for data types";

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

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "directory-tree";
   version = "0.10.0";
   sha256 = "08b0w9j55x6c06pri7yvv84n24inhpb4miybdnkyjkjy7r3yy7m4";
+  buildDepends = [ filepath ];
   meta = {
     homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/";
     description = "A simple directory-like tree datatype, with useful IO functions";

pkgs/development/libraries/haskell/fast-logger/default.nix

@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder }:
+{ cabal, blazeBuilder, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
   version = "0.0.2";
   sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7";
-  buildDepends = [ blazeBuilder ];
+  buildDepends = [ blazeBuilder filepath ];
   meta = {
     description = "A fast logging system";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -1,10 +1,10 @@
-{ cabal, Diff, parsec, split, time, utf8String, xml }:
+{ cabal, Diff, filepath, parsec, split, time, utf8String, xml }:
 
 cabal.mkDerivation (self: {
   pname = "filestore";
   version = "0.4.0.4";
   sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx";
-  buildDepends = [ Diff parsec split time utf8String xml ];
+  buildDepends = [ Diff filepath parsec split time utf8String xml ];
   meta = {
     homepage = "http://johnmacfarlane.net/repos/filestore";
     description = "Interface for versioning file stores";

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

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "funcmp";
   version = "1.5";
   sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e";
+  buildDepends = [ filepath ];
   meta = {
     homepage = "http://savannah.nongnu.org/projects/funcmp/";
     description = "Functional MetaPost";

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

@@ -1,4 +1,4 @@
-{ cabal, colorizeHaskell, pcreLight }:
+{ cabal, colorizeHaskell, filepath, pcreLight }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-core";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1s68m2zkpz0n927rgzg0l0r5v8pk3z03rlkd82h83agw0hzb9ng7";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ colorizeHaskell pcreLight ];
+  buildDepends = [ colorizeHaskell filepath pcreLight ];
   meta = {
     homepage = "http://code.haskell.org/~dons/code/ghc-core";
     description = "Display GHC's core and assembly output in a pager";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.0.8";
+  version = "1.10.5";
-  sha256 = "1c1236a8829418cae3039c3479875104664827c661b8c7567dd7bdbda12e8bcc";
+  sha256 = "0hbimrrlasa2rkmdz9d4fcyk70fynmwx0zqyl470hrwz8d8v73rc";
   buildDepends = [
     attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
   ];

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

@@ -1,4 +1,4 @@
-{ cabal, cgi, ConfigFile, feed, filestore, ghcPaths
+{ cabal, cgi, ConfigFile, feed, filepath, filestore, ghcPaths
 , happstackServer, happstackUtil, highlightingKate, hslogger
 , HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
 , parsec, random, recaptcha, safe, SHA, syb, text, time, url
@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cgi ConfigFile feed filestore ghcPaths happstackServer
+    cgi ConfigFile feed filepath filestore ghcPaths happstackServer
     happstackUtil highlightingKate hslogger HStringTemplate HTTP json
     mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb
     text time url utf8String xhtml xml xssSanitize zlib

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

@@ -1,5 +1,5 @@
-{ cabal, colour, dlist, extensibleExceptions, fgl, polyparse, text
+{ cabal, colour, dlist, extensibleExceptions, fgl, filepath
-, transformers, wlPprintText
+, polyparse, text, transformers, wlPprintText
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    colour dlist extensibleExceptions fgl polyparse text transformers
+    colour dlist extensibleExceptions fgl filepath polyparse text
-    wlPprintText
+    transformers wlPprintText
   ];
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";

pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix

@@ -1,4 +1,4 @@
-{ cabal, alex, happy, random }:
+{ cabal, alex, filepath, happy, random }:
 
 cabal.mkDerivation (self: {
   pname = "gtk2hs-buildtools";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ random ];
+  buildDepends = [ filepath random ];
   buildTools = [ alex happy ];
   meta = {
     homepage = "http://projects.haskell.org/gtk2hs/";

pkgs/development/libraries/haskell/hackage-db/default.nix

@@ -1,10 +1,10 @@
-{ cabal, tar }:
+{ cabal, Cabal, filepath, tar }:
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.2";
+  version = "1.3";
-  sha256 = "1dsm8mp8f6z7jqqgx39xfvl5kql6bbwxk25k435rsb685q9hzpxq";
+  sha256 = "17l2aw2kzjpjzyrg0c5vlaglx0vl475g3wxwavvzrd60z9lb3cp9";
-  buildDepends = [ tar ];
+  buildDepends = [ Cabal filepath tar ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";
     description = "provide access to the Hackage database via Data.Map";

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

@@ -1,15 +1,15 @@
-{ cabal, binary, blazeHtml, citeprocHs, cryptohash, hamlet, mtl
+{ cabal, binary, blazeHtml, citeprocHs, cryptohash, filepath
-, pandoc, parsec, regexBase, regexPcre, snapCore, snapServer
+, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa, snapCore
-, tagsoup, time
+, snapServer, tagsoup, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.6.0";
+  version = "3.2.6.1";
-  sha256 = "1yg97kihfxb250vk9dm2v9sh197lc6qjil0j40zgcwpss96xynax";
+  sha256 = "0chpg04rsp8lxzdj43wqs3wyc7i70hfi3raxdar6bhwxhfxgj4wn";
   buildDepends = [
-    binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
+    binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
-    regexBase regexPcre snapCore snapServer tagsoup time
+    parsec regexBase regexTdfa snapCore snapServer tagsoup time
   ];
   meta = {
     homepage = "http://jaspervdj.be/hakyll";

pkgs/development/libraries/haskell/happstack/happstack-server.nix

@@ -1,4 +1,4 @@
-{ cabal, blazeHtml, extensibleExceptions, happstackData
+{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData
 , happstackUtil, hslogger, html, MaybeT, mtl, network, parsec
 , sendfile, syb, text, time, utf8String, xhtml, zlib
 }:
@@ -10,9 +10,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml extensibleExceptions happstackData happstackUtil hslogger
+    blazeHtml extensibleExceptions filepath happstackData happstackUtil
-    html MaybeT mtl network parsec sendfile syb text time utf8String
+    hslogger html MaybeT mtl network parsec sendfile syb text time
-    xhtml zlib
+    utf8String xhtml zlib
   ];
   meta = {
     homepage = "http://happstack.com";

pkgs/development/libraries/haskell/happstack/happstack-util.nix

@@ -1,5 +1,5 @@
-{ cabal, extensibleExceptions, hslogger, mtl, network, parsec
+{ cabal, extensibleExceptions, filepath, hslogger, mtl, network
-, random, time, unixCompat
+, parsec, random, time, unixCompat
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    extensibleExceptions hslogger mtl network parsec random time
+    extensibleExceptions filepath hslogger mtl network parsec random
-    unixCompat
+    time unixCompat
   ];
   meta = {
     homepage = "http://happstack.com";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashable";
-  version = "1.1.2.2";
+  version = "1.1.2.3";
-  sha256 = "0gfg1cyd468czfv5xfhn7rz0r5s0v378c4xjlm6kkw7n10n2zg8y";
+  sha256 = "19v94b34c2j6f9d9xii2hg0mjxdkq51aifkcqw6hbicn97kfcxls";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/tibbe/hashable";

pkgs/development/libraries/haskell/hashed-storage/default.nix

@@ -1,4 +1,6 @@
-{ cabal, binary, dataenc, extensibleExceptions, mmap, mtl, zlib }:
+{ cabal, binary, dataenc, extensibleExceptions, filepath, mmap, mtl
+, zlib
+}:
 
 cabal.mkDerivation (self: {
   pname = "hashed-storage";
@@ -7,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary dataenc extensibleExceptions mmap mtl zlib
+    binary dataenc extensibleExceptions filepath mmap mtl zlib
   ];
   meta = {
     description = "Hashed file storage support code";

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

@@ -1,10 +1,13 @@
-{ cabal, extensibleExceptions, mtl, terminfo, utf8String }:
+{ cabal, extensibleExceptions, filepath, mtl, terminfo, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "haskeline";
   version = "0.6.4.6";
   sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj";
-  buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
+  buildDepends = [
+    extensibleExceptions filepath mtl terminfo utf8String
+  ];
   meta = {
     homepage = "http://trac.haskell.org/haskeline";
     description = "A command-line interface for user input, written in Haskell";

pkgs/development/libraries/haskell/haskell-src-meta/default.nix

@@ -1,10 +1,10 @@
-{ cabal, haskellSrcExts, syb, thLift }:
+{ cabal, haskellSrcExts, syb, thLift, uniplate }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.5.0.3";
+  version = "0.5.1";
-  sha256 = "0c270088b5p3drr3f75ln210py2h4dfkkfgvly3ry42yl6xkvm2j";
+  sha256 = "1wpddllq651vnsibhi0m7agc6ygj95646k29v0xl75nmfb034lz3";
-  buildDepends = [ haskellSrcExts syb thLift ];
+  buildDepends = [ haskellSrcExts syb thLift uniplate ];
   meta = {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -1,10 +1,14 @@
-{ cabal, blazeBuilder, ieee754, mtl, syb, text, utf8String }:
+{ cabal, blazeBuilder, filepath, ieee754, mtl, syb, text
+, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "hastache";
   version = "0.3.3";
   sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772";
-  buildDepends = [ blazeBuilder ieee754 mtl syb text utf8String ];
+  buildDepends = [
+    blazeBuilder filepath ieee754 mtl syb text utf8String
+  ];
   meta = {
     homepage = "http://github.com/lymar/hastache";
     description = "Haskell implementation of Mustache templates";

pkgs/development/libraries/haskell/highlighting-kate/default.nix

@@ -1,12 +1,12 @@
-{ cabal, blazeHtml, mtl, parsec, regexPcreBuiltin }:
+{ cabal, blazeHtml, filepath, mtl, parsec, regexPcreBuiltin }:
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.0.4";
+  version = "0.5.0.5";
-  sha256 = "1kn73gcjhndb5wbdy9hbjgar1bdcmy8cy831ib4ik1fn62zmvxrf";
+  sha256 = "005k3yc406h4wz5jk47nk4g5qb409kd7dwyw7n9g31gjqxp73p8v";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ];
+  buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];
   meta = {
     homepage = "http://github.com/jgm/highlighting-kate";
     description = "Syntax highlighting";

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

@@ -1,5 +1,5 @@
-{ cabal, extensibleExceptions, ghcMtl, ghcPaths, haskellSrc
+{ cabal, extensibleExceptions, filepath, ghcMtl, ghcPaths
-, MonadCatchIOMtl, mtl, random, utf8String
+, haskellSrc, MonadCatchIOMtl, mtl, random, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.3.3.4";
   sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy";
   buildDepends = [
-    extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl
+    extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
-    random utf8String
+    MonadCatchIOMtl mtl random utf8String
   ];
   meta = {
     homepage = "http://darcsden.com/jcpetruzza/hint";

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

@@ -1,5 +1,5 @@
-{ cabal, cmdargs, HUnit, mtl, parsec, regexpr, safe, split, time
+{ cabal, cmdargs, filepath, HUnit, mtl, parsec, regexpr, safe
-, utf8String
+, split, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.17";
   sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4";
   buildDepends = [
-    cmdargs HUnit mtl parsec regexpr safe split time utf8String
+    cmdargs filepath HUnit mtl parsec regexpr safe split time
+    utf8String
   ];
   meta = {
     homepage = "http://hledger.org";

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

@@ -1,6 +1,6 @@
 { cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
-, dataObject, dataObjectYaml, failure, fileEmbed, hamlet, hledger
+, dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet
-, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
+, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
 , shakespeareCss, shakespeareJs, shakespeareText, text, time
 , transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
 , yesodJson, yesodStatic
@@ -14,8 +14,8 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
-    dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
+    dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib
-    ioStorage parsec regexpr safe shakespeareCss shakespeareJs
+    HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs
     shakespeareText text time transformers wai waiExtra warp yesod
     yesodCore yesodForm yesodJson yesodStatic
   ];

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

@@ -1,5 +1,5 @@
-{ cabal, cabalFileTh, cmdargs, csv, haskeline, hledgerLib, HUnit
+{ cabal, cabalFileTh, cmdargs, csv, filepath, haskeline, hledgerLib
-, mtl, parsec, regexpr, safe, split, time, utf8String
+, HUnit, mtl, parsec, regexpr, safe, split, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cabalFileTh cmdargs csv haskeline hledgerLib HUnit mtl parsec
+    cabalFileTh cmdargs csv filepath haskeline hledgerLib HUnit mtl
-    regexpr safe split time utf8String
+    parsec regexpr safe split time utf8String
   ];
   meta = {
     homepage = "http://hledger.org";

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

@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp";
   buildDepends = [ binary storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
-  configureFlags = "-fvector";
   meta = {
     homepage = "http://perception.inf.um.es/hmatrix";
     description = "Linear algebra and numerical computation";

pkgs/development/libraries/haskell/hp2any-core/default.nix

@@ -1,10 +1,10 @@
-{ cabal, attoparsec, network, time }:
+{ cabal, attoparsec, filepath, network, time }:
 
 cabal.mkDerivation (self: {
   pname = "hp2any-core";
   version = "0.11.1";
   sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546";
-  buildDepends = [ attoparsec network time ];
+  buildDepends = [ attoparsec filepath network time ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Hp2any";
     description = "Heap profiling helper library";

pkgs/development/libraries/haskell/hp2any-graph/default.nix

@@ -1,5 +1,5 @@
-{ cabal, freeglut, GLUT, hp2anyCore, mesa, network, OpenGL
+{ cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network
-, parseargs
+, OpenGL, parseargs
 }:
 
 cabal.mkDerivation (self: {
@@ -8,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1al20pxfgkgwynrx7vr0i57342s91lcm3cnd9qjx8b6vkqmzykkq";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ];
+  buildDepends = [
+    filepath GLUT hp2anyCore network OpenGL parseargs
+  ];
   extraLibraries = [ freeglut mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Hp2any";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.6.8";
+  version = "0.6.9";
-  sha256 = "0amjpn93wc7jhfy1n69mhiryi2yy40k5388ap3iwqi79mblkjf31";
+  sha256 = "1dkp2iqqalrm381vagw65bhjnm80hv02h28447lmjl2j60b4mby0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeBuilder caseInsensitive text ];

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

@@ -1,4 +1,4 @@
-{ cabal, binary, deepseq, HUnit, hxtCharproperties
+{ cabal, binary, deepseq, filepath, HUnit, hxtCharproperties
 , hxtRegexXmlschema, hxtUnicode, mtl, network, parsec
 }:
 
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "9.2.0";
   sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc";
   buildDepends = [
-    binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode
+    binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
-    mtl network parsec
+    hxtUnicode mtl network parsec
   ];
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";

pkgs/development/libraries/haskell/language-javascript/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.4.7";
+  version = "0.4.9";
-  sha256 = "029ncc7hdw3pi9fbnxd0knz7wy3jpj5wcfqsxzyk5dkwji6d95x1";
+  sha256 = "19a8c8bq4s533iyb6h3vl59dnya6d7inaqk1hbhnlil1w2d0n5b5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl utf8Light ];

pkgs/development/libraries/haskell/leksah/leksah-server.nix

@@ -1,5 +1,5 @@
-{ cabal, binary, binaryShared, deepseq, haddock, hslogger, ltk, mtl
+{ cabal, binary, binaryShared, Cabal, deepseq, filepath, haddock
-, network, parsec, processLeksah, time
+, hslogger, ltk, mtl, network, parsec, processLeksah, time
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary binaryShared deepseq haddock hslogger ltk mtl network parsec
+    binary binaryShared Cabal deepseq filepath haddock hslogger ltk mtl
-    processLeksah time
+    network parsec processLeksah time
   ];
   meta = {
     homepage = "http://leksah.org";

pkgs/development/libraries/haskell/leksah/process-leksah.nix

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "process-leksah";
   version = "1.0.1.4";
   sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
+  buildDepends = [ filepath ];
   meta = {
     description = "Process libraries";
     license = self.stdenv.lib.licenses.bsd3;

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

@@ -1,12 +1,12 @@
-{ cabal, mtl, network, time, utf8String }:
+{ cabal, filepath, mtl, network, time, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "libmpd";
-  version = "0.7.1";
+  version = "0.7.2";
-  sha256 = "1vahcr1vjpr1wfkifp8ih3fajz1886zhc3cj643f7s3im7wjzw5j";
+  sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl network time utf8String ];
+  buildDepends = [ filepath mtl network time utf8String ];
   meta = {
     homepage = "http://github.com/joachifm/libmpd-haskell";
     description = "An MPD client library";

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

@@ -1,10 +1,10 @@
-{ cabal, glib, gtk, haddock, mtl, parsec }:
+{ cabal, Cabal, filepath, glib, gtk, haddock, mtl, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "ltk";
   version = "0.10.0.4";
   sha256 = "1dp6dl8a0pfj6lx8n8a2y1j3c2z57k9pf81yr45qsp7wg53d6qhf";
-  buildDepends = [ glib gtk haddock mtl parsec ];
+  buildDepends = [ Cabal filepath glib gtk haddock mtl parsec ];
   meta = {
     homepage = "http://www.leksah.org";
     description = "Leksah tool kit";

pkgs/development/libraries/haskell/mime-mail/default.nix

@@ -1,10 +1,12 @@
-{ cabal, base64Bytestring, blazeBuilder, random, text }:
+{ cabal, base64Bytestring, blazeBuilder, filepath, random, text }:
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
   version = "0.4.1.1";
   sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4";
-  buildDepends = [ base64Bytestring blazeBuilder random text ];
+  buildDepends = [
+    base64Bytestring blazeBuilder filepath random text
+  ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";

pkgs/development/libraries/haskell/network/2.3.0.11.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.3.0.10";
+  version = "2.3.0.11";
-  sha256 = "1f1z7wggxl2rzix1r4bhvcdl0fmx2mzkn70iy3w5yl54vmym21bm";
+  sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk";
   buildDepends = [ parsec ];
   meta = {
     homepage = "http://github.com/haskell/network";

pkgs/development/libraries/haskell/network/2.3.0.8.nix

@@ -1,18 +0,0 @@
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.8";
-  sha256 = "10y7spi1qwjmq7mz7h09ijrzq0jl4r02jrgxiqavsiw6j35r4yfv";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

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

@@ -1,18 +0,0 @@
-{ cabal, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "nixos-types";
-  version = "1.3";
-  sha256 = "0kdi3q316c9irrzwl1vx764f958i5d61v2vc03356sfyy13d19sk";
-  buildDepends = [ regexPosix ];
-  meta = {
-    homepage = "http://github.com/haskell4nix/nixos-types";
-    description = "Data types representing the Nix language";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

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

@@ -1,7 +1,7 @@
 { cabal, base64Bytestring, blazeHtml, citeprocHs
-, extensibleExceptions, highlightingKate, HTTP, json, mtl, network
+, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl
-, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath
+, network, pandocTypes, parsec, random, syb, tagsoup, temporary
-, time, utf8String, xml, zipArchive, zlib
+, texmath, time, utf8String, xml, zipArchive, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -11,11 +11,10 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    base64Bytestring blazeHtml citeprocHs extensibleExceptions
+    base64Bytestring blazeHtml citeprocHs extensibleExceptions filepath
     highlightingKate HTTP json mtl network pandocTypes parsec random
     syb tagsoup temporary texmath time utf8String xml zipArchive zlib
   ];
-  configureFlags = "-fhighlighting -fthreaded";
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
     description = "Conversion between markup formats";

pkgs/development/libraries/haskell/shakespeare-i18n/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "0.0.1";
+  version = "0.0.2";
-  sha256 = "0hnjrds4vhqyd7pda8rciz50kspf01880j93qn6xx610hbqsal3m";
+  sha256 = "1hb144n3fa5qiy3skrmab0qv63fa5vf4vg4ar9hrybmwdksqa410";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/i18n";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.0";
+  version = "0.2.1";
-  sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264";
+  sha256 = "0mbnqdy7g9jp2d6x9mcrz315b4xhp92as28bxygf7jhc0aai66aq";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";

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

@@ -1,9 +1,9 @@
 { cabal, attoparsec, attoparsecEnumerator, base16Bytestring
 , blazeBuilder, blazeBuilderEnumerator, bytestringMmap
 , bytestringNums, caseInsensitive, deepseq, dlist, enumerator
-, HUnit, MonadCatchIOTransformers, mtl, mwcRandom, regexPosix, text
+, filepath, HUnit, MonadCatchIOTransformers, mtl, mwcRandom
-, time, transformers, unixCompat, unorderedContainers, vector
+, regexPosix, text, time, transformers, unixCompat
-, zlibEnum
+, unorderedContainers, vector, zlibEnum
 }:
 
 cabal.mkDerivation (self: {
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
     blazeBuilderEnumerator bytestringMmap bytestringNums
-    caseInsensitive deepseq dlist enumerator HUnit
+    caseInsensitive deepseq dlist enumerator filepath HUnit
     MonadCatchIOTransformers mtl mwcRandom regexPosix text time
     transformers unixCompat unorderedContainers vector zlibEnum
   ];

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

@@ -1,8 +1,8 @@
 { cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder
 , blazeBuilderEnumerator, bytestringNums, caseInsensitive
-, directoryTree, enumerator, MonadCatchIOTransformers, mtl
+, directoryTree, enumerator, filepath, MonadCatchIOTransformers
-, murmurHash, network, PSQueue, snapCore, text, time, transformers
+, mtl, murmurHash, network, PSQueue, snapCore, text, time
-, unixCompat, vector, vectorAlgorithms
+, transformers, unixCompat, vector, vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
@@ -12,8 +12,9 @@ cabal.mkDerivation (self: {
   buildDepends = [
     attoparsec attoparsecEnumerator binary blazeBuilder
     blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
-    enumerator MonadCatchIOTransformers mtl murmurHash network PSQueue
+    enumerator filepath MonadCatchIOTransformers mtl murmurHash network
-    snapCore text time transformers unixCompat vector vectorAlgorithms
+    PSQueue snapCore text time transformers unixCompat vector
+    vectorAlgorithms
   ];
   meta = {
     homepage = "http://snapframework.com/";

pkgs/development/libraries/haskell/stb-image/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stb-image";
-  version = "0.2";
+  version = "0.2.1";
-  sha256 = "7d027b6de52d07bbe439a84897aaa6e26a8f05c6fa6f4aeaa3060be23ae11937";
+  sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
   buildDepends = [ bitmap ];
   meta = {
     homepage = "http://code.haskell.org/~bkomuves/";

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

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "temporary";
   version = "1.1.2.3";
   sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd";
+  buildDepends = [ filepath ];
   meta = {
     homepage = "http://www.github.com/batterseapower/temporary";
     description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uniplate";
-  version = "1.6.5";
+  version = "1.6.6";
-  sha256 = "1g29jbh2clxp87p8qjihgjgi8hdqgzray34bg6hv7whsy053apqs";
+  sha256 = "1n3535yaw44v0krslnmfxgkfry6kih6sn17544qqynnz21x7dlfs";
   buildDepends = [ hashable syb unorderedContainers ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/uniplate/";

pkgs/development/libraries/haskell/wai-logger/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-logger";
-  version = "0.1.3";
+  version = "0.1.4";
-  sha256 = "0h9m2vnm81q1zdj0gv3d9vzd2mlm1343div591695fq52ks26cfc";
+  sha256 = "1rvcqq4jlkcjavy8a3vf61jclwpnjmj6cp3whrzwvay9b1qfsck3";
   buildDepends = [
     blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
     time wai

pkgs/development/libraries/haskell/wxHaskell/wxcore.nix

@@ -1,10 +1,11 @@
-{ cabal, libX11, mesa, parsec, stm, time, wxdirect, wxGTK }:
+{ cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect, wxGTK
+}:
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
   version = "0.13.2.1";
   sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6";
-  buildDepends = [ parsec stm time wxdirect ];
+  buildDepends = [ filepath parsec stm time wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";

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

@@ -1,8 +1,8 @@
-{ cabal, attoparsec, blazeBuilder, blazeHtml, fastLogger, hamlet
+{ cabal, attoparsec, blazeBuilder, blazeHtml, Cabal, fastLogger
-, httpTypes, monadControl, parsec, shakespeareCss, shakespeareJs
+, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss
-, shakespeareText, text, time, transformers, unixCompat, wai
+, shakespeareJs, shakespeareText, text, time, transformers
-, waiExtra, waiLogger, warp, yesodAuth, yesodCore, yesodForm
+, unixCompat, wai, waiExtra, waiLogger, warp, yesodAuth, yesodCore
-, yesodJson, yesodPersistent
+, yesodForm, yesodJson, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
@@ -12,10 +12,11 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec blazeBuilder blazeHtml fastLogger hamlet httpTypes
+    attoparsec blazeBuilder blazeHtml Cabal fastLogger filepath hamlet
-    monadControl parsec shakespeareCss shakespeareJs shakespeareText
+    httpTypes monadControl parsec shakespeareCss shakespeareJs
-    text time transformers unixCompat wai waiExtra waiLogger warp
+    shakespeareText text time transformers unixCompat wai waiExtra
-    yesodAuth yesodCore yesodForm yesodJson yesodPersistent
+    waiLogger warp yesodAuth yesodCore yesodForm yesodJson
+    yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

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

@@ -1,5 +1,5 @@
-{ cabal, csv, HsSyck, HStringTemplate, pandoc, parsec, split, time
+{ cabal, csv, filepath, HsSyck, HStringTemplate, pandoc, parsec
-, utf8String, xhtml
+, split, time, utf8String, xhtml
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    csv HsSyck HStringTemplate pandoc parsec split time utf8String
+    csv filepath HsSyck HStringTemplate pandoc parsec split time
-    xhtml
+    utf8String xhtml
   ];
   meta = {
     homepage = "http://github.com/jgm/yst";

pkgs/development/libraries/haskell/zip-archive/default.nix

@@ -1,4 +1,4 @@
-{ cabal, binary, digest, mtl, utf8String, zlib }:
+{ cabal, binary, digest, filepath, mtl, utf8String, zlib }:
 
 cabal.mkDerivation (self: {
   pname = "zip-archive";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary digest mtl utf8String zlib ];
+  buildDepends = [ binary digest filepath mtl utf8String zlib ];
   meta = {
     homepage = "http://github.com/jgm/zip-archive";
     description = "Library for creating and modifying zip archives";

pkgs/development/libraries/libffcall/default.nix

@@ -33,6 +33,6 @@ rec {
 
   name = "libffcall-" + version;
   meta = {
-    description = "Foreign fuction call library";
+    description = "Foreign function call library";
   };
 }

pkgs/development/tools/analysis/cppcheck/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+# TODO: add support for "make man"
+
+let
+  name = "cppcheck";
+  version = "1.53";
+in
+stdenv.mkDerivation {
+  name = "${name}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
+    sha256 = "878db83d3954d0c45135362308da951ec0670a160c76a7410466a9b539e8677f";
+  };
+
+  configurePhase = "makeFlags=PREFIX=$out";
+
+  meta = {
+    description = "check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun, etc.";
+    homepage = "http://sourceforge.net/apps/mediawiki/cppcheck/";
+    license = "GPL";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}

pkgs/development/tools/analysis/sparse/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "sparse-0.4.1";
+  name = "sparse-0.4.4";
 
   src = fetchurl {
     url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.gz";
-    sha256 = "18nkgqkqhfp4gdjhdy8xgwxvla5vjccg1kzyz5ngpjw35q0hp5fb";
+    sha256 = "5ad02110130fd8f8d82f2b030de5f2db6f924fd805593a5b8be8072a620414c6";
   };
 
   preConfigure = ''

pkgs/development/tools/documentation/haddock/2.4.2.nix

@@ -1,4 +1,4 @@
-{ cabal, alex, ghcPaths, happy }:
+{ cabal, alex, Cabal, filepath, ghcPaths, happy }:
 
 cabal.mkDerivation (self: {
   pname = "haddock";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ ghcPaths ];
+  buildDepends = [ Cabal filepath ghcPaths ];
   buildTools = [ alex happy ];
   meta = {
     homepage = "http://www.haskell.org/haddock/";

pkgs/development/tools/documentation/haddock/2.9.4.nix

@@ -1,4 +1,4 @@
-{ cabal, alex, ghcPaths, happy, xhtml }:
+{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }:
 
 cabal.mkDerivation (self: {
   pname = "haddock";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ ghcPaths xhtml ];
+  buildDepends = [ Cabal filepath ghcPaths xhtml ];
   buildTools = [ alex happy ];
   meta = {
     homepage = "http://www.haskell.org/haddock/";

pkgs/development/tools/haskell/HaRe/default.nix

@@ -1,4 +1,4 @@
-{ cabal, hint, mtl, network, syb }:
+{ cabal, filepath, hint, mtl, network, syb }:
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ hint mtl network syb ];
+  buildDepends = [ filepath hint mtl network syb ];
   meta = {
     homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp";
     description = "the Haskell Refactorer";

pkgs/development/tools/haskell/SourceGraph/default.nix

@@ -1,5 +1,5 @@
-{ cabal, extensibleExceptions, fgl, Graphalyze, graphviz
+{ cabal, Cabal, extensibleExceptions, fgl, filepath, Graphalyze
-, haskellSrcExts, mtl, multiset, random
+, graphviz, haskellSrcExts, mtl, multiset, random
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    extensibleExceptions fgl Graphalyze graphviz haskellSrcExts mtl
+    Cabal extensibleExceptions fgl filepath Graphalyze graphviz
-    multiset random
+    haskellSrcExts mtl multiset random
   ];
   meta = {
     description = "Static code analysis using graph-theoretic techniques";

pkgs/development/tools/haskell/cabal-ghci/default.nix

@@ -1,4 +1,4 @@
-{ cabal }:
+{ cabal, Cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-ghci";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r";
   isLibrary = true;
   isExecutable = true;
+  buildDepends = [ Cabal filepath ];
   meta = {
     homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki";
     description = "Set up ghci with options taken from a .cabal file";

pkgs/development/tools/haskell/cabal2nix/default.nix

@@ -1,12 +1,12 @@
-{ cabal, hackageDb, HTTP, mtl, nixosTypes, regexPosix }:
+{ cabal, Cabal, filepath, hackageDb, HTTP, mtl, regexPosix }:
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.25";
+  version = "1.26";
-  sha256 = "12csiw7j51vlf8l0prhjj06l7sqii12qy5ryl5n8vrgp8vch2kvl";
+  sha256 = "18gl75y1grhzyhlaz32800gxxfrcl01r7cpx1c63lzpwmdxvk01d";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];
+  buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
   meta = {
     homepage = "http://github.com/haskell4nix/cabal2nix";
     description = "Convert Cabal files into Nix build instructions";

pkgs/development/tools/haskell/hlint/default.nix

@@ -1,4 +1,6 @@
-{ cabal, cpphs, haskellSrcExts, hscolour, transformers, uniplate }:
+{ cabal, cpphs, filepath, haskellSrcExts, hscolour, transformers
+, uniplate
+}:
 
 cabal.mkDerivation (self: {
   pname = "hlint";
@@ -7,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cpphs haskellSrcExts hscolour transformers uniplate
+    cpphs filepath haskellSrcExts hscolour transformers uniplate
   ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/hlint/";

pkgs/development/tools/haskell/tar/0.3.2.0.nix

@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, filepath }:
 
 cabal.mkDerivation (self: {
   pname = "tar";
   version = "0.3.2.0";
   sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9";
+  buildDepends = [ filepath ];
   meta = {
     description = "Reading, writing and manipulating \".tar\" archive files.";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/tools/haskell/tar/0.4.0.0.nix

@@ -0,0 +1,17 @@
+{ cabal, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "tar";
+  version = "0.4.0.0";
+  sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3";
+  buildDepends = [ filepath ];
+  meta = {
+    description = "Reading, writing and manipulating \".tar\" archive files.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/tools/haskell/threadscope/default.nix

@@ -1,5 +1,5 @@
-{ cabal, binary, cairo, deepseq, ghcEvents, glib, gtk, mtl, pango
+{ cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk
-, time
+, mtl, pango, time
 }:
 
 cabal.mkDerivation (self: {
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    binary cairo deepseq ghcEvents glib gtk mtl pango time
+    binary cairo deepseq filepath ghcEvents glib gtk mtl pango time
   ];
   configureFlags = "--ghc-options=-rtsopts";
   meta = {

pkgs/development/tools/haskell/uuagc/bootstrap.nix

@@ -1,4 +1,4 @@
-{ cabal, haskellSrcExts, mtl, uulib }:
+{ cabal, filepath, haskellSrcExts, mtl, uulib }:
 
 cabal.mkDerivation (self: {
   pname = "uuagc-bootstrap";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ haskellSrcExts mtl uulib ];
+  buildDepends = [ filepath haskellSrcExts mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
     description = "Attribute Grammar System of Universiteit Utrecht";

pkgs/development/tools/haskell/uuagc/cabal.nix

@@ -1,10 +1,10 @@
-{ cabal, mtl, uulib }:
+{ cabal, Cabal, filepath, mtl, uulib }:
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
   version = "1.0.2.0";
   sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0";
-  buildDepends = [ mtl uulib ];
+  buildDepends = [ Cabal filepath mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
     description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System";

pkgs/development/tools/haskell/uuagc/default.nix

@@ -1,4 +1,6 @@
-{ cabal, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal, uulib }:
+{ cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal
+, uulib
+}:
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
@@ -7,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib
+    filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib
   ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";

pkgs/games/LambdaHack/default.nix

@@ -1,4 +1,4 @@
-{ cabal, binary, ConfigFile, gtk, mtl, random, zlib }:
+{ cabal, binary, ConfigFile, filepath, gtk, mtl, random, zlib }:
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary ConfigFile gtk mtl random zlib ];
+  buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ];
   meta = {
     homepage = "http://github.com/kosmikus/LambdaHack";
     description = "A roguelike game engine in early and very active development";

pkgs/games/MazesOfMonad/default.nix

@@ -1,4 +1,4 @@
-{ cabal, HUnit, mtl, random, regexPosix, time }:
+{ cabal, filepath, HUnit, mtl, random, regexPosix, time }:
 
 cabal.mkDerivation (self: {
   pname = "MazesOfMonad";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1zk6bckll03b40iq8z13753glkmcan6439w8cc6rn5h2fhp189v9";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ HUnit mtl random regexPosix time ];
+  buildDepends = [ filepath HUnit mtl random regexPosix time ];
   meta = {
     description = "Console-based Role Playing Game";
     license = self.stdenv.lib.licenses.bsd3;