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

Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
parent 0214514f8b bff4b06640
commit 3b26ba7019
38 changed files with 283 additions and 74 deletions
@@ -1,15 +1,15 @@
 { cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec
-, transformers
+, split, transformers
 }:

 cabal.mkDerivation (self: {
  pname = "idris";
-  version = "0.9.5.1";
-  sha256 = "0cy27b2kq696lw354y55mpx1gv66jdax1xjph989kxp0rd1v1sw9";
+  version = "0.9.6";
+  sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
-    binary Cabal filepath haskeline mtl parsec transformers
+    binary Cabal filepath haskeline mtl parsec split transformers
  ];
  buildTools = [ happy ];
  meta = {