summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-09-28 19:26:00 +0000
committerPeter Simons <simons@cryp.to>2011-09-28 19:26:00 +0000
commite460e459bf3717ddda80c6be1f5e608d79a8ad9e (patch)
tree73955ec9d30ee6c33ea0c7bf4b18cf0d7a61e17a /pkgs/development
parent07a5a121fbde76ca50543c0bf7d9d048713dd517 (diff)
downloadnixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.tar
nixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.tar.gz
nixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.tar.bz2
nixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.tar.lz
nixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.tar.xz
nixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.tar.zst
nixpkgs-e460e459bf3717ddda80c6be1f5e608d79a8ad9e.zip
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29531
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/haskell/criterion/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-util.nix4
-rw-r--r--pkgs/development/libraries/icu/default.nix4
-rw-r--r--pkgs/development/tools/haskell/hlint/default.nix4
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 0a7f23a38ac..f567569a6f6 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -1,13 +1,13 @@
-{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector
-, vectorAlgorithms
+{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time
+, vector, vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "0.5.0.10";
-  sha256 = "0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj";
+  version = "0.5.1.0";
+  sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d";
   buildDepends = [
-    deepseq mtl mwcRandom parsec statistics time vector
+    aeson deepseq mtl mwcRandom parsec statistics time vector
     vectorAlgorithms
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index de4c1b9990c..faeb174f251 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-util";
-  version = "6.0.0";
-  sha256 = "06qla74kb58q0rvlfa9k16s4crnylq99hm80xx4phlddyzn0cy4z";
+  version = "6.0.2";
+  sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index c15bbe2491c..0474b79a847 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "4.6";
+  version = "4.8.1";
 in
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "1z6zklqdf6pq7fckk8ar4vmfrnw79bih6yc8gwc7k2vx2alav8dm";
+    sha256 = "13zq190gl54zr84f0k48w9knarjsb966jkailyy06yhqjipcv90r";
   };
 
   postUnpack = "
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index da117157f22..be66cfc0680 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.15";
-  sha256 = "1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr";
+  version = "1.8.16";
+  sha256 = "0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [