From 7f9f3672a467d2729cf2c6ff8ac3b43ecc5ea3f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Aug 2011 23:23:49 +0000 Subject: [PATCH] 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. svn path=/nixpkgs/trunk/; revision=28630 --- .../libraries/haskell/Graphalyze/default.nix | 8 +++--- .../libraries/haskell/pandoc/1.6.0.1.nix | 25 ------------------- .../pandoc/{1.8.2.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 10 ++------ 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix rename pkgs/development/libraries/haskell/pandoc/{1.8.2.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index 5743147fadbc..8084ada2cd68 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -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"; diff --git a/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix b/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix deleted file mode 100644 index 6bca30521b73..000000000000 --- a/pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ cabal, extensibleExceptions, HTTP, mtl, network, parsec, random -, syb, texmath, utf8String, xhtml, xml, zipArchive -}: - -cabal.mkDerivation (self: { - pname = "pandoc"; - version = "1.6.0.1"; - sha256 = "1imi6xkqzdy9y8kab04x8pn11r55j699apwrqvcz99j6f5g7xs9x"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - extensibleExceptions HTTP mtl network parsec random syb texmath - utf8String xhtml xml zipArchive - ]; - meta = { - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Conversion between markup formats"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix b/pkgs/development/libraries/haskell/pandoc/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix rename to pkgs/development/libraries/haskell/pandoc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 88574ca4b336..e41b9b2328a0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -635,9 +635,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 {};