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/DAV/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/DAV/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/DAV/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c330f082e890..a7e15f2d6b4d 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,17 +1,18 @@ -{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase -, mtl, network, optparseApplicative, resourcet, transformers -, xmlConduit, xmlHamlet +{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes +, lens, liftedBase, monadControl, mtl, network, optparseApplicative +, transformers, transformersBase, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.4.1"; - sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; + version = "0.6"; + sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpConduit httpTypes lens liftedBase mtl network - optparseApplicative resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpClient httpClientTls httpTypes lens liftedBase + monadControl mtl network optparseApplicative transformers + transformersBase xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; |