Author: simons
Date: Sun Aug 7 22:00:27 2011
New Revision: 28309
URL: https://svn.nixos.org/websvn/nix/?rev=28309&sc=1
Log:
haskell-packages.nix: added old 1.6 version of pandoc, which is required by
Graphalyze
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix
- copied, changed from r28308,
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix
- copied, changed from r28308,
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix (from
r28308, nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix Sun Aug
7 22:00:21 2011 (r28308, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix Sun Aug
7 22:00:27 2011 (r28309)
@@ -1,14 +1,12 @@
-{cabal, HTTP, base64Bytestring, citeprocHs, dlist, json, mtl,
- network, pandocTypes, parsec, syb, tagsoup, texmath, utf8String,
+{cabal, HTTP, mtl, network, parsec, syb, texmath, utf8String,
xhtml, xml, zipArchive} :
cabal.mkDerivation (self : {
pname = "pandoc";
- version = "1.8.2.1";
- sha256 = "0cwly0j2rj46h654iwl04l6jkhk6rrhynqvrdnq47067n9vm60pi";
+ version = "1.6.0.1";
+ sha256 = "1imi6xkqzdy9y8kab04x8pn11r55j699apwrqvcz99j6f5g7xs9x";
propagatedBuildInputs = [
- HTTP base64Bytestring citeprocHs dlist json mtl network pandocTypes
- parsec syb tagsoup texmath utf8String xhtml xml zipArchive
+ HTTP mtl network parsec syb texmath utf8String xhtml xml zipArchive
];
meta = {
homepage = "http://johnmacfarlane.net/pandoc";;
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix (from
r28308, nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Aug 7 22:00:21
2011 (r28308)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Aug 7 22:00:27
2011 (r28309)
@@ -843,7 +843,11 @@
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 {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
