From 53d7a1c88215d94e341f6fefbe13b2af820eb54d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Apr 2014 11:54:38 +0200 Subject: [PATCH] haskell-criterion: downgrade to hastache 0.5.1 to fix the build Closes . --- .../libraries/haskell/hastache/0.5.1.nix | 19 +++++++++++++++++++ .../hastache/{default.nix => 0.6.0.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/hastache/0.5.1.nix rename pkgs/development/libraries/haskell/hastache/{default.nix => 0.6.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/hastache/0.5.1.nix b/pkgs/development/libraries/haskell/hastache/0.5.1.nix new file mode 100644 index 000000000000..462c76a487eb --- /dev/null +++ b/pkgs/development/libraries/haskell/hastache/0.5.1.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text +, transformers, utf8String +}: + +cabal.mkDerivation (self: { + pname = "hastache"; + version = "0.5.1"; + sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3"; + buildDepends = [ + blazeBuilder filepath ieee754 mtl syb text transformers utf8String + ]; + testDepends = [ HUnit mtl syb text ]; + meta = { + homepage = "http://github.com/lymar/hastache"; + description = "Haskell implementation of Mustache templates"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/0.6.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/hastache/default.nix rename to pkgs/development/libraries/haskell/hastache/0.6.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4a97c92bb801..4648d76a7a12 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -849,7 +849,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion {}; + criterion = callPackage ../development/libraries/haskell/criterion { + hastache = self.hastache_0_5_1; + }; Crypto = callPackage ../development/libraries/haskell/Crypto {}; @@ -1323,7 +1325,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskore = callPackage ../development/libraries/haskell/haskore {}; - hastache = callPackage ../development/libraries/haskell/hastache {}; + hastache_0_5_1 = callPackage ../development/libraries/haskell/hastache/0.5.1.nix {}; + hastache_0_6_0 = callPackage ../development/libraries/haskell/hastache/0.6.0.nix {}; + hastache = self.hastache_0_6_0; heredoc = callPackage ../development/libraries/haskell/heredoc {};