summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/haskell/HaRe/default.nix4
-rw-r--r--pkgs/development/tools/haskell/keter/default.nix28
-rw-r--r--pkgs/development/tools/haskell/splot/default.nix7
-rw-r--r--pkgs/development/tools/parsing/bison/3.x.nix4
4 files changed, 22 insertions, 21 deletions
diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index cb0ad759d55a..efdc65c389e6 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.0.1";
-  sha256 = "1ykbyc6p71k6rs85vcsjgk47cxd2lda3iw78jzs0fx43qr1dywnl";
+  version = "0.7.0.2";
+  sha256 = "05dlrx4wfadv798098bclkmsmm6f226n9rqp19ajdwaa11x5mf8d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index 7e8b3ea11ff5..4cb75151b001 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,23 +1,25 @@
-{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
-, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy
-, httpTypes, mtl, network, networkConduit, networkConduitTls
-, random, regexTdfa, systemFileio, systemFilepath, tar, text, time
-, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic
-, warp, warpTls, yaml, zlib
+{ cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
+, conduit, dataDefault, filepath, fsnotify, httpConduit
+, httpReverseProxy, httpTypes, mtl, network, networkConduit
+, networkConduitTls, random, regexTdfa, stm, systemFileio
+, systemFilepath, tar, text, time, transformers, unixCompat
+, unixProcessConduit, unorderedContainers, vector, wai
+, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "0.4.0";
-  sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv";
+  version = "1.0.1";
+  sha256 = "0ghgwp1winf0jj70jrwsk4b85f8m4v78n8kijhqghh4kskh457b5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec blazeBuilder caseInsensitive conduit dataDefault
-    filepath fsnotify httpConduit httpReverseProxy httpTypes mtl
-    network networkConduit networkConduitTls random regexTdfa
-    systemFileio systemFilepath tar text time transformers unixCompat
-    unixProcessConduit wai waiAppStatic warp warpTls yaml zlib
+    aeson async attoparsec blazeBuilder caseInsensitive conduit
+    dataDefault filepath fsnotify httpConduit httpReverseProxy
+    httpTypes mtl network networkConduit networkConduitTls random
+    regexTdfa stm systemFileio systemFilepath tar text time
+    transformers unixCompat unixProcessConduit unorderedContainers
+    vector wai waiAppStatic waiExtra warp warpTls yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 460dc3f8c432..4e99a1e68cdc 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -1,5 +1,5 @@
-{ cabal, bytestringLexing, cairo, colour, HUnit, mtl
-, strptime, time, vcsRevision
+{ cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime
+, time, vcsRevision
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bytestringLexing cairo colour HUnit mtl strptime time
-    vcsRevision
+    bytestringLexing cairo colour HUnit mtl strptime time vcsRevision
   ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Splot";
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index d076d8ba4db0..9b1499c15375 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ stdenv, fetchurl, m4, perl, flex }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
   };
 
-  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
+  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
   propagatedBuildInputs = [ m4 ];
 
   doCheck = true;