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

Log:
haskell-graphviz: updated to version 2999.12.0.2

This update obsoletes the requirement for polyparse 1.4, which has
subsequently been removed from the repository.

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix
      - copied, changed from r28628, 
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.7.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.4.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.7.nix
Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/graphviz/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/graphviz/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/graphviz/default.nix       
Tue Aug 16 23:23:40 2011        (r28628)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/graphviz/default.nix       
Tue Aug 16 23:23:45 2011        (r28629)
@@ -1,18 +1,20 @@
-{ cabal, colour, extensibleExceptions, fgl, polyparse, transformers
+{ cabal, colour, dlist, extensibleExceptions, fgl, polyparse, text
+, transformers, wlPprintText
 }:
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.11.0.0";
-  sha256 = "1ky8hi9vda8hli7dkvsmmbz9j1swkzsn548905asqz0i46kpspnk";
+  version = "2999.12.0.2";
+  sha256 = "0hjivsayxnkzh51rw80fr95hw7kfdpiw0gjq2hpnv1hfqmjrw4vy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    colour extensibleExceptions fgl polyparse transformers
+    colour dlist extensibleExceptions fgl polyparse text transformers
+    wlPprintText
   ];
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";;
-    description = "Graphviz bindings for Haskell";
+    description = "Bindings to Graphviz for graph visualisation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/default.nix (from 
r28628, nixpkgs/trunk/pkgs/development/libraries/haskell/polyparse/1.7.nix)
==============================================================================

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 16 23:23:40 
2011        (r28628)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Aug 16 23:23:45 
2011        (r28629)
@@ -639,9 +639,7 @@
     pandoc = self.pandoc_1_6_0_1;
   };
 
-  graphviz = callPackage ../development/libraries/haskell/graphviz {
-    polyparse = self.polyparse14;
-  };
+  graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
   hakyll = callPackage ../development/libraries/haskell/hakyll {};
 
@@ -953,9 +951,7 @@
 
   persistentTemplate = callPackage 
../development/libraries/haskell/persistent-template {};
 
-  polyparse14 = callPackage ../development/libraries/haskell/polyparse/1.4.nix 
{};
-  polyparse17 = callPackage ../development/libraries/haskell/polyparse/1.7.nix 
{};
-  polyparse = self.polyparse17;
+  polyparse = callPackage 
../development/libraries/haskell/polyparse/default.nix {};
 
   pool = callPackage ../development/libraries/haskell/pool {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to