Merge branch 'master' into x-updates

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

@@ -1,12 +1,25 @@
-{ cabal, filepath, hint, mtl, network, syb }:
+{ cabal, cmdtheline, deepseq, Diff, filepath, ghcMod, ghcPaths
+, ghcSybUtils, hslogger, hspec, HUnit, mtl, parsec, QuickCheck
+, rosezipper, silently, StrafunskiStrategyLib, stringbuilder, syb
+, syz, time, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.6.0.2";
-  sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2";
-  isLibrary = false;
+  version = "0.7.0.1";
+  sha256 = "1ykbyc6p71k6rs85vcsjgk47cxd2lda3iw78jzs0fx43qr1dywnl";
+  isLibrary = true;
   isExecutable = true;
-  buildDepends = [ filepath hint mtl network syb ];
+  buildDepends = [
+    cmdtheline filepath ghcMod ghcPaths ghcSybUtils hslogger mtl parsec
+    rosezipper StrafunskiStrategyLib syb syz time transformers
+  ];
+  testDepends = [
+    deepseq Diff filepath ghcMod ghcPaths ghcSybUtils hslogger hspec
+    HUnit mtl QuickCheck rosezipper silently StrafunskiStrategyLib
+    stringbuilder syb syz time transformers
+  ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp";
     description = "the Haskell Refactorer";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslogger";
-  version = "1.2.2";
-  sha256 = "0j15nma6yf3cxb9j232kif1a836zmncfyklz9wp1mx064nblr5jf";
+  version = "1.2.3";
+  sha256 = "0rmijkrf24srcg8zgizf5vidpsgr4171wbzbwgrg66l704mkkb7m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl network time ];

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

@@ -1,18 +1,17 @@
-{ cabal, bytestringLexing, cairo, Chart, colour, dataAccessor
-, dataAccessorTemplate, regexTdfa, strptime, time, transformers
+{ cabal, bytestringLexing, cairo, Chart, ChartCairo, colour
+, dataDefault, lens, regexTdfa, strptime, time, transformers
 , vcsRevision
 }:
 
 cabal.mkDerivation (self: {
   pname = "timeplot";
-  version = "1.0.21";
-  sha256 = "0x9f95w235yijp98xx9nry0ibsxr0iyshk6cd89n51xrk1zpk41l";
+  version = "1.0.22";
+  sha256 = "1dp1prcx3d6a0fr3xrdj6flp27sy7qbng5bbdjgjbb7rq8497if9";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bytestringLexing cairo Chart colour dataAccessor
-    dataAccessorTemplate regexTdfa strptime time transformers
-    vcsRevision
+    bytestringLexing cairo Chart ChartCairo colour dataDefault lens
+    regexTdfa strptime time transformers vcsRevision
   ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Timeplot";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
-  version = "1.0.4.0";
-  sha256 = "0m6q8lfbrzcdxd923s175x0z1rnniv7gk08ninzpq16fisscr4lf";
+  version = "1.0.5.0";
+  sha256 = "0p3rc1gszd62wwzzqz0hmj6jdmwdnpx92rdf6mgd7w63ic1wdxj5";
   buildDepends = [ Cabal filepath mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.42.3";
-  sha256 = "0rn0wqccg2v4akh3wj16s5y60fscdfjpvrpsmvbc2vfq2v33y53n";
+  version = "0.9.50";
+  sha256 = "0vyydqgmyl590ry63ibwshfpj2w9dd2v0nmr4jqlfw0m0d9ff50j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];

pkgs/development/tools/misc/lttng-tools/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
 
 stdenv.mkDerivation rec {
-  name = "lttng-tools-2.2.3";
+  name = "lttng-tools-2.3.0";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv";
+    sha256 = "16j55xqrh00mjbcvdmdkfxchavi7jsxlpnfjqc1g1d3x65ss9wri";
   };
 
   buildInputs = [ popt libuuid liburcu lttngUst ];

pkgs/development/tools/misc/lttng-ust/default.nix

@@ -12,11 +12,11 @@
 # Debian builds with std.h (systemtap).
 
 stdenv.mkDerivation rec {
-  name = "lttng-ust-2.2.1";
+  name = "lttng-ust-2.3.0";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla";
+    sha256 = "1hazjybrppyaakvfp1bs92vx0n2sgcsw0m6i5hwq7xq8vij7cj4q";
   };
 
   buildInputs = [ liburcu ];

pkgs/development/tools/misc/uncrustify/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "uncrustify-0.60";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/uncrustify/${name}.tar.gz";
+    sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
+    homepage = http://uncrustify.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}