diff options
author | Peter Simons <simons@cryp.to> | 2011-08-16 23:23:45 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2011-08-16 23:23:45 +0000 |
commit | 8d20464e2746c4a1241bbe1b9a192a6c8b389d20 (patch) | |
tree | d28191d2104167d8def24ef1f64dc21cfb9a2079 | |
parent | f01d5ea8f628e0b2a091d2a1f4cb68cec7754dc7 (diff) |
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. svn path=/nixpkgs/trunk/; revision=28629
-rw-r--r-- | pkgs/development/libraries/haskell/graphviz/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/polyparse/1.4.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/polyparse/default.nix (renamed from pkgs/development/libraries/haskell/polyparse/1.7.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
4 files changed, 9 insertions, 28 deletions
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 1f35fdf6bb9da..7669408867a47 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/haskell/polyparse/1.4.nix b/pkgs/development/libraries/haskell/polyparse/1.4.nix deleted file mode 100644 index d47748f535628..0000000000000 --- a/pkgs/development/libraries/haskell/polyparse/1.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "polyparse"; - version = "1.4"; - sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44"; - meta = { - homepage = "http://www.cs.york.ac.uk/fp/polyparse/"; - description = "A variety of alternative parser combinator libraries"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/polyparse/1.7.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index b27dc9cc69529..b27dc9cc69529 100644 --- a/pkgs/development/libraries/haskell/polyparse/1.7.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e04743f7e290e..88574ca4b3361 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -639,9 +639,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 {}; |