From 132965e66a3a7ba1b2994894873c2fb65a21fef8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Dec 2013 10:55:24 +0100 Subject: [PATCH] haskell-trifecta: re-generate expressions with cabal2nix --- pkgs/development/libraries/haskell/trifecta/1.1.nix | 3 ++- pkgs/development/libraries/haskell/trifecta/1.2.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix index ac6cfdd43ae..98772476fc0 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix @@ -19,7 +19,8 @@ cabal.mkDerivation (self: { --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," + --replace "comonad == 3.*," "comonad >= 3 && < 5," \ + --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix index de876fa7f67..8181c445a5a 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ + --replace "comonad == 3.*," "comonad >= 3 && < 5," \ --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," ''; meta = {