From dddea7f0d1ab765fcddab7177838b1b0ecd91acb Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 11 Nov 2014 12:49:33 -0600
Subject: [PATCH] Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4
 and 0.5"

This reverts commit d3b2c3f46c5bce8466e0813351afcaf2fe8fa92d.

@peti I'm reverting this commit until a resolution is found that allows
Hakyll to build.  I've confirmed that reverting it here fixes the build
error.
---
 .../libraries/haskell/pandoc-citeproc/0.4.nix | 29 +++++++++++++++++++
 .../libraries/haskell/pandoc-citeproc/0.5.nix | 29 +++++++++++++++++++
 .../pandoc-citeproc/{default.nix => 0.6.nix}  |  0
 pkgs/top-level/haskell-packages.nix           |  9 ++++--
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix
 create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix
 rename pkgs/development/libraries/haskell/pandoc-citeproc/{default.nix => 0.6.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix
new file mode 100644
index 00000000000..c4706634ecc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix
@@ -0,0 +1,29 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat
+, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
+, tagsoup, temporary, text, time, vector, yaml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pandoc-citeproc";
+  version = "0.4.0.1";
+  sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc
+    pandocTypes parsec rfc5051 split syb tagsoup temporary text time
+    vector yaml
+  ];
+  testDepends = [
+    aeson filepath pandoc pandocTypes temporary text yaml
+  ];
+  doCheck = false;
+  meta = {
+    description = "Supports using pandoc with citeproc";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix
new file mode 100644
index 00000000000..c6dc859ed8d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix
@@ -0,0 +1,29 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat
+, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
+, tagsoup, temporary, text, time, vector, yaml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pandoc-citeproc";
+  version = "0.5";
+  sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc
+    pandocTypes parsec rfc5051 split syb tagsoup temporary text time
+    vector yaml
+  ];
+  testDepends = [
+    aeson filepath pandoc pandocTypes temporary text yaml
+  ];
+  doCheck = false;
+  meta = {
+    description = "Supports using pandoc with citeproc";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
rename to pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index df16bb125ba..b27c1788998 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1040,7 +1040,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   groupoids = callPackage ../development/libraries/haskell/groupoids {};
 
-  hakyll = callPackage ../development/libraries/haskell/hakyll {};
+  hakyll = callPackage ../development/libraries/haskell/hakyll {
+    pandocCiteproc = self.pandocCiteproc_0_4;
+  };
 
   hamlet = callPackage ../development/libraries/haskell/hamlet {};
 
@@ -1823,7 +1825,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pandoc = callPackage ../development/libraries/haskell/pandoc {};
 
-  pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {};
+  pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {};
+  pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {};
+  pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {};
+  pandocCiteproc = self.pandocCiteproc_0_6;
 
   pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};