diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
| commit | 4c5a71f777769b1f2516096532424cd42531aa1f (patch) | |
| tree | a5eb1c36a9363911ce264c7ed573b2f3cc6a7798 /pkgs/development/libraries/haskell/http-reverse-proxy/default.nix | |
| parent | e8394e3f8c7d464bc27a344a982648c20a08a6d7 (diff) | |
| parent | 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 (diff) | |
| download | nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.gz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.bz2 nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.lz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.xz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.zst nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.zip | |
Merge master into x-updates
Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/http-reverse-proxy/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/http-reverse-proxy/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a4f458f83953..a8e0afc786ea 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,22 +1,23 @@ { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefault, hspec, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, transformers, wai -, waiLogger, warp, word8 +, dataDefault, hspec, httpClient, httpConduit, httpTypes +, liftedBase, monadControl, network, networkConduit, resourcet +, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.1.1"; - sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj"; + version = "0.3.0"; + sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2"; buildDepends = [ basicPrelude blazeBuilder caseInsensitive conduit dataDefault - httpConduit httpTypes liftedBase monadControl network - networkConduit text wai waiLogger warp word8 + httpClient httpTypes liftedBase monadControl network networkConduit + resourcet text wai waiLogger word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network networkConduit transformers wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; |