diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
commit | e85500987b7df503b37a127a5ea49a07f92e70f0 (patch) | |
tree | 5f66b5de9aadaf0ff3ba52c394dc0066114e11e2 /pkgs/servers/xmpp/ejabberd/default.nix | |
parent | 7ade207f6b75da0fde94cec621ac6d8fa6c3e586 (diff) | |
parent | 58f543f19f1a2eed8a46202b36a855836cfc9e0f (diff) | |
download | nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.gz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.bz2 nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.lz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.xz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.zst nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.zip |
Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
Diffstat (limited to 'pkgs/servers/xmpp/ejabberd/default.nix')
-rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 405afc189c2e..7d81dd0accfd 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,15 +1,10 @@ -{stdenv, fetchurl, fetchsvn, expat, erlang, zlib, openssl, pam}: +{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: stdenv.mkDerivation rec { - name = "ejabberd-2.0.5"; - #src = fetchurl { - # url = http://www.process-one.net/downloads/ejabberd/2.0.5/ejabberd-2.0.5.tar.gz; - # sha256 = "130rjl93l54c7p4glsfn3j7xwpwdyinhj6pp1di3mdx2mzi91vrp"; - #}; - src = fetchsvn { - url = http://svn.process-one.net/ejabberd/trunk; - rev = "2666"; - sha256 = "c927ddc08c9cd748db93f48bcae96f9bd1c36e1ce107c9b4774e5423574ab7cb"; + name = "ejabberd-2.1.0"; + src = fetchurl { + url = http://www.process-one.net/downloads/ejabberd/2.1.0/ejabberd-2.1.0.tar.gz; + sha256 = "16gn5ag3zyv578bqbz134l13cy1gl1xfa5y7dnqxgpr9gkdyrp5q"; }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' @@ -24,5 +19,6 @@ stdenv.mkDerivation rec { description = "Open-source XMPP application server written in Erlang"; license = "GPLv2"; homepage = http://www.ejabberd.im; + maintainers = [ lib.maintainers.sander ]; }; } |