From 5a5f24f18cc3da15030b538273bcc47a519f2a07 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Aug 2011 22:00:27 +0000 Subject: [PATCH] haskell-packages.nix: added old 1.6 version of pandoc, which is required by Graphalyze svn path=/nixpkgs/trunk/; revision=28309 --- .../libraries/haskell/pandoc/1.6.0.1.nix | 18 ++++++++++++++++++ .../pandoc/{default.nix => 1.8.2.1.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix rename pkgs/development/libraries/haskell/pandoc/{default.nix => 1.8.2.1.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix b/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix new file mode 100644 index 00000000000..ea3ed58030e --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix @@ -0,0 +1,18 @@ +{cabal, HTTP, mtl, network, parsec, syb, texmath, utf8String, + xhtml, xml, zipArchive} : + +cabal.mkDerivation (self : { + pname = "pandoc"; + version = "1.6.0.1"; + sha256 = "1imi6xkqzdy9y8kab04x8pn11r55j699apwrqvcz99j6f5g7xs9x"; + propagatedBuildInputs = [ + HTTP mtl network parsec syb texmath utf8String xhtml xml zipArchive + ]; + meta = { + homepage = "http://johnmacfarlane.net/pandoc"; + description = "Conversion between markup formats"; + license = "GPL"; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc/default.nix rename to pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7021a1ce31c..e384b638241 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -843,7 +843,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_2_1_1; - pandoc = callPackage ../development/libraries/haskell/pandoc {}; + pandoc_1_6_0_1 = callPackage ../development/libraries/haskell/pandoc/1.6.0.1.nix { + texmath = self.texmath_0_4; + }; + pandoc_1_8_2_1 = callPackage ../development/libraries/haskell/pandoc/1.8.2.1.nix {}; + pandoc = self.pandoc_1_8_2_1; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};