summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-02-02 20:13:30 +0100
committerPeter Simons <simons@cryp.to>2014-02-02 22:36:11 +0100
commit35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69 (patch)
tree1bfe9057409c6b069c72b67790591442221d2c06 /pkgs
parentc2cc4554f6bb73c8b68fee26214220d00ea3b29b (diff)
downloadnixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.tar
nixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.tar.gz
nixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.tar.bz2
nixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.tar.lz
nixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.tar.xz
nixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.tar.zst
nixpkgs-35b0a53ad3a8bedbcf5fea305fb6b54f76a3ae69.zip
haskell-trifecta: add version 1.4
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/haskell/trifecta/1.4.nix32
-rw-r--r--pkgs/top-level/haskell-packages.nix3
2 files changed, 34 insertions, 1 deletions
diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/1.4.nix
new file mode 100644
index 00000000000..9f03de78be1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/trifecta/1.4.nix
@@ -0,0 +1,32 @@
+{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
+, blazeMarkup, charset, comonad, deepseq, doctest, filepath
+, fingertree, hashable, lens, mtl, parsers, reducers, semigroups
+, transformers, unorderedContainers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "trifecta";
+  version = "1.4";
+  sha256 = "1wz9rqd5nf1y4vpwn0vrbdlxdbrdp967p5ivpd0b2w5493m3mvax";
+  buildDepends = [
+    ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
+    charset comonad deepseq fingertree hashable lens mtl parsers
+    reducers semigroups transformers unorderedContainers utf8String
+  ];
+  testDepends = [ doctest filepath ];
+  postPatch = ''
+    substituteInPlace trifecta.cabal \
+      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 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 = {
+    homepage = "http://github.com/ekmett/trifecta/";
+    description = "A modern parser combinator library with convenient diagnostics";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 092d7785f59..11d291772c4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2353,7 +2353,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     parsers = self.parsers_0_9;
   };
   trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {};
-  trifecta = self.trifecta_1_2;
+  trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {};
+  trifecta = self.trifecta_1_4;
 
   tuple = callPackage ../development/libraries/haskell/tuple {};