From 13a10c3e542070b34fd684e3eb27cc34a8bb5d72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 May 2012 09:56:52 +0000 Subject: [PATCH] Updated Haskell packages. - authenticate: updated to version 1.2.1.1 - blaze-html: added version 0.5.0.0 (unused right now because happstack can't deal with it) - BNFC-meta: updated to version 0.3.0.2 - graphviz: patched build to succeed with transformers 0.3.x - haskeline: updated to version 0.6.4.7 - http-conduit: updated to version 1.4.1.3 - numeric-prelude: updated to version 0.3.0.2 - pandoc: updated to version 1.9.3 svn path=/nixpkgs/trunk/; revision=34087 --- .../libraries/haskell/authenticate/default.nix | 4 ++-- .../blaze-html/{default.nix => 0.4.3.4.nix} | 0 .../libraries/haskell/blaze-html/0.5.0.0.nix | 15 +++++++++++++++ .../libraries/haskell/graphviz/default.nix | 3 +++ .../libraries/haskell/haskeline/default.nix | 7 ++----- .../libraries/haskell/http-conduit/default.nix | 4 ++-- .../libraries/haskell/numeric-prelude/default.nix | 4 ++-- .../libraries/haskell/pandoc/default.nix | 4 ++-- .../tools/haskell/BNFC-meta/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +++- 10 files changed, 33 insertions(+), 16 deletions(-) rename pkgs/development/libraries/haskell/blaze-html/{default.nix => 0.4.3.4.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 9512e2bce8e..679e9d39e02 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.2.1"; - sha256 = "0ifx24129ahq1rb2601n4736w5j257w10wcym5m9kp0jjb4p7s83"; + version = "1.2.1.1"; + sha256 = "0kfzsi8za87lgr52b9n6m9fby95d4hm21z7dbaqjv5whr90nwy54"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/blaze-html/default.nix rename to pkgs/development/libraries/haskell/blaze-html/0.4.3.4.nix diff --git a/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix b/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix new file mode 100644 index 00000000000..c8b2eb06a32 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-html/0.5.0.0.nix @@ -0,0 +1,15 @@ +{ cabal, blazeBuilder, blazeMarkup, text }: + +cabal.mkDerivation (self: { + pname = "blaze-html"; + version = "0.5.0.0"; + sha256 = "0cfvdf50jbm6w277jf69ac57nbkgkn2ifcp6r2amd3qdbmdgqkwj"; + buildDepends = [ blazeBuilder blazeMarkup text ]; + meta = { + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index fe6e811b902..f17133b4da3 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ colour dlist fgl filepath polyparse text transformers wlPprintText ]; + patchPhase = '' + sed -i graphviz.cabal -e 's|transformers == 0.2.\*|transformers|' + ''; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 02f36e96266..9863293c41d 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -3,15 +3,12 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.6.4.6"; - sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj"; + version = "0.6.4.7"; + sha256 = "18ma4i2i6hx8bhbkh1d7mqzsqbfj0zc2bkv3czjyylizqwhpq6ih"; buildDepends = [ extensibleExceptions filepath mtl terminfo utf8String ]; configureFlags = "-fterminfo"; - patchPhase = '' - sed -i -e "s|mtl >= 1.1 && < 2.1|mtl|" haskeline.cabal - ''; meta = { homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index d4c6e27fa3d..c431118ed76 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.2"; - sha256 = "1ji7pdqrzhzlmy2ig21s8fcfcqa29lc9k56l29zkw9qqgdaq5x3s"; + version = "1.4.1.3"; + sha256 = "15mpha91dfpzy6bz2577jk0866nmyj17rjwnjz3x7zh3x0i06534"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index d4eef1b1511..1cb6ab49bcd 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.3.0.1"; - sha256 = "14hi0l4pga4srrfypx4alsyq34y5wsanis6216cds3zjw6db3frg"; + version = "0.3.0.2"; + sha256 = "0ihk8r06n2s72b4k67x8msn6gmn2cmxyswzk1j1r4jbhnk83b6wr"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 4843c8afb80..5f30b407491 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.2"; - sha256 = "1hp51ddfwlg4pg5n16jhf7w8r4s074n5baiy55fi2p47lx278jsq"; + version = "1.9.3"; + sha256 = "0dhzzx91ljmrcmi3znz1xvj3gwma5z5bwc4fsp5y8zd5yyb9b4j0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 19fe6eec95f..42006a81b5b 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.3.0.1"; - sha256 = "1qp6aanryrmmip45wgiaf62p842lgc1yqdr8qqn3ljmszxw591ak"; + version = "0.3.0.2"; + sha256 = "0x4x3lpqwjid8rdy6v2wlfbxjvxlg24wjj9fb2niwaqw8b3lyza4"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; noHaddock = true; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e5706438db8..c1f6db443e7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -505,7 +505,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; - blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; + blazeHtml_0_4_3_4 = callPackage ../development/libraries/haskell/blaze-html/0.4.3.4.nix {}; + blazeHtml_0_5_0_0 = callPackage ../development/libraries/haskell/blaze-html/0.5.0.0.nix {}; + blazeHtml = self.blazeHtml_0_4_3_4; blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {};