Author: simons
Date: Tue Aug 16 23:23:49 2011
New Revision: 28630
URL: https://svn.nixos.org/websvn/nix/?rev=28630&sc=1

Log:
haskell-Graphalyze: updated to version 0.12.0.0

This update obsoletes the requirement on Pandoc 1.6, which has
subsequently been removed from the repository.

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix
      - copied, changed from r28629, 
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix
Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix     
Tue Aug 16 23:23:45 2011        (r28629)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix     
Tue Aug 16 23:23:49 2011        (r28630)
@@ -1,13 +1,13 @@
 { cabal, bktrees, extensibleExceptions, fgl, graphviz, pandoc
-, random, time
+, random, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "Graphalyze";
-  version = "0.11.0.0";
-  sha256 = "1aplfd0qp7ypr9rh4v4x5g8f4b0d1w0dcgz7hgjm9haqcsv37a79";
+  version = "0.12.0.0";
+  sha256 = "0lsbwf08flaifdddbg6d3ndrb2d1wzs943hk7n0m316bvahq6kgx";
   buildDepends = [
-    bktrees extensibleExceptions fgl graphviz pandoc random time
+    bktrees extensibleExceptions fgl graphviz pandoc random text time
   ];
   meta = {
     description = "Graph-Theoretic Analysis library";

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/default.nix (from 
r28629, nixpkgs/trunk/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix)
==============================================================================

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 16 23:23:45 
2011        (r28629)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 16 23:23:49 
2011        (r28630)
@@ -635,9 +635,7 @@
     gtkC = pkgs.gtkLibs.gtk;
   };
 
-  Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {
-    pandoc = self.pandoc_1_6_0_1;
-  };
+  Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
 
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
@@ -913,11 +911,7 @@
 
   pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
 
-  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;
+  pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {};
 
   pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to