diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
| commit | 96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch) | |
| tree | ea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/development/libraries/haskell/authenticate/default.nix | |
| parent | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff) | |
| parent | 084626deecaffcaa017af07eaab00682eff5d6f3 (diff) | |
| download | nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2 nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip | |
Merge 'staging' into multiple-outputs
Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/authenticate/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/authenticate/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index f0a1969ffbab..af966ebe7bfd 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,22 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit -, httpConduit, httpTypes, network, tagsoup, text, transformers -, unorderedContainers, xmlConduit +, httpConduit, httpTypes, monadControl, networkUri, resourcet +, tagstreamConduit, text, transformers, unorderedContainers +, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2.6"; - sha256 = "12sgi6q6kajjhh8mns9nklxj0kwn32xs5kzi7wmw50shx0smnjrz"; + version = "1.3.2.10"; + sha256 = "1dy38k5jpms3xrkw1zh7vjmx06yr5iibgh50m5i2wky2wmryqkf4"; buildDepends = [ aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit - httpTypes network tagsoup text transformers unorderedContainers - xmlConduit + httpTypes monadControl networkUri resourcet tagstreamConduit text + transformers unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) |