diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/servers/xmpp | |
parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
download | nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.gz nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.bz2 nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.lz nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.xz nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.zst nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.zip |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/servers/xmpp')
-rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1bccfef75a6..788fe0d6ccb 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: stdenv.mkDerivation rec { - version = "2.1.4"; - name = "ejabberd-2.1.4"; + version = "2.1.10"; + name = "ejabberd-2.1.10"; src = fetchurl { - url = http://www.process-one.net/downloads/ejabberd/2.1.4/ejabberd-2.1.4.tar.gz; - sha256 = "205ee09e38c57527cfa1a4be6ca664cec2e8c6b40eeffaac008735fcdc5e7527"; + url = http://www.process-one.net/downloads/ejabberd/2.1.10/ejabberd-2.1.10.tar.gz; + sha256 = "1gijv6d90w9fq0as2l0mp0fn65jihgd86nxry98pv6liks4fbhlx"; }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' |