From f742da0a31769f62dbb3eced3e56c9cb538631ad Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 2 Jan 2015 15:29:01 -0600
Subject: [PATCH] liquidhaskell: new expression

---
 .../tools/haskell/liquid-fixpoint/default.nix | 26 +++++++++++++++
 .../tools/haskell/liquidhaskell/default.nix   | 32 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/liquid-fixpoint/default.nix
 create mode 100644 pkgs/development/tools/haskell/liquidhaskell/default.nix

diff --git a/pkgs/development/tools/haskell/liquid-fixpoint/default.nix b/pkgs/development/tools/haskell/liquid-fixpoint/default.nix
new file mode 100644
index 00000000000..ff9be213519
--- /dev/null
+++ b/pkgs/development/tools/haskell/liquid-fixpoint/default.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiTerminal, attoparsec, bifunctors, cmdargs, deepseq
+, filemanip, filepath, hashable, intern, mtl, parsec, syb, text
+, textFormat, transformers, unorderedContainers, ocaml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "liquid-fixpoint";
+  version = "0.2.1.0";
+  sha256 = "11l9750ldxcb5jq34dl0iggpi9dh1zwjnlzgmwg4qvsgcq8cakdf";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    ansiTerminal attoparsec bifunctors cmdargs deepseq filemanip
+    filepath hashable intern mtl parsec syb text textFormat
+    transformers unorderedContainers
+  ];
+  buildTools = [ ocaml ];
+  meta = {
+    homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
+    description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/haskell/liquidhaskell/default.nix b/pkgs/development/tools/haskell/liquidhaskell/default.nix
new file mode 100644
index 00000000000..ffd92a666af
--- /dev/null
+++ b/pkgs/development/tools/haskell/liquidhaskell/default.nix
@@ -0,0 +1,32 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, ansiTerminal, bifunctors, cmdargs, cpphs
+, dataDefault, deepseq, Diff, filemanip, filepath, fingertree
+, ghcPaths, hashable, hscolour, intern, liquidFixpoint, mtl
+, optparseApplicative, parsec, syb, tagged, tasty, tastyHunit
+, tastyRerun, text, time, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "liquidhaskell";
+  version = "0.2.1.0";
+  sha256 = "172ki1pr096jc1azs6hq1p6czjr2gxb0zafmlg9bicn4nwp2h7vy";
+  isLibrary = true;
+  isExecutable = true;
+  doCheck = false;
+  buildDepends = [
+    aeson ansiTerminal bifunctors cmdargs cpphs dataDefault deepseq
+    Diff filemanip filepath fingertree ghcPaths hashable hscolour
+    intern liquidFixpoint mtl parsec syb text time unorderedContainers
+    vector
+  ];
+  testDepends = [
+    filepath optparseApplicative tagged tasty tastyHunit tastyRerun
+  ];
+  meta = {
+    homepage = "http://goto.ucsd.edu/liquidhaskell";
+    description = "Liquid Types for Haskell";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4f0b3437347..5d926ccebe9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3217,6 +3217,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
+  liquidFixpoint = callPackage ../development/tools/haskell/liquid-fixpoint { ocaml = pkgs.ocaml; };
+
+  liquidhaskell = callPackage ../development/tools/haskell/liquidhaskell {};
+
   packunused = callPackage ../development/tools/haskell/packunused {};
 
   rehoo = callPackage ../development/tools/haskell/rehoo {};