From d51a0838968346100779c4443941f5133550b71e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Feb 2015 21:09:18 +0100 Subject: [PATCH] haskell-blaze-builder: downgrade to version < 0.4 Many builds can't deal with the new version yet. --- .../haskell-modules/configuration-common.nix | 3 -- .../haskell-modules/hackage-packages.nix | 49 +++++-------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0378ceaecb43..ae736e0125e8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -462,9 +462,6 @@ self: super: { # This packages compiles 4+ hours on a fast machine. That's just unreasonable. CHXHtml = dontDistribute super.CHXHtml; - # https://github.com/jaspervdj/blaze-markup/issues/15 - blaze-markup = dontCheck super.blaze-markup; - # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 74ec0d2bea31..4b254966b6b8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18787,7 +18787,6 @@ self: { cereal data-default-class http-client http-client-tls http-types monad-control resourcet text wai ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -18822,7 +18821,6 @@ self: { buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time wai ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -18835,7 +18833,6 @@ self: { version = "1.2.0"; sha256 = "1ng36kj802rvmwmwz9pahg18ry60zga7lp36bnf1n7gh7ypxp7j0"; buildDepends = [ apiary base blaze-builder wai-extra ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -20319,7 +20316,6 @@ self: { attoparsec base bytestring HUnit test-framework test-framework-hunit text ]; - jailbreak = true; homepage = "http://github.com/nominolo/atto-lisp"; description = "Efficient parsing and serialisation of S-Expressions"; license = stdenv.lib.licenses.bsd3; @@ -20844,7 +20840,6 @@ self: { mtl QuickCheck quickcheck-instances resourcet tagged tasty tasty-quickcheck text time transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24379,6 +24374,18 @@ self: { }) {}; "blaze-builder" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "blaze-builder"; + version = "0.3.3.4"; + sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5"; + buildDepends = [ base bytestring text ]; + homepage = "http://github.com/meiersi/blaze-builder"; + description = "Efficient buffered output"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-builder_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , text, utf8-string @@ -24420,7 +24427,6 @@ self: { buildDepends = [ base blaze-builder bytestring enumerator transformers ]; - jailbreak = true; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; license = stdenv.lib.licenses.bsd3; @@ -24455,7 +24461,6 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24522,7 +24527,6 @@ self: { base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -27620,7 +27624,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/tibbe/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; @@ -51037,7 +51040,6 @@ self: { base blaze-builder bytestring containers monad-control monad-logger mtl text time transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; @@ -51096,7 +51098,6 @@ self: { monad-control monad-logger postgresql-libpq postgresql-simple resource-pool text time transformers ]; - jailbreak = true; description = "PostgreSQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -57223,7 +57224,6 @@ self: { mtl network network-uri old-locale old-time template-haskell time utf8-string ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; @@ -58183,7 +58183,6 @@ self: { map-syntax MonadCatchIO-transformers mtl process random text time transformers unordered-containers vector xmlhtml ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; @@ -66433,7 +66432,6 @@ self: { base blaze-builder bytestring doctest hspec QuickCheck quickcheck-instances text ]; - jailbreak = true; homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; license = stdenv.lib.licenses.bsd3; @@ -69569,7 +69567,6 @@ self: { transformers vector zlib zlib-bindings ]; configureFlags = [ "-fnointeractivetests" ]; - jailbreak = true; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72123,7 +72120,6 @@ self: { testDepends = [ base bytestring conduit hspec HUnit transformers unix ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; @@ -77468,7 +77464,6 @@ self: { version = "0.4.0.2"; sha256 = "1zdndb81190xg2zwpw10pg0qpjvyp2jmvwm64s2bid3shlhibmmd"; buildDepends = [ base blaze-builder lucid text transformers ]; - jailbreak = true; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; @@ -80015,7 +80010,6 @@ self: { random text ]; testDepends = [ base blaze-builder bytestring hspec text ]; - jailbreak = true; homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; license = stdenv.lib.licenses.mit; @@ -89992,7 +89986,6 @@ self: { base bytestring cassava HUnit pipes pipes-bytestring test-framework test-framework-hunit vector ]; - jailbreak = true; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; }) {}; @@ -98765,7 +98758,6 @@ self: { attoparsec base blaze-builder blaze-textual bytestring deepseq haxr mtl network split utf8-string ]; - jailbreak = true; homepage = "https://github.com/megantti/rtorrent-rpc"; description = "A library for communicating with RTorrent over its XML-RPC interface"; license = stdenv.lib.licenses.mit; @@ -100198,7 +100190,6 @@ self: { testDepends = [ base bytestring hspec hspec-wai http-types lifted-base text wai ]; - jailbreak = true; homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; @@ -104095,7 +104086,6 @@ self: { hashable HUnit MonadCatchIO-transformers mtl random regex-posix text time unix unix-compat unordered-containers vector zlib-enum ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; @@ -104249,7 +104239,6 @@ self: { old-locale snap-core text time unix unix-compat ]; configureFlags = [ "-fopenssl" ]; - jailbreak = true; homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -107808,7 +107797,6 @@ self: { array async base blaze-builder bytestring deepseq hspec network QuickCheck text unix zlib ]; - jailbreak = true; homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; @@ -114373,7 +114361,6 @@ self: { testDepends = [ base directory doctest filepath parsers QuickCheck ]; - jailbreak = true; homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; @@ -119173,7 +119160,6 @@ self: { string-qq terminfo test-framework test-framework-hunit test-framework-smallcheck text unix utf8-string vector ]; - jailbreak = true; homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; @@ -119263,7 +119249,6 @@ self: { base blaze-builder bytestring http-types network text vault ]; testDepends = [ base blaze-builder bytestring hspec ]; - jailbreak = true; homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; @@ -119430,7 +119415,6 @@ self: { base bytestring fast-logger hspec http-types HUnit resourcet text transformers wai zlib ]; - jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -119514,7 +119498,6 @@ self: { base blaze-builder bytestring http-types process streaming-commons transformers wai warp ]; - jailbreak = true; description = "Launch a web app in the default browser"; license = stdenv.lib.licenses.mit; }) {}; @@ -120096,7 +120079,6 @@ self: { http-types network text transformers wai wai-app-static warp websockets ]; - jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge betweeen WAI and the websockets package"; license = stdenv.lib.licenses.mit; @@ -120148,7 +120130,6 @@ self: { simple-sendfile streaming-commons text time transformers unix unix-compat void wai ]; - jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; @@ -120497,7 +120478,6 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; description = "Library for maintaining correctness and composability of URLs within an application"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120872,7 +120852,6 @@ self: { random SHA test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -122548,7 +122527,6 @@ self: { base blaze-markup bytestring conduit containers hspec HUnit resourcet text transformers xml-types ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.bsd3; @@ -122924,7 +122902,6 @@ self: { base blaze-builder blaze-html blaze-markup bytestring containers parsec text unordered-containers ]; - jailbreak = true; description = "XML parser and renderer with HTML 5 quirks mode"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -124249,7 +124226,6 @@ self: { tar template-haskell text time transformers transformers-compat unix-compat unordered-containers wai wai-extra warp yaml zlib ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; @@ -124330,7 +124306,6 @@ self: { resourcet shakespeare streaming-commons template-haskell text transformers wai wai-extra ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit;